Sun Nov 1 12:34:46 2020 UTC ()

make(1): clean up comments in ApplyModifier_Words


(rillig)

diff -r1.632 -r1.633 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2020/10/31 23:23:22	1.632
+++ src/usr.bin/make/var.c 2020/11/01 12:34:45	1.633

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.632 2020/10/31 23:23:22 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.633 2020/11/01 12:34:45 rillig Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -120,27 +120,27 @@
 #include <regex.h>
 #endif
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <time.h>
 #include "make.h"
 #include "dir.h"
 #include "job.h"
 #include "metachar.h"
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.632 2020/10/31 23:23:22 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.633 2020/11/01 12:34:45 rillig Exp $");
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
 #define VAR_DEBUG3(fmt, arg1, arg2, arg3) DEBUG3(VAR, fmt, arg1, arg2, arg3)
 #define VAR_DEBUG4(fmt, arg1, arg2, arg3, arg4) DEBUG4(VAR, fmt, arg1, arg2, arg3, arg4)
 ENUM_FLAGS_RTTI_3(VarEvalFlags,
 		  VARE_UNDEFERR, VARE_WANTRES, VARE_ASSIGN);
 /*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
 @@ -2104,27 +2104,28 @@ ApplyModifier_Defined(const char **pp, A
     return AMR_OK;
+}
 /* :L */
 static ApplyModifierResult
 ApplyModifier_Literal(const char **pp, ApplyModifiersState *st)
+{
     ApplyModifiersState_Define(st);
     st->newVal = bmake_strdup(st->v->name);
     (*pp)++;
     return AMR_OK;
+}
-static Boolean TryParseTime(const char **pp, time_t *out_time)
+static Boolean
 TryParseTime(const char **pp, time_t *out_time)
+{
     char *end;
     unsigned long n;
     if (!ch_isdigit(**pp))
 	return FALSE;
     errno = 0;
     n = strtoul(*pp, &end, 10);
     if (n == ULONG_MAX && errno == ERANGE)
 	return FALSE;
     *pp = end;
 @@ -2710,41 +2711,41 @@ ApplyModifier_Words(const char **pp, App
     if (ep[0] == '\0') {	/* Found only one integer in :[N] */
 	last = first;
     } else if (ep[0] == '.' && ep[1] == '.' && ep[2] != '\0') {
 	/* Expecting another integer after ".." */
 	ep += 2;
 	last = (int)strtol(ep, &ep, 0);
 	if (ep[0] != '\0')	/* Found junk after ".." */
 	    goto bad_modifier;
     } else
 	goto bad_modifier;	/* Found junk instead of ".." */
     /*
-     * Now seldata is properly filled in, but we still have to check for 0 as
+     * Now first and last are properly filled in, but we still have to check
-     * a special case.
+     * for 0 as a special case.
      */
     if (first == 0 && last == 0) {
 	/* ":[0]" or perhaps ":[0..0]" */
 	st->oneBigWord = TRUE;
 	st->newVal = st->val;
 	goto ok;
+    }
     /* ":[0..N]" or ":[N..0]" */
     if (first == 0 || last == 0)
 	goto bad_modifier;
-    /* Normal case: select the words described by seldata. */
+    /* Normal case: select the words described by first and last. */
     st->newVal = VarSelectWords(st->sep, st->oneBigWord, st->val, first, last);
 ok:
     free(estr);
     return AMR_OK;
 bad_modifier:
     free(estr);
     return AMR_BAD;
+}
 static int
 str_cmp_asc(const void *a, const void *b)