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, inp_fix_subckt(), cleanup

This commit is contained in:
rlar 2014-08-02 12:59:19 +02:00
parent 668b7e23c5
commit b50af8e8df
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/frontend/inpcom.c
View File

@ -2148,11 +2148,10 @@ inp_fix_subckt(struct names *subckt_w_params, char *s)
{ {
struct line *head = NULL, *start_card = NULL, *end_card = NULL, *prev_card = NULL, *c = NULL; struct line *head = NULL, *start_card = NULL, *end_card = NULL, *prev_card = NULL, *c = NULL;
char *equal, *beg, *buffer, *ptr1, *ptr2, *new_str = NULL; char *equal, *beg, *buffer, *ptr1, *ptr2, *new_str = NULL;
char keep;
int num_params = 0, i = 0; int num_params = 0, i = 0;
/* find first '=' */
equal = strchr(s, '='); equal = strchr(s, '=');
if (!strstr(s, "params:") && equal != NULL) { if (equal && !strstr(s, "params:")) {
/* get subckt name (ptr1 will point to name) */ /* get subckt name (ptr1 will point to name) */
ptr1 = skip_non_ws(s); ptr1 = skip_non_ws(s);
ptr1 = skip_ws(ptr1); ptr1 = skip_ws(ptr1);
@ -2170,7 +2169,7 @@ inp_fix_subckt(struct names *subckt_w_params, char *s)
head = xx_new_line(NULL, NULL, 0, 0); head = xx_new_line(NULL, NULL, 0, 0);
/* create list of parameters that need to get sorted */ /* create list of parameters that need to get sorted */
while (*beg && (ptr1 = strchr(beg, '=')) != NULL) { while ((ptr1 = strchr(beg, '=')) != NULL) {
#ifndef NOBRACE #ifndef NOBRACE
/* alternative patch to cope with spaces: /* alternative patch to cope with spaces:
get expression between braces {...} */ get expression between braces {...} */
@ -2189,8 +2188,7 @@ inp_fix_subckt(struct names *subckt_w_params, char *s)
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
keep = *ptr2; if (*ptr2 == '\0') {
if (keep == '\0') {
/* End of string - don't go over end. */ /* End of string - don't go over end. */
beg = ptr2; beg = ptr2;
} else { } else {
@ -2198,7 +2196,7 @@ inp_fix_subckt(struct names *subckt_w_params, char *s)
beg = ptr2 + 1; beg = ptr2 + 1;
} }
end_card = xx_new_line(NULL, strdup(ptr1), 0, 0); end_card = xx_new_line(NULL, copy_substring(ptr1, ptr2), 0, 0);
if (start_card == NULL) if (start_card == NULL)
head->li_next = start_card = end_card; head->li_next = start_card = end_card;