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

don't print NULL (deallocated lines)

This commit is contained in:
Holger Vogt 2018-05-16 00:19:46 +02:00
parent 9908b39d2b
commit cfa473ad96
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontend/inpcom.c
View File

@ -6130,7 +6130,7 @@ inp_meas_current(struct card *deck)
{ {
struct card *card, *subc_start = NULL, *subc_prev = NULL; struct card *card, *subc_start = NULL, *subc_prev = NULL;
struct replace_currm *new_rep, *act_rep = NULL, *rep = NULL; struct replace_currm *new_rep, *act_rep = NULL, *rep = NULL;
char *s, *t, *u, *v; char *s, *t, *u, *v, *w;
int skip_control = 0, subs = 0; int skip_control = 0, subs = 0;
/* scan through deck and find i(xyz), replace by i(v_xyz) */ /* scan through deck and find i(xyz), replace by i(v_xyz) */
@ -6171,14 +6171,14 @@ inp_meas_current(struct card *deck)
if (!strstr(curr_line, "i(")) if (!strstr(curr_line, "i("))
continue; continue;
s = v = stripWhiteSpacesInsideParens(curr_line); s = v = w = stripWhiteSpacesInsideParens(curr_line);
while (s) { while (s) {
/* i( may occur more than once in a line */ /* i( may occur more than once in a line */
s = u = strstr(s, "i("); s = u = strstr(s, "i(");
/* we have found it, but not (in error) at the beginning of the line */ /* we have found it, but not (in error) at the beginning of the line */
if (s && s > v) { if (s && s > v) {
/* '{' if at beginning of expression */ /* '{' if at beginning of expression, '=' possible in B-line */
if (is_arith_char(s[-1]) || s[-1] == '{') { if (is_arith_char(s[-1]) || s[-1] == '{' || s[-1] == '=') {
s += 2; s += 2;
if (*s == 'v') { if (*s == 'v') {
// printf("i(v...) found in\n%s\n not converted!\n\n", curr_line); // printf("i(v...) found in\n%s\n not converted!\n\n", curr_line);
@ -6190,7 +6190,7 @@ inp_meas_current(struct card *deck)
/* token containing name of devices to be measured */ /* token containing name of devices to be measured */
t = copy_substring(s, --u); t = copy_substring(s, --u);
if (ft_ngdebug) if (ft_ngdebug)
printf("i(%s) found in\n%s\n\n", t, curr_line); printf("i(%s) found in\n%s\n\n", t, v);
/* new entry to the end of struct rep */ /* new entry to the end of struct rep */
new_rep = TMALLOC(struct replace_currm, 1); new_rep = TMALLOC(struct replace_currm, 1);
@ -6209,8 +6209,7 @@ inp_meas_current(struct card *deck)
new_str = tprintf("%s%s%s", beg_str, "v_", s); new_str = tprintf("%s%s%s", beg_str, "v_", s);
if (ft_ngdebug) if (ft_ngdebug)
printf("converted to\n%s\n\n", new_str); printf("converted to\n%s\n\n", new_str);
tfree(curr_line); tfree(card->line);
tfree(v);
card->line = s = v = new_str; card->line = s = v = new_str;
s++; s++;
tfree(beg_str); tfree(beg_str);
@ -6220,6 +6219,7 @@ inp_meas_current(struct card *deck)
s++; s++;
} }
} }
tfree(w);
} }
/* return if we did not find any i( */ /* return if we did not find any i( */