From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 25 Oct 2015 23:46:40 +0000 (+0100)
Subject: path-util: minor coding style fix
X-Git-Tag: v228~145^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=373cd63a371cab08569a4c534f0b51a327243555;p=thirdparty%2Fsystemd.git

path-util: minor coding style fix

We usually avoid relying on C's degrade-to-boolean functionality when
comparing numerical variables with 0. We use it only for pointers and
actual booleans.
---

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 7b01633f5f1..0b8cac8f3e5 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -428,7 +428,7 @@ int path_compare(const char *a, const char *b) {
          * Which one is sorted before the other does not really matter.
          * Here a relative path is ordered before an absolute path. */
         d = (a[0] == '/') - (b[0] == '/');
-        if (d)
+        if (d != 0)
                 return d;
 
         for (;;) {
@@ -451,12 +451,12 @@ int path_compare(const char *a, const char *b) {
 
                 /* Alphabetical sort: "/foo/aaa" before "/foo/b" */
                 d = memcmp(a, b, MIN(j, k));
-                if (d)
+                if (d != 0)
                         return (d > 0) - (d < 0); /* sign of d */
 
                 /* Sort "/foo/a" before "/foo/aaa" */
                 d = (j > k) - (j < k);  /* sign of (j - k) */
-                if (d)
+                if (d != 0)
                         return d;
 
                 a += j;