Sun Mar 14 20:23:29 2021 UTC ()

make: fix documentation of VarFreeEnv

No functional change.


(rillig)

diff -r1.882 -r1.883 src/usr.bin/make/var.c

--- src/usr.bin/make/var.c 2021/03/14 20:18:33	1.882
+++ src/usr.bin/make/var.c 2021/03/14 20:23:29	1.883

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.882 2021/03/14 20:18:33 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.883 2021/03/14 20:23:29 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.
 @@ -130,27 +130,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.882 2021/03/14 20:18:33 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.883 2021/03/14 20:23:29 rillig Exp $");
 typedef enum VarFlags {
 	VFL_NONE	= 0,
 	/*
 	 * The variable's value is currently being used by Var_Parse or
 	 * Var_Subst.  This marker is used to avoid endless recursion.
 	 */
 	VFL_IN_USE	= 1 << 0,
 	/*
 	 * The variable comes from the environment.
 	 * These variables are not registered in any GNode, therefore they
 @@ -451,33 +451,27 @@ VarFind(const char *name, GNode *scope,
 			var = GNode_FindVar(SCOPE_GLOBAL, name, nameHash);
 			if (var == NULL && scope != SCOPE_INTERNAL)
 				var = GNode_FindVar(SCOPE_INTERNAL, name,
 				    nameHash);
 			return var;
+		}
 		return NULL;
+	}
 	return var;
+}
-/*
+/* If the variable is an environment variable, free it, including its value. */
  * If the variable is an environment variable, free it, including its value.
  * Results:
  *	TRUE if it was an environment variable,
  *	FALSE if it is still a regular variable.
  */
 static void
 VarFreeEnv(Var *v)
+{
 	if (!(v->flags & VFL_FROM_ENV))
 		return;
 	FStr_Done(&v->name);
 	Buf_Done(&v->val);
 	free(v);
+}
 /* Add a new variable of the given name and value to the given scope. */
 static Var *