[systemd-commits] src/shared

Daniel Mack zonque at kemper.freedesktop.org
Fri Feb 27 11:12:27 PST 2015


 src/shared/condition.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a9c6071cb7467170010f0287672c987981bdf9c
Author: Daniel Mack <daniel at zonque.org>
Date:   Fri Feb 27 20:05:26 2015 +0100

    shared/condition: fix gcc5 warning
    
    Fixes the warning below.
    
    src/shared/condition.c: In function ‘condition_new’:
    src/shared/condition.c:47:27: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
             assert(!parameter == (type == CONDITION_NULL));
                               ^
    src/shared/macro.h:42:44: note: in definition of macro ‘_unlikely_’
     #define _unlikely_(x) (__builtin_expect(!!(x),0))
                                                ^
    src/shared/macro.h:226:22: note: in expansion of macro ‘assert_se’
     #define assert(expr) assert_se(expr)
                          ^
    src/shared/condition.c:47:9: note: in expansion of macro ‘assert’
             assert(!parameter == (type == CONDITION_NULL));
             ^

diff --git a/src/shared/condition.c b/src/shared/condition.c
index f34b45f..0a77607 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -44,7 +44,7 @@ Condition* condition_new(ConditionType type, const char *parameter, bool trigger
 
         assert(type >= 0);
         assert(type < _CONDITION_TYPE_MAX);
-        assert(!parameter == (type == CONDITION_NULL));
+        assert((!parameter) == (type == CONDITION_NULL));
 
         c = new0(Condition, 1);
         if (!c)



More information about the systemd-commits mailing list