d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Push assignments to just before the returns from the function to

Browse Source 
get it clearer what variables are actually needed.

Patches:	7.62.2, 7.62.3
Submitted by:	Max Okumoto <okumoto@ucsd.edu>
This commit is contained in:
Hartmut Brandt 2005-02-24 10:35:39 +00:00
parent 0cb1c98b7a
commit a65e9283c5
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1061,9 +1061,9 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
* No modifiers -- have specification length so we can return
* now.
*/
*lengthPtr = tstr - start + 1;
*tstr = endc;
if (dynamic) {
*lengthPtr = tstr - start + 1;
*tstr = endc;
str = emalloc(*lengthPtr + 1);
strncpy(str, start, *lengthPtr);
str[*lengthPtr] = '\0';
@ -1071,6 +1071,8 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
Buf_Destroy(buf, TRUE);
return (str);
} else {
*lengthPtr = tstr - start + 1;
*tstr = endc;
*freePtr = FALSE;
Buf_Destroy(buf, TRUE);
return (err ? var_Error : varNoError);
@ -1090,8 +1092,6 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
*/
char name[2];
*lengthPtr = 2;
name[0] = str[1];
name[1] = '\0';
@ -1109,6 +1109,7 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
*/
/* XXX: It looks like $% and $! are reversed here */
*freePtr = FALSE;
*lengthPtr = 2;
switch (str[1]) {
case '@':
return ("$(.TARGET)");
@ -1119,22 +1120,23 @@ Var_Parse(char *str, GNode *ctxt, Boolean err, size_t *lengthPtr,
case '!':
return ("$(.MEMBER)");
default:
break;
return (err ? var_Error : varNoError);
}
} else {
*freePtr = FALSE;
*lengthPtr = 2;
return (err ? var_Error : varNoError);
}
/*
* Error
*/
} else {
dynamic = FALSE;
start = str;
*freePtr = FALSE;
return (err ? var_Error : varNoError);
*lengthPtr = 2;
haveModifier = FALSE;
startc = 0;
endc = str[1];
tstr = &str[1];
}
dynamic = FALSE;
start = str;
*freePtr = FALSE;
haveModifier = FALSE;
startc = 0;
endc = str[1];
tstr = &str[1];
}
if (v->flags & VAR_IN_USE) {