summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2007-09-17 11:14:37 +0000
committerespie <espie@openbsd.org>2007-09-17 11:14:37 +0000
commit16620742ac3de7e2b47acf539dbfcea31333a7aa (patch)
tree1636773618a3bf8cb6d7c933baebab61bc0be649
parentparseIncPath -> userIncludePath and assorted renames (diff)
downloadwireguard-openbsd-16620742ac3de7e2b47acf539dbfcea31333a7aa.tar.xz
wireguard-openbsd-16620742ac3de7e2b47acf539dbfcea31333a7aa.zip
Parse_DoVar -> Parse_As_Var_Assignment
-rw-r--r--usr.bin/make/parse.c4
-rw-r--r--usr.bin/make/parsevar.c4
-rw-r--r--usr.bin/make/parsevar.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index ec75b55591b..e81d86f2608 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: parse.c,v 1.89 2007/09/17 11:11:30 espie Exp $ */
+/* $OpenBSD: parse.c,v 1.90 2007/09/17 11:14:37 espie Exp $ */
/* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */
/*
@@ -1551,7 +1551,7 @@ Parse_File(
if (inDependency)
ParseFinishDependency();
- if (Parse_DoVar(stripped))
+ if (Parse_As_Var_Assignment(stripped))
inDependency = false;
else {
size_t pos;
diff --git a/usr.bin/make/parsevar.c b/usr.bin/make/parsevar.c
index d7fcb8c005b..abd4f93946b 100644
--- a/usr.bin/make/parsevar.c
+++ b/usr.bin/make/parsevar.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: parsevar.c,v 1.11 2007/09/17 09:44:20 espie Exp $ */
+/* $OpenBSD: parsevar.c,v 1.12 2007/09/17 11:14:38 espie Exp $ */
/* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */
/*
@@ -204,7 +204,7 @@ parse_variable_assignment(const char *line, int ctxt)
}
bool
-Parse_DoVar(const char *line)
+Parse_As_Var_Assignment(const char *line)
{
return parse_variable_assignment(line, VAR_GLOBAL);
}
diff --git a/usr.bin/make/parsevar.h b/usr.bin/make/parsevar.h
index 75a06b15101..b8a443a17b6 100644
--- a/usr.bin/make/parsevar.h
+++ b/usr.bin/make/parsevar.h
@@ -1,7 +1,7 @@
#ifndef PARSEVAR_H
#define PARSEVAR_H
/* $OpenPackages$ */
-/* $OpenBSD: parsevar.h,v 1.2 2007/07/08 17:44:20 espie Exp $ */
+/* $OpenBSD: parsevar.h,v 1.3 2007/09/17 11:14:38 espie Exp $ */
/*
* Copyright (c) 2001 Marc Espie.
*
@@ -31,10 +31,10 @@
* Functions to parse variable assignments
*/
-/* wasvar = Parse_DoVar(str);
+/* wasvar = Parse_As_Var_Assignment(str);
* Parses variable assignment str.
* Returns false if this is something else. */
-extern bool Parse_DoVar(const char *);
+extern bool Parse_As_Var_Assignment(const char *);
/* wasvar = Parse_CmdlineVar(str, ctxt);
* Parses variable assignment str, given on the command line.
* Returns false if this is something else. */