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

inpcom.c, cleanup `inp_add_params_to_subckt()'

This commit is contained in:
rlar 2013-06-07 22:23:53 +02:00
parent c07038dfa9
commit 863996228b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend/inpcom.c
View File

@ -3760,9 +3760,12 @@ inp_add_params_to_subckt(struct names *subckt_w_params, struct line *subckt_card
char *new_line, *param_ptr, *subckt_name, *end_ptr; char *new_line, *param_ptr, *subckt_name, *end_ptr;
for (; card; card = card->li_next) { for (; card; card = card->li_next) {
char *curr_line = card->li_line; char *curr_line = card->li_line;
if (!ciprefix(".param", curr_line)) if (!ciprefix(".param", curr_line))
break; break;
param_ptr = strchr(curr_line, ' '); param_ptr = strchr(curr_line, ' ');
param_ptr = skip_ws(param_ptr); param_ptr = skip_ws(param_ptr);
@ -3770,7 +3773,7 @@ inp_add_params_to_subckt(struct names *subckt_w_params, struct line *subckt_card
new_line = TMALLOC(char, strlen(subckt_line) + strlen("params: ") + strlen(param_ptr) + 2); new_line = TMALLOC(char, strlen(subckt_line) + strlen("params: ") + strlen(param_ptr) + 2);
sprintf(new_line, "%s params: %s", subckt_line, param_ptr); sprintf(new_line, "%s params: %s", subckt_line, param_ptr);
subckt_name = skip_non_ws(subckt_card->li_line); subckt_name = skip_non_ws(subckt_line);
subckt_name = skip_ws(subckt_name); subckt_name = skip_ws(subckt_name);
end_ptr = skip_non_ws(subckt_name); end_ptr = skip_non_ws(subckt_name);
add_name(subckt_w_params, copy_substring(subckt_name, end_ptr)); add_name(subckt_w_params, copy_substring(subckt_name, end_ptr));
@ -3780,10 +3783,12 @@ inp_add_params_to_subckt(struct names *subckt_w_params, struct line *subckt_card
} }
tfree(subckt_line); tfree(subckt_line);
subckt_card->li_line = subckt_line = new_line; subckt_line = new_line;
*curr_line = '*'; *curr_line = '*';
} }
subckt_card->li_line = subckt_line;
} }