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

- symbolic names for error and no error 

- more size_t
This commit is contained in:
christos 2008-02-15 02:37:51 +00:00
parent 8b441bdff6
commit 4d9d6704c1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: var.c,v 1.124 2008/02/14 22:11:20 christos Exp $ */ /* $NetBSD: var.c,v 1.125 2008/02/15 02:37:51 christos Exp $ */
/* /*
* Copyright (c) 1988, 1989, 1990, 1993 * Copyright (c) 1988, 1989, 1990, 1993
@ -69,14 +69,14 @@
*/ */
#ifndef MAKE_NATIVE #ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: var.c,v 1.124 2008/02/14 22:11:20 christos Exp $"; static char rcsid[] = "$NetBSD: var.c,v 1.125 2008/02/15 02:37:51 christos Exp $";
#else #else
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
#if 0 #if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94"; static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 3/19/94";
#else #else
__RCSID("$NetBSD: var.c,v 1.124 2008/02/14 22:11:20 christos Exp $"); __RCSID("$NetBSD: var.c,v 1.125 2008/02/15 02:37:51 christos Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
#endif #endif
@ -141,14 +141,14 @@ __RCSID("$NetBSD: var.c,v 1.124 2008/02/14 22:11:20 christos Exp $");
* to determine if there was an error in parsing -- easier than returning * to determine if there was an error in parsing -- easier than returning
* a flag, as things outside this module don't give a hoot. * a flag, as things outside this module don't give a hoot.
*/ */
char var_Error[] = ""; char var_Error[] = "*error*";
/* /*
* Similar to var_Error, but returned when the 'errnum' flag for Var_Parse is * Similar to var_Error, but returned when the 'errnum' flag for Var_Parse is
* set false. Why not just use a constant? Well, gcc likes to condense * set false. Why not just use a constant? Well, gcc likes to condense
* identical string instances... * identical string instances...
*/ */
static char varNoError[] = ""; static char varNoError[] = "*noerror*";
/* /*
* Internally, variables are contained in four different contexts. * Internally, variables are contained in four different contexts.
@ -3239,7 +3239,7 @@ Var_Parse(const char *str, GNode *ctxt, Boolean errnum, size_t *lengthPtr,
* or braces */ * or braces */
char startc=0; /* Starting character when variable in parens char startc=0; /* Starting character when variable in parens
* or braces */ * or braces */
int vlen; /* Length of variable name */ size_t vlen; /* Length of variable name */
const char *start; /* Points to original start of str */ const char *start; /* Points to original start of str */
char *nstr; /* New string, used during expansion */ char *nstr; /* New string, used during expansion */
Boolean dynamic; /* TRUE if the variable is local and we're Boolean dynamic; /* TRUE if the variable is local and we're