luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

frontend/inpcom.c, inp_expand_macro_in_str(), shrink scope of some locals

This commit is contained in:
rlar 2016-08-09 20:00:11 +02:00
parent bbe3a3bf89
commit c505cb820d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/frontend/inpcom.c
View File

@ -3042,10 +3042,9 @@ static char*
inp_expand_macro_in_str(struct function_env *env, char *str) inp_expand_macro_in_str(struct function_env *env, char *str)
{ {
struct function *function; struct function *function;
char *c;
char *open_paren_ptr, *close_paren_ptr, *fcn_name, *params[1000]; char *open_paren_ptr, *close_paren_ptr, *fcn_name, *params[1000];
char *curr_ptr, *macro_str, *curr_str = NULL; char *curr_ptr, *macro_str, *curr_str = NULL;
int num_parens, num_params, i; int num_params, i;
char *orig_ptr = str, *search_ptr = str, *orig_str = strdup(str); char *orig_ptr = str, *search_ptr = str, *orig_str = strdup(str);
char keep; char keep;
@ -3073,20 +3072,24 @@ inp_expand_macro_in_str(struct function_env *env, char *str)
continue; continue;
/* find the closing paren */ /* find the closing paren */
num_parens = 1; {
for (c = open_paren_ptr + 1; *c; c++) { int num_parens = 1;
if (*c == '(') char *c = open_paren_ptr + 1;
num_parens++;
if (*c == ')' && --num_parens == 0)
break;
}
if (num_parens) { for (; *c; c++) {
fprintf(stderr, "ERROR: did not find closing parenthesis for function call in str: %s\n", orig_str); if (*c == '(')
controlled_exit(EXIT_FAILURE); num_parens++;
} if (*c == ')' && --num_parens == 0)
break;
}
close_paren_ptr = c; if (num_parens) {
fprintf(stderr, "ERROR: did not find closing parenthesis for function call in str: %s\n", orig_str);
controlled_exit(EXIT_FAILURE);
}
close_paren_ptr = c;
}
/* /*
* if (ciprefix("v(", curr_ptr)) { * if (ciprefix("v(", curr_ptr)) {