From 564ca6087fc489ba3551e5b5aa0afc0f18093494 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 29 Sep 2018 00:39:01 +0500 Subject: [PATCH] src/Mayaqua/Object.c: remove redundant conditionals found by PVS analyzer src/Mayaqua/Object.c 318 warn V547 Expression 'c->Ready == 0' is always false. src/Mayaqua/Object.c 348 warn V547 Expression 'c->Ready == 0' is always false. src/Mayaqua/Object.c 383 warn V547 Expression 'c->Ready == 0' is always false. --- src/Mayaqua/Object.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/src/Mayaqua/Object.c b/src/Mayaqua/Object.c index 71de8622..1657ba8c 100644 --- a/src/Mayaqua/Object.c +++ b/src/Mayaqua/Object.c @@ -315,14 +315,7 @@ UINT Count(COUNTER *c) Lock(c->lock); { - if (c->Ready == false) - { - ret = 0; - } - else - { - ret = c->c; - } + ret = c->c; } Unlock(c->lock); @@ -345,15 +338,8 @@ UINT Inc(COUNTER *c) Lock(c->lock); { - if (c->Ready == false) - { - ret = 0; - } - else - { - c->c++; - ret = c->c; - } + c->c++; + ret = c->c; } Unlock(c->lock); @@ -380,21 +366,14 @@ UINT Dec(COUNTER *c) Lock(c->lock); { - if (c->Ready == false) + if (c->c != 0) { - ret = 0; + c->c--; + ret = c->c; } else { - if (c->c != 0) - { - c->c--; - ret = c->c; - } - else - { - ret = 0; - } + ret = 0; } } Unlock(c->lock);