CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sun Feb 14 12:35:27 UTC 2021

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

Log Message:
make: condense the code for parsing :S and :C modifiers

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.810 -r1.811 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.810 src/usr.bin/make/var.c:1.811
--- src/usr.bin/make/var.c:1.810	Sun Feb 14 12:24:53 2021
+++ src/usr.bin/make/var.c	Sun Feb 14 12:35:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.810 2021/02/14 12:24:53 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.811 2021/02/14 12:35:27 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.810 2021/02/14 12:24:53 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.811 2021/02/14 12:35:27 rillig Exp $");
 
 typedef enum VarFlags {
 	VAR_NONE	= 0,
@@ -2772,18 +2772,14 @@ ApplyModifier_Subst(const char **pp, con
 
 	oneBigWord = st->oneBigWord;
 	for (;; (*pp)++) {
-		switch (**pp) {
-		case 'g':
+		if (**pp == 'g')
 			args.pflags.subGlobal = TRUE;
-			continue;
-		case '1':
+		else if (**pp == '1')
 			args.pflags.subOnce = TRUE;
-			continue;
-		case 'W':
+		else if (**pp == 'W')
 			oneBigWord = TRUE;
-			continue;
-		}
-		break;
+		else
+			break;
 	}
 
 	st->newVal = FStr_InitOwn(ModifyWords(val, ModifyWord_Subst, &args,
@@ -2829,18 +2825,14 @@ ApplyModifier_Regex(const char **pp, con
 	args.matched = FALSE;
 	oneBigWord = st->oneBigWord;
 	for (;; (*pp)++) {
-		switch (**pp) {
-		case 'g':
+		if (**pp == 'g')
 			args.pflags.subGlobal = TRUE;
-			continue;
-		case '1':
+		else if (**pp == '1')
 			args.pflags.subOnce = TRUE;
-			continue;
-		case 'W':
+		else if (**pp == 'W')
 			oneBigWord = TRUE;
-			continue;
-		}
-		break;
+		else
+			break;
 	}
 
 	error = regcomp(&args.re, re, REG_EXTENDED);