Module Name: src
Committed By: rillig
Date: Tue Dec 28 19:43:43 UTC 2021
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make: rename and constify SkipExtraTargets
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.602 -r1.603 src/usr.bin/make/parse.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/parse.c
diff -u src/usr.bin/make/parse.c:1.602 src/usr.bin/make/parse.c:1.603
--- src/usr.bin/make/parse.c:1.602 Tue Dec 28 19:41:01 2021
+++ src/usr.bin/make/parse.c Tue Dec 28 19:43:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.602 2021/12/28 19:41:01 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.603 2021/12/28 19:43:42 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.602 2021/12/28 19:41:01 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.603 2021/12/28 19:43:42 rillig Exp $");
/* types and constants */
@@ -1190,10 +1190,10 @@ HandleDependencyTargetMundane(char *targ
}
static void
-ParseDependencyTargetExtraWarn(char **pp, const char *lstart)
+SkipExtraTargets(char **pp, const char *lstart)
{
bool warning = false;
- char *cp = *pp;
+ const char *cp = *pp;
while (*cp != '\0') {
if (!IsEscaped(lstart, cp) && (*cp == '!' || *cp == ':'))
@@ -1205,7 +1205,7 @@ ParseDependencyTargetExtraWarn(char **pp
if (warning)
Parse_Error(PARSE_WARNING, "Extra target ignored");
- *pp = cp;
+ *pp += cp - *pp;
}
static void
@@ -1427,7 +1427,7 @@ ParseDependencyTargets(char **inout_cp,
return false;
if (*inout_special != SP_NOT && *inout_special != SP_PATH)
- ParseDependencyTargetExtraWarn(&cp, lstart);
+ SkipExtraTargets(&cp, lstart);
else
pp_skip_whitespace(&cp);
