From 2a31c579faa3f6356c8236d5a1868a8f56a49ed1 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Apr 2018 11:40:48 +0200
Subject: [PATCH] user-util: trivial coding style fixes

Use C's downgrade-to-bool feature when comparing pointers against NULL,
as we usually do.
---
 src/basic/user-util.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 64cc44721..796e00f69 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -783,11 +783,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) {
@@ -798,11 +798,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) {
@@ -813,11 +813,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
@@ -829,10 +829,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
-- 
2.30.2