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, get_instance_subckt(), rewrite

This commit is contained in:
rlar 2012-10-13 11:18:22 +02:00
parent 2754771a61
commit f61f323be0
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend/inpcom.c
View File

@ -1242,25 +1242,20 @@ inp_fix_macro_param_func_paren_io(struct line *begin_card)
static char *
get_instance_subckt(char *line)
{
char *equal_ptr, *end_ptr = line + strlen(line), *inst_name_ptr, *inst_name;
char keep = ' ';
char *end_ptr, *inst_name_ptr;
char *equal_ptr = strstr(line, "=");
// see if instance has parameters
if ((equal_ptr = strstr(line, "=")) != NULL) {
if (equal_ptr) {
end_ptr = skip_back_ws(equal_ptr - 1);
end_ptr = skip_back_non_ws(end_ptr);
end_ptr = skip_back_ws(end_ptr) + 1;
keep = *end_ptr;
*end_ptr = '\0';
} else {
end_ptr = line + strlen(line);
}
inst_name_ptr = skip_back_non_ws(end_ptr - 1) + 1;
inst_name = strdup(inst_name_ptr);
if (equal_ptr)
*end_ptr = keep;
return inst_name;
return copy_substring(inst_name_ptr, end_ptr);
}