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

Removed some garbage introduced by CVS.

This commit is contained in:
pnenzi 2001-11-23 08:13:58 +00:00
parent 79bc909c05
commit 5cc15682eb
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontend/inp.c
View File

@ -438,17 +438,12 @@ inp_spsource(FILE *fp, bool comfile, char *filename)
* the case before we do this but after we deal with the
* commands. */
if (!cp_getvar("nosubckt", VT_BOOL, (char *) &nosubckts))
<<<<<<< inp.c
if((deck->li_next = inp_subcktexpand(deck->li_next)) == NULL){
line_free(realdeck,TRUE);
line_free(deck->li_actual, TRUE);
return;
}
line_free(deck->li_actual,FALSE); /* SJB - free memory used by old li_actual (if any) */
=======
deck->li_next = inp_subcktexpand(deck->li_next);
line_free(deck->li_actual,FALSE); /* SJB - free memory used by old li_actual (if any) */
>>>>>>> 1.7
deck->li_actual = realdeck;
inp_dodeck(deck, tt, wl_first, FALSE, options, filename);
}