[src/trunk]: src/usr.bin/make make(1): use boolean expressions in conditions

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ced5c2d90232
branches:  trunk
changeset: 946105:ced5c2d90232
user:      rillig <rillig%NetBSD.org@localhost>
date:      Mon Nov 16 18:38:49 2020 +0000

description:
make(1): use boolean expressions in conditions

diffstat:

 usr.bin/make/suff.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 5f8ba1f6dc08 -r ced5c2d90232 usr.bin/make/suff.c
--- a/usr.bin/make/suff.c       Mon Nov 16 18:34:29 2020 +0000
+++ b/usr.bin/make/suff.c       Mon Nov 16 18:38:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: suff.c,v 1.238 2020/11/16 18:34:29 rillig Exp $        */
+/*     $NetBSD: suff.c,v 1.239 2020/11/16 18:38:49 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -114,7 +114,7 @@
 #include "dir.h"
 
 /*     "@(#)suff.c     8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.238 2020/11/16 18:34:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.239 2020/11/16 18:38:49 rillig Exp $");
 
 #define SUFF_DEBUG0(text) DEBUG0(SUFF, text)
 #define SUFF_DEBUG1(fmt, arg1) DEBUG1(SUFF, fmt, arg1)
@@ -215,7 +215,7 @@
        str++;
     }
 
-    return *pref ? NULL : str;
+    return *pref != '\0' ? NULL : str;
 }
 
 /*
@@ -304,7 +304,7 @@
 
 #if 0
     /* We don't delete suffixes in order, so we cannot use this */
-    if (suff->refCount)
+    if (suff->refCount != 0)
        Punt("Internal error deleting suffix `%s' with refcount = %d",
             suff->name, suff->refCount);
 #endif
@@ -1755,7 +1755,7 @@
             * Free up all the Src structures in the transformation path
             * up to, but not including, the parent node.
             */
-           while (bottom && bottom->parent != NULL) {
+           while (bottom != NULL && bottom->parent != NULL) {
                if (Lst_FindDatum(slst, bottom) == NULL) {
                    Lst_Append(slst, bottom);
                }
@@ -1820,7 +1820,7 @@
        }
     }
 
-    if (gn->suffix)
+    if (gn->suffix != NULL)
        gn->suffix->refCount--;
     gn->suffix = src->suff;
     gn->suffix->refCount++;
@@ -1830,7 +1830,7 @@
      * two lists.
      */
 sfnd_return:
-    if (bottom)
+    if (bottom != NULL)
        if (Lst_FindDatum(slst, bottom) == NULL)
            Lst_Append(slst, bottom);