From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Apr 2018 09:40:48 +0000 (+0200)
Subject: user-util: trivial coding style fixes
X-Git-Tag: v239~385^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad80c6a65546154354725092b6235f3e3556ca02;p=thirdparty%2Fsystemd.git

user-util: trivial coding style fixes

Use C's downgrade-to-bool feature when comparing pointers against NULL,
as we usually do.
---

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 0f0f21dbcf3..1adb2366d84 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -775,11 +775,11 @@ int fgetpwent_sane(FILE *stream, struct passwd **pw) {
 
         errno = 0;
         p = fgetpwent(stream);
-        if (p == NULL && errno != ENOENT)
+        if (!p && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
 
         *pw = p;
-        return p != NULL;
+        return !!p;
 }
 
 int fgetspent_sane(FILE *stream, struct spwd **sp) {
@@ -790,11 +790,11 @@ int fgetspent_sane(FILE *stream, struct spwd **sp) {
 
         errno = 0;
         s = fgetspent(stream);
-        if (s == NULL && errno != ENOENT)
+        if (!s && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
 
         *sp = s;
-        return s != NULL;
+        return !!s;
 }
 
 int fgetgrent_sane(FILE *stream, struct group **gr) {
@@ -805,11 +805,11 @@ int fgetgrent_sane(FILE *stream, struct group **gr) {
 
         errno = 0;
         g = fgetgrent(stream);
-        if (g == NULL && errno != ENOENT)
+        if (!g && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
 
         *gr = g;
-        return g != NULL;
+        return !!g;
 }
 
 #if ENABLE_GSHADOW
@@ -821,10 +821,10 @@ int fgetsgent_sane(FILE *stream, struct sgrp **sg) {
 
         errno = 0;
         s = fgetsgent(stream);
-        if (s == NULL && errno != ENOENT)
+        if (!s && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
 
         *sg = s;
-        return s != NULL;
+        return !!s;
 }
 #endif