diff options
| author | christos <christos@NetBSD.org> | 2006-08-26 18:17:41 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2006-08-26 18:17:41 +0000 |
| commit | cdab3a7a065313dbbaaed36ef839e4ba6aa88f88 (patch) | |
| tree | 0f0010f3285f7d191c44439d5763c761a0a2ca5e /usr.bin/make/parse.c | |
| parent | d0fb89015b56d2b6a6b30ba0f70e30088de095fd (diff) | |
More programs using efun.
Diffstat (limited to 'usr.bin/make/parse.c')
| -rw-r--r-- | usr.bin/make/parse.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index dcca2dbefd5..7af9652559f 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.114 2006/03/31 21:58:08 christos Exp $ */ +/* $NetBSD: parse.c,v 1.115 2006/08/26 18:17:42 christos Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = "$NetBSD: parse.c,v 1.114 2006/03/31 21:58:08 christos Exp $"; +static char rcsid[] = "$NetBSD: parse.c,v 1.115 2006/08/26 18:17:42 christos Exp $"; #else #include <sys/cdefs.h> #ifndef lint #if 0 static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #else -__RCSID("$NetBSD: parse.c,v 1.114 2006/03/31 21:58:08 christos Exp $"); +__RCSID("$NetBSD: parse.c,v 1.115 2006/08/26 18:17:42 christos Exp $"); #endif #endif /* not lint */ #endif @@ -1206,17 +1206,17 @@ ParseDoDependency(char *line) * allow on this line... */ if (specType != Not && specType != ExPath) { - Boolean warn = FALSE; + Boolean warning = FALSE; while (*cp && (ParseIsEscaped(lstart, cp) || ((*cp != '!') && (*cp != ':')))) { if (ParseIsEscaped(lstart, cp) || (*cp != ' ' && *cp != '\t')) { - warn = TRUE; + warning = TRUE; } cp++; } - if (warn) { + if (warning) { Parse_Error(PARSE_WARNING, "Extra target ignored"); } } else { @@ -1734,7 +1734,7 @@ Parse_DoVar(char *line, GNode *ctxt) Var_Set(line, cp, ctxt, 0); } else if (type == VAR_SHELL) { char *res; - const char *err; + const char *error; if (strchr(cp, '$') != NULL) { /* @@ -1746,12 +1746,12 @@ Parse_DoVar(char *line, GNode *ctxt) freeCp = TRUE; } - res = Cmd_Exec(cp, &err); + res = Cmd_Exec(cp, &error); Var_Set(line, res, ctxt, 0); free(res); - if (err) - Parse_Error(PARSE_WARNING, err, cp); + if (error) + Parse_Error(PARSE_WARNING, error, cp); } else { /* * Normal assignment -- just do it. |
