Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make(1): rename VarSet_Flags to VarSetFlags

Browse Source 
Most other types don't have an underscore as well.
This commit is contained in:
rillig 2020-11-07 00:02:54 +00:00
parent 94119fc036
commit ec691613fa
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/make/nonints.h
View File

@ -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 **);

8
usr.bin/make/var.c
View File

@ -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;