[src/trunk]: src/usr.bin/make make(1): replace redundant NULL tests with asse...

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

details:   https://anonhg.NetBSD.org/src/rev/2cb5d81f52a6
branches:  trunk
changeset: 974822:2cb5d81f52a6
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Aug 12 18:53:59 2020 +0000

description:
make(1): replace redundant NULL tests with assertions

diffstat:

 usr.bin/make/var.c |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 443467c0048a -r 2cb5d81f52a6 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Wed Aug 12 18:48:36 2020 +0000
+++ b/usr.bin/make/var.c        Wed Aug 12 18:53:59 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.446 2020/08/10 20:07:14 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.447 2020/08/12 18:53:59 rillig Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.446 2020/08/10 20:07:14 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.447 2020/08/12 18:53:59 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c      8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.446 2020/08/10 20:07:14 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.447 2020/08/12 18:53:59 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -3026,17 +3026,19 @@
             * we are not interested.
             */
            int c;
-           if (rval != NULL && *rval &&
+           assert(rval != NULL);
+           if (rval[0] != '\0' &&
                (c = p[rlen]) != '\0' && c != ':' && c != st.endc) {
                free(freeIt);
                goto apply_mods;
            }
 
-           VAR_DEBUG("Indirect modifier \"%s\" from \"%.*s\"\n", rval, rlen, p);
+           VAR_DEBUG("Indirect modifier \"%s\" from \"%.*s\"\n",
+                     rval, rlen, p);
 
            p += rlen;
 
-           if (rval != NULL && *rval) {
+           if (rval[0] != '\0') {
                const char *rval_pp = rval;
                st.val = ApplyModifiers(&rval_pp, st.val, '\0', '\0', v,
                                        ctxt, eflags, freePtr);
@@ -3549,11 +3551,12 @@
     if (strchr(nstr, '$') != NULL && (eflags & VARE_WANTRES) != 0) {
        nstr = Var_Subst(nstr, ctxt, eflags);
        *freePtr = nstr;
+       assert(nstr != NULL);
     }
 
     v->flags &= ~VAR_IN_USE;
 
-    if (nstr != NULL && (haveModifier || extramodifiers != NULL)) {
+    if (haveModifier || extramodifiers != NULL) {
        void *extraFree;
 
        extraFree = NULL;