CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sat Jan 29 01:12:37 UTC 2022

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

Log Message:
make: rename labels in CondParser_Leaf

No binary change.


To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 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.326 src/usr.bin/make/cond.c:1.327
--- src/usr.bin/make/cond.c:1.326	Sat Jan 15 19:34:07 2022
+++ src/usr.bin/make/cond.c	Sat Jan 29 01:12:36 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.326 2022/01/15 19:34:07 rillig Exp $	*/
+/*	$NetBSD: cond.c,v 1.327 2022/01/29 01:12:36 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.326 2022/01/15 19:34:07 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.327 2022/01/29 01:12:36 rillig Exp $");
 
 /*
  * Conditional expressions conform to this grammar:
@@ -478,7 +478,7 @@ CondParser_Leaf(CondParser *par, bool do
 		case '"':
 			par->p++;
 			if (quoted)
-				goto got_str;	/* skip the closing quote */
+				goto return_buf;	/* skip the closing quote */
 			Buf_AddByte(&buf, '"');
 			continue;
 		case ')':	/* see is_separator */
@@ -489,14 +489,14 @@ CondParser_Leaf(CondParser *par, bool do
 		case ' ':
 		case '\t':
 			if (!quoted)
-				goto got_str;
+				goto return_buf;
 			Buf_AddByte(&buf, par->p[0]);
 			par->p++;
 			continue;
 		case '$':
 			if (!CondParser_StringExpr(par,
 			    start, doEval, quoted, &buf, &str))
-				goto cleanup;
+				goto return_str;
 			continue;
 		default:
 			if (!unquotedOK && !quoted && *start != '$' &&
@@ -506,17 +506,17 @@ CondParser_Leaf(CondParser *par, bool do
 				 * a variable expression or a number.
 				 */
 				str = FStr_InitRefer(NULL);
-				goto cleanup;
+				goto return_str;
 			}
 			Buf_AddByte(&buf, par->p[0]);
 			par->p++;
 			continue;
 		}
 	}
-got_str:
+return_buf:
 	str = FStr_InitOwn(buf.data);
 	buf.data = NULL;
-cleanup:
+return_str:
 	Buf_Done(&buf);
 	*out_str = str;
 }