diff options
| author | rillig <rillig@NetBSD.org> | 2021-12-28 19:43:42 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2021-12-28 19:43:42 +0000 |
| commit | 7bd16580151d2dfab60ae54c895ea1e6f8a8498c (patch) | |
| tree | 393d4a3addf57445ad7df499c71fae3bf710ba25 /usr.bin/make/parse.c | |
| parent | 8d37e1cd8b045def95acf0e7d93073129c32b80e (diff) | |
make: rename and constify SkipExtraTargets
No binary change.
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index c69bcf3df62..aa2d5f5968d 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -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 *targetName) } 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, const char *lstart) 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); |
