Module Name: src
Committed By: rillig
Date: Sat Sep 12 17:14:40 UTC 2020
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make(1): clean up code in CondParser_String
The two parts of the for loop were not related in any way, which made
the code more confusing than necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 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.137 src/usr.bin/make/cond.c:1.138
--- src/usr.bin/make/cond.c:1.137 Sat Sep 12 14:41:00 2020
+++ src/usr.bin/make/cond.c Sat Sep 12 17:14:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.137 2020/09/12 14:41:00 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.138 2020/09/12 17:14:40 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.137 2020/09/12 14:41:00 rillig Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.138 2020/09/12 17:14:40 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.137 2020/09/12 14:41:00 rillig Exp $");
+__RCSID("$NetBSD: cond.c,v 1.138 2020/09/12 17:14:40 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -419,7 +419,8 @@ CondParser_String(CondParser *par, Boole
*quoted = qt = par->p[0] == '"' ? 1 : 0;
if (qt)
par->p++;
- for (start = par->p; par->p[0] && str == NULL;) {
+ start = par->p;
+ while (par->p[0] && str == NULL) {
switch (par->p[0]) {
case '\\':
par->p++;
