CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Tue Sep  8 14:51:43 UTC 2020

Modified Files:
        src/usr.bin/make: cond.c

Log Message:
make(1): in CondGetString, replace repeated Buf_Add with Buf_AddStr


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/usr.bin/make/cond.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/make/cond.c
diff -u src/usr.bin/make/cond.c:1.112 src/usr.bin/make/cond.c:1.113
--- src/usr.bin/make/cond.c:1.112	Fri Sep  4 21:08:44 2020
+++ src/usr.bin/make/cond.c	Tue Sep  8 14:51:43 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.112 2020/09/04 21:08:44 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.113 2020/09/08 14:51:43 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.112 2020/09/04 21:08:44 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.113 2020/09/08 14:51:43 rillig Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.112 2020/09/04 21:08:44 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.113 2020/09/08 14:51:43 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -386,7 +386,6 @@ static const char *
 CondGetString(Boolean doEval, Boolean *quoted, void **freeIt, Boolean strictLHS)
 {
     Buffer buf;
-    const char *cp;
     const char *str;
     int len;
     Boolean qt;
@@ -455,12 +454,8 @@ CondGetString(Boolean doEval, Boolean *q
 		 strchr("!=><)", *condExpr))) {
 		goto cleanup;
 	    }
-	    /*
-	     * Nope, we better copy str to buf
-	     */
-	    for (cp = str; *cp; cp++) {
-		Buf_AddByte(&buf, *cp);
-	    }
+
+	    Buf_AddStr(&buf, str);
 	    if (*freeIt) {
 		free(*freeIt);
 		*freeIt = NULL;