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, simplify error processing

This commit is contained in:
rlar 2013-05-29 21:34:20 +02:00
parent eda5c611e2
commit ae7afafcfd
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/inpcom.c
View File

@ -4182,13 +4182,12 @@ inp_compat(struct line *card)
title_tok, node1, node2, title_tok); title_tok, node1, node2, title_tok);
// get the expression // get the expression
str_ptr = gettok(&cut_line); /* ignore 'table' */ str_ptr = gettok(&cut_line); /* ignore 'table' */
if (cieq(str_ptr, "table")) { if (!cieq(str_ptr, "table")) {
tfree(str_ptr);
} else {
fprintf(stderr, "Error: bad sytax in line %d\n %s\n", fprintf(stderr, "Error: bad sytax in line %d\n %s\n",
card->li_linenum_orig, card->li_line); card->li_linenum_orig, card->li_line);
controlled_exit(EXIT_BAD); controlled_exit(EXIT_BAD);
} }
tfree(str_ptr);
str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE); str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE);
expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */ expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */
if ((!expression) || (!str_ptr)) { if ((!expression) || (!str_ptr)) {
@ -4196,8 +4195,7 @@ inp_compat(struct line *card)
card->li_linenum_orig, card->li_line); card->li_linenum_orig, card->li_line);
controlled_exit(EXIT_BAD); controlled_exit(EXIT_BAD);
} }
else tfree(str_ptr);
tfree(str_ptr);
/* remove '{' and '}' from expression */ /* remove '{' and '}' from expression */
if ((str_ptr = strchr(expression, '{')) != NULL) if ((str_ptr = strchr(expression, '{')) != NULL)
*str_ptr = ' '; *str_ptr = ' ';
@ -4375,13 +4373,12 @@ inp_compat(struct line *card)
title_tok, node1, node2, title_tok); title_tok, node1, node2, title_tok);
// get the expression // get the expression
str_ptr = gettok(&cut_line); /* ignore 'table' */ str_ptr = gettok(&cut_line); /* ignore 'table' */
if (cieq(str_ptr, "table")) { if (!cieq(str_ptr, "table")) {
tfree(str_ptr);
} else {
fprintf(stderr, "Error: bad sytax in line %d\n %s\n", fprintf(stderr, "Error: bad sytax in line %d\n %s\n",
card->li_linenum_orig, card->li_line); card->li_linenum_orig, card->li_line);
controlled_exit(EXIT_BAD); controlled_exit(EXIT_BAD);
} }
tfree(str_ptr);
str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE); str_ptr = gettok_char(&cut_line, '{', FALSE, FALSE);
expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */ expression = gettok_char(&cut_line, '}', TRUE, TRUE); /* expression */
if ((!expression) || (!str_ptr)) { if ((!expression) || (!str_ptr)) {
@ -4389,8 +4386,7 @@ inp_compat(struct line *card)
card->li_linenum_orig, card->li_line); card->li_linenum_orig, card->li_line);
controlled_exit(EXIT_BAD); controlled_exit(EXIT_BAD);
} }
else tfree(str_ptr);
tfree(str_ptr);
/* remove '{' and '}' from expression */ /* remove '{' and '}' from expression */
if ((str_ptr = strchr(expression, '{')) != NULL) if ((str_ptr = strchr(expression, '{')) != NULL)
*str_ptr = ' '; *str_ptr = ' ';