Module Name: src
Committed By: rillig
Date: Thu Jan 21 13:51:25 UTC 2021
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make(1): make CondParser_String simpler
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 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.245 src/usr.bin/make/cond.c:1.246
--- src/usr.bin/make/cond.c:1.245 Thu Jan 21 13:31:38 2021
+++ src/usr.bin/make/cond.c Thu Jan 21 13:51:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.245 2021/01/21 13:31:38 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.246 2021/01/21 13:51:24 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.245 2021/01/21 13:31:38 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.246 2021/01/21 13:51:24 rillig Exp $");
/*
* The parsing of conditional expressions is based on this grammar:
@@ -437,12 +437,10 @@ CondParser_String(CondParser *par, Boole
}
continue;
case '"':
- if (quoted) {
- par->p++; /* skip the closing quote */
- goto got_str;
- }
- Buf_AddByte(&buf, par->p[0]); /* likely? */
par->p++;
+ if (quoted)
+ goto got_str; /* skip the closing quote */
+ Buf_AddByte(&buf, '"');
continue;
case ')': /* see is_separator */
case '!':
