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

INPparseNumMod(), #6/14, again, assign 'lastType' sooner 

in the block in-between those two positions
  there is no access to lastType
  there is no 'continue'
  there is no 'break' out of the enclosing switch
thus the assignment is inevitable

there is one position where cardType is modified,
  need to assign to lastType there too to keep it in sync
This commit is contained in:
rlar 2016-07-10 16:46:53 +02:00
parent 18d6679c02
commit 110f16b361
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/spicelib/parser/inpgmod.c
View File

@ -379,12 +379,14 @@ INPparseNumMod( CKTcircuit* ckt, INPmodel *model, INPtables *tab, char **errMess
}
/* FALL THRU when continuing a card */
default:
lastType = cardType;
if (cardType == E_MISSING) {
/* new command card */
if (cardName) FREE(cardName); /* get rid of old card name */
INPgetTok(&line,&cardName,1); /* get new card name */
if (*cardName) { /* Found a name? */
cardType = INPfindCard(cardName,INPcardTab,INPnumCards);
lastType = cardType;
if (cardType >= 0) {
/* Add card structure to model */
info = INPcardTab[cardType];
@ -407,7 +409,6 @@ INPparseNumMod( CKTcircuit* ckt, INPmodel *model, INPtables *tab, char **errMess
}
}
}
lastType = cardType;
// cardType is not used downwards from here
if (lastType >= 0) { /* parse the rest of this line */
while (*line) {