CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Mar 14 15:15:29 UTC 2021

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

Log Message:
make: extract duplicate code for parsing ':S' and ':C'

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.859 -r1.860 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.859 src/usr.bin/make/var.c:1.860
--- src/usr.bin/make/var.c:1.859	Sun Mar 14 15:06:19 2021
+++ src/usr.bin/make/var.c	Sun Mar 14 15:15:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.859 2021/03/14 15:06:19 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.860 2021/03/14 15:15:28 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.859 2021/03/14 15:06:19 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.860 2021/03/14 15:15:28 rillig Exp $");
 
 typedef enum VarFlags {
 	VFL_NONE	= 0,
@@ -2794,6 +2794,21 @@ ApplyModifier_Match(const char **pp, App
 	return AMR_OK;
 }
 
+static void
+ParsePatternFlags(const char **pp, VarPatternFlags *pflags, Boolean *oneBigWord)
+{
+	for (;; (*pp)++) {
+		if (**pp == 'g')
+			pflags->subGlobal = TRUE;
+		else if (**pp == '1')
+			pflags->subOnce = TRUE;
+		else if (**pp == 'W')
+			*oneBigWord = TRUE;
+		else
+			break;
+	}
+}
+
 /* :S,from,to, */
 static ApplyModifierResult
 ApplyModifier_Subst(const char **pp, ApplyModifiersState *st)
@@ -2833,16 +2848,7 @@ ApplyModifier_Subst(const char **pp, App
 	args.rhs = rhs;
 
 	oneBigWord = st->oneBigWord;
-	for (;; (*pp)++) {
-		if (**pp == 'g')
-			args.pflags.subGlobal = TRUE;
-		else if (**pp == '1')
-			args.pflags.subOnce = TRUE;
-		else if (**pp == 'W')
-			oneBigWord = TRUE;
-		else
-			break;
-	}
+	ParsePatternFlags(pp, &args.pflags, &oneBigWord);
 
 	ModifyWords(st, ModifyWord_Subst, &args, oneBigWord);
 
@@ -2885,16 +2891,7 @@ ApplyModifier_Regex(const char **pp, App
 	args.pflags = (VarPatternFlags){ FALSE, FALSE, FALSE, FALSE };
 	args.matched = FALSE;
 	oneBigWord = st->oneBigWord;
-	for (;; (*pp)++) {
-		if (**pp == 'g')
-			args.pflags.subGlobal = TRUE;
-		else if (**pp == '1')
-			args.pflags.subOnce = TRUE;
-		else if (**pp == 'W')
-			oneBigWord = TRUE;
-		else
-			break;
-	}
+	ParsePatternFlags(pp, &args.pflags, &oneBigWord);
 
 	if (!(st->expr->eflags & VARE_WANTRES)) {
 		free(args.replace);