CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:    src
Committed By:   rillig
Date:           Sat Nov  7 00:02:54 UTC 2020

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

Log Message:
make(1): rename VarSet_Flags to VarSetFlags

Most other types don't have an underscore as well.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.669 -r1.670 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/nonints.h
diff -u src/usr.bin/make/nonints.h:1.151 src/usr.bin/make/nonints.h:1.152
--- src/usr.bin/make/nonints.h:1.151	Fri Nov  6 23:59:21 2020
+++ src/usr.bin/make/nonints.h	Sat Nov  7 00:02:54 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nonints.h,v 1.151 2020/11/06 23:59:21 rillig Exp $	*/
+/*	$NetBSD: nonints.h,v 1.152 2020/11/07 00:02:54 rillig Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -229,7 +229,7 @@ typedef enum VarSet_Flags {
     /* Make the variable read-only. No further modification is possible,
      * except for another call to Var_Set with the same flag. */
     VAR_SET_READONLY	= 0x02
-} VarSet_Flags;
+} VarSetFlags;
 
 /* The state of error handling returned by Var_Parse.
  *
@@ -288,7 +288,7 @@ typedef enum VarParseResult {
 
 void Var_Delete(const char *, GNode *);
 void Var_Set(const char *, const char *, GNode *);
-void Var_Set_with_flags(const char *, const char *, GNode *, VarSet_Flags);
+void Var_Set_with_flags(const char *, const char *, GNode *, VarSetFlags);
 void Var_Append(const char *, const char *, GNode *);
 Boolean Var_Exists(const char *, GNode *);
 const char *Var_Value(const char *, GNode *, void **);

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.669 src/usr.bin/make/var.c:1.670
--- src/usr.bin/make/var.c:1.669	Fri Nov  6 23:11:11 2020
+++ src/usr.bin/make/var.c	Sat Nov  7 00:02:54 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.669 2020/11/06 23:11:11 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.670 2020/11/07 00:02:54 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.669 2020/11/06 23:11:11 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.670 2020/11/07 00:02:54 rillig Exp $");
 
 #define VAR_DEBUG1(fmt, arg1) DEBUG1(VAR, fmt, arg1)
 #define VAR_DEBUG2(fmt, arg1, arg2) DEBUG2(VAR, fmt, arg1, arg2)
@@ -434,7 +434,7 @@ VarFreeEnv(Var *v, Boolean freeValue)
 /* Add a new variable of the given name and value to the given context.
  * The name and val arguments are duplicated so they may safely be freed. */
 static void
-VarAdd(const char *name, const char *val, GNode *ctxt, VarSet_Flags flags)
+VarAdd(const char *name, const char *val, GNode *ctxt, VarSetFlags flags)
 {
     HashEntry *he = HashTable_CreateEntry(&ctxt->context, name, NULL);
     Var *v = VarNew(he->key /* aliased */, NULL, val,
@@ -768,7 +768,7 @@ Var_UnExport(const char *str)
 /* See Var_Set for documentation. */
 void
 Var_Set_with_flags(const char *name, const char *val, GNode *ctxt,
-		   VarSet_Flags flags)
+		   VarSetFlags flags)
 {
     const char *unexpanded_name = name;
     char *name_freeIt = NULL;