[src/trunk]: src/usr.bin/make make: rename labels in CondParser_Leaf

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43d0d0812535
branches:  trunk
changeset: 359869:43d0d0812535
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Jan 29 01:12:36 2022 +0000

description:
make: rename labels in CondParser_Leaf

No binary change.

diffstat:

 usr.bin/make/cond.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r ae5a698b1f63 -r 43d0d0812535 usr.bin/make/cond.c
--- a/usr.bin/make/cond.c       Sat Jan 29 01:07:31 2022 +0000
+++ b/usr.bin/make/cond.c       Sat Jan 29 01:12:36 2022 +0000
@@ -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 @@
                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 @@
                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 @@
                                 * 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;
 }