CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Fri Nov  6 00:05:18 UTC 2020

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

Log Message:
make(1): format source code of a few functions in var.c


To generate a diff of this commit:
cvs rdiff -u -r1.666 -r1.667 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.666 src/usr.bin/make/var.c:1.667
--- src/usr.bin/make/var.c:1.666	Thu Nov  5 23:52:08 2020
+++ src/usr.bin/make/var.c	Fri Nov  6 00:05:18 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.666 2020/11/05 23:52:08 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.667 2020/11/06 00:05:18 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -130,7 +130,7 @@
 #include "metachar.h"
 
 /*	"@(#)var.c	8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.666 2020/11/05 23:52:08 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.667 2020/11/06 00:05:18 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -3570,15 +3570,11 @@ ValidShortVarname(char varname, const ch
 /* Parse a single-character variable name such as $V or $@.
  * Return whether to continue parsing. */
 static Boolean
-ParseVarnameShort(
-	char startc,
-	const char **pp,
-	GNode *ctxt,
-	VarEvalFlags eflags,
-	VarParseResult *out_FALSE_res,
-	const char **out_FALSE_val,
-	Var **out_TRUE_var
-) {
+ParseVarnameShort(char startc, const char **pp, GNode *ctxt,
+		  VarEvalFlags eflags,
+		  VarParseResult *out_FALSE_res, const char **out_FALSE_val,
+		  Var **out_TRUE_var)
+{
     char name[2];
     Var *v;
     VarParseResult vpr;
@@ -3649,14 +3645,10 @@ FindLocalLegacyVar(const char *varname, 
 }
 
 static VarParseResult
-EvalUndefined(
-	Boolean dynamic,
-	const char *start,
-	const char *p, char *varname,
-	VarEvalFlags eflags,
-	void **out_freeIt,
-	const char **out_val
-) {
+EvalUndefined(Boolean dynamic, const char *start, const char *p, char *varname,
+	      VarEvalFlags eflags,
+	      void **out_freeIt, const char **out_val)
+{
     if (dynamic) {
 	char *pstr = bmake_strsedup(start, p);
 	free(varname);
@@ -3668,8 +3660,7 @@ EvalUndefined(
     if ((eflags & VARE_UNDEFERR) && (eflags & VARE_WANTRES) &&
 	DEBUG(LINT))
     {
-	Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined",
-		    varname);
+	Parse_Error(PARSE_FATAL, "Variable \"%s\" is undefined", varname);
 	free(varname);
 	*out_val = var_Error;
 	return VPR_UNDEF_MSG;