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

devices/**/XXXmdel.c, use GENmodel and GENinstance

This commit is contained in:
rlar 2018-01-04 22:21:23 +01:00
parent a0e8c91d89
commit 12dfa082ce
55 changed files with 425 additions and 533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/spicelib/devices/asrc/asrcmdel.c
View File

@ -10,17 +10,15 @@ Author: 1987 Kanwar Jit Singh
int int
ASRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) ASRCmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
ASRCmodel **model = (ASRCmodel **) inModel; GENinstance *here;
ASRCmodel *modfast = (ASRCmodel *) kill; GENinstance *prev = NULL;
ASRCinstance *here; GENmodel **oldmod;
ASRCinstance *prev = NULL;
ASRCmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->ASRCnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->ASRCmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -29,10 +27,10 @@ ASRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
delgot: delgot:
*oldmod = (*model)->ASRCnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->ASRCinstances; here; here = here->ASRCnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
FREE(here->ASRCacValues); FREE(((ASRCinstance*)here)->ASRCacValues);
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

14
src/spicelib/devices/bjt/bjtmdel.c
View File

@ -16,15 +16,13 @@ Author: 1985 Thomas L. Quarles
int int
BJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BJTmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BJTmodel **model = (BJTmodel **) inModel; GENmodel **oldmod;
BJTmodel *modfast = (BJTmodel *) kill;
BJTmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BJTnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BJTmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -32,9 +30,9 @@ BJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
if ((*model)->BJTinstances) if ((*model)->GENinstances)
return E_NOTEMPTY; return E_NOTEMPTY;
*oldmod = (*model)->BJTnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
FREE(*model); FREE(*model);
return OK; return OK;
} }

18
src/spicelib/devices/bsim1/b1mdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
int int
B1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) B1mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
B1model **model = (B1model **) inModel; GENinstance *here;
B1model *modfast = (B1model *) kill; GENinstance *prev = NULL;
B1instance *here; GENmodel **oldmod;
B1instance *prev = NULL;
B1model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->B1nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->B1modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ B1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->B1nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->B1instances; here; here = here->B1nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim2/b2mdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Hong J. Park, Thomas L. Quarles
int int
B2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) B2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
B2model **model = (B2model **) inModel; GENinstance *here;
B2model *modfast = (B2model *) kill; GENinstance *prev = NULL;
B2instance *here; GENmodel **oldmod;
B2instance *prev = NULL;
B2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->B2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->B2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ B2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->B2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->B2instances; here; here = here->B2nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim3/b3mdel.c
View File

@ -15,17 +15,15 @@
int int
BSIM3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM3mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM3model **model = (BSIM3model **) inModel; GENinstance *here;
BSIM3model *modfast = (BSIM3model *) kill; GENinstance *prev = NULL;
BSIM3instance *here; GENmodel **oldmod;
BSIM3instance *prev = NULL;
BSIM3model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM3nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM3modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -33,8 +31,8 @@ BSIM3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM3nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM3instances; here; here = here->BSIM3nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim3soi_dd/b3soiddmdel.c
View File

@ -18,17 +18,15 @@ Modified by Paolo Nenzi 2002
int int
B3SOIDDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) B3SOIDDmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
B3SOIDDmodel **model = (B3SOIDDmodel **) inModel; GENinstance *here;
B3SOIDDmodel *modfast = (B3SOIDDmodel *) kill; GENinstance *prev = NULL;
B3SOIDDinstance *here; GENmodel **oldmod;
B3SOIDDinstance *prev = NULL;
B3SOIDDmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->B3SOIDDnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->B3SOIDDmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -36,8 +34,8 @@ B3SOIDDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->B3SOIDDnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->B3SOIDDinstances; here; here = here->B3SOIDDnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim3soi_fd/b3soifdmdel.c
View File

@ -17,17 +17,15 @@ File: b3soifdmdel.c 98/5/01
int int
B3SOIFDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) B3SOIFDmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
B3SOIFDmodel **model = (B3SOIFDmodel **) inModel; GENinstance *here;
B3SOIFDmodel *modfast = (B3SOIFDmodel *) kill; GENinstance *prev = NULL;
B3SOIFDinstance *here; GENmodel **oldmod;
B3SOIFDinstance *prev = NULL;
B3SOIFDmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->B3SOIFDnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->B3SOIFDmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -35,8 +33,8 @@ B3SOIFDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->B3SOIFDnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->B3SOIFDinstances; here; here = here->B3SOIFDnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim3soi_pd/b3soipdmdel.c
View File

@ -17,17 +17,15 @@ Modified by Paolo Nenzi 2002
int int
B3SOIPDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) B3SOIPDmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
B3SOIPDmodel **model = (B3SOIPDmodel **) inModel; GENinstance *here;
B3SOIPDmodel *modfast = (B3SOIPDmodel *) kill; GENinstance *prev = NULL;
B3SOIPDinstance *here; GENmodel **oldmod;
B3SOIPDinstance *prev = NULL;
B3SOIPDmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->B3SOIPDnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->B3SOIPDmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -35,8 +33,8 @@ B3SOIPDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->B3SOIPDnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->B3SOIPDinstances; here; here = here->B3SOIPDnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim3v0/b3v0mdel.c
View File

@ -11,17 +11,15 @@ File: b3v0mdel.c
int int
BSIM3v0mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM3v0mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM3v0model **model = (BSIM3v0model **) inModel; GENinstance *here;
BSIM3v0model *modfast = (BSIM3v0model *) kill; GENinstance *prev = NULL;
BSIM3v0instance *here; GENmodel **oldmod;
BSIM3v0instance *prev = NULL;
BSIM3v0model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM3v0nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM3v0modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -29,8 +27,8 @@ BSIM3v0mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM3v0nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM3v0instances; here; here = here->BSIM3v0nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim3v1/b3v1mdel.c
View File

@ -17,17 +17,15 @@
int int
BSIM3v1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM3v1mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM3v1model **model = (BSIM3v1model **) inModel; GENinstance *here;
BSIM3v1model *modfast = (BSIM3v1model *) kill; GENinstance *prev = NULL;
BSIM3v1instance *here; GENmodel **oldmod;
BSIM3v1instance *prev = NULL;
BSIM3v1model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM3v1nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM3v1modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -35,8 +33,8 @@ BSIM3v1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM3v1nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM3v1instances; here; here = here->BSIM3v1nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim3v32/b3v32mdel.c
View File

@ -16,17 +16,15 @@
int int
BSIM3v32mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM3v32mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM3v32model **model = (BSIM3v32model **) inModel; GENinstance *here;
BSIM3v32model *modfast = (BSIM3v32model *) kill; GENinstance *prev = NULL;
BSIM3v32instance *here; GENmodel **oldmod;
BSIM3v32instance *prev = NULL;
BSIM3v32model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM3v32nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM3v32modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -34,8 +32,8 @@ BSIM3v32mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM3v32nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM3v32instances; here; here = here->BSIM3v32nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim4/b4mdel.c
View File

@ -65,17 +65,15 @@
int int
BSIM4mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM4mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM4model **model = (BSIM4model **) inModel; GENinstance *here;
BSIM4model *modfast = (BSIM4model *) kill; GENinstance *prev = NULL;
BSIM4instance *here; GENmodel **oldmod;
BSIM4instance *prev = NULL;
BSIM4model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM4nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM4modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -83,8 +81,8 @@ BSIM4mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM4nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM4instances; here; here = here->BSIM4nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim4v5/b4v5mdel.c
View File

@ -15,17 +15,15 @@
int int
BSIM4v5mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM4v5mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM4v5model **model = (BSIM4v5model **) inModel; GENinstance *here;
BSIM4v5model *modfast = (BSIM4v5model *) kill; GENinstance *prev = NULL;
BSIM4v5instance *here; GENmodel **oldmod;
BSIM4v5instance *prev = NULL;
BSIM4v5model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM4v5nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM4v5modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -33,8 +31,8 @@ BSIM4v5mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM4v5nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM4v5instances; here; here = here->BSIM4v5nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim4v6/b4v6mdel.c
View File

@ -17,17 +17,15 @@
int int
BSIM4v6mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM4v6mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM4v6model **model = (BSIM4v6model **) inModel; GENinstance *here;
BSIM4v6model *modfast = (BSIM4v6model *) kill; GENinstance *prev = NULL;
BSIM4v6instance *here; GENmodel **oldmod;
BSIM4v6instance *prev = NULL;
BSIM4v6model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM4v6nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM4v6modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -35,8 +33,8 @@ BSIM4v6mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM4v6nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM4v6instances; here; here = here->BSIM4v6nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsim4v7/b4v7mdel.c
View File

@ -17,17 +17,15 @@
int int
BSIM4v7mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) BSIM4v7mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
BSIM4v7model **model = (BSIM4v7model **) inModel; GENinstance *here;
BSIM4v7model *modfast = (BSIM4v7model *) kill; GENinstance *prev = NULL;
BSIM4v7instance *here; GENmodel **oldmod;
BSIM4v7instance *prev = NULL;
BSIM4v7model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->BSIM4v7nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->BSIM4v7modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -35,8 +33,8 @@ BSIM4v7mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->BSIM4v7nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->BSIM4v7instances; here; here = here->BSIM4v7nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/bsimsoi/b4soimdel.c
View File

@ -21,17 +21,15 @@
int int
B4SOImDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) B4SOImDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
B4SOImodel **model = (B4SOImodel **) inModel; GENinstance *here;
B4SOImodel *modfast = (B4SOImodel *) kill; GENinstance *prev = NULL;
B4SOIinstance *here; GENmodel **oldmod;
B4SOIinstance *prev = NULL;
B4SOImodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->B4SOInextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->B4SOImodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -39,8 +37,8 @@ B4SOImDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->B4SOInextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->B4SOIinstances; here; here = here->B4SOInextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/cap/capmdel.c
View File

@ -11,17 +11,15 @@ Modified: Spetember 2003 Paolo Nenzi
int int
CAPmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) CAPmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
CAPmodel *modfast = (CAPmodel *) kill; GENinstance *here;
CAPmodel **model = (CAPmodel **) inModel; GENinstance *prev = NULL;
CAPinstance *here; GENmodel **oldmod;
CAPinstance *prev = NULL;
CAPmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->CAPnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->CAPmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -29,8 +27,8 @@ CAPmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->CAPnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->CAPinstances; here; here = here->CAPnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/cccs/cccsmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
CCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) CCCSmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
CCCSmodel **model = (CCCSmodel **) inModel; GENinstance *here;
CCCSmodel *modfast = (CCCSmodel *) kill; GENinstance *prev = NULL;
CCCSinstance *here; GENmodel **oldmod;
CCCSinstance *prev = NULL;
CCCSmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->CCCSnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->CCCSmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ CCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->CCCSnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->CCCSinstances; here; here = here->CCCSnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/ccvs/ccvsmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
CCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) CCVSmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
CCVSmodel **model = (CCVSmodel **) inModel; GENinstance *here;
CCVSmodel *modfast = (CCVSmodel *) kill; GENinstance *prev = NULL;
CCVSinstance *here; GENmodel **oldmod;
CCVSinstance *prev = NULL;
CCVSmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->CCVSnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->CCVSmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ CCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->CCVSnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->CCVSinstances; here; here = here->CCVSnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/cpl/cplmdel.c
View File

@ -12,17 +12,15 @@ Author: 1992 Charles Hough
int int
CPLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) CPLmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
CPLmodel **model = (CPLmodel **) inModel; GENinstance *here;
CPLmodel *modfast = (CPLmodel *) kill; GENinstance *prev = NULL;
CPLinstance *here; GENmodel **oldmod;
CPLinstance *prev = NULL;
CPLmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->CPLnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->CPLmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -30,8 +28,8 @@ CPLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->CPLnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->CPLinstances; here; here = here->CPLnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/csw/cswmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Gordon Jacobs
int int
CSWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) CSWmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
CSWmodel **model = (CSWmodel **) inModel; GENinstance *here;
CSWmodel *modfast = (CSWmodel *) kill; GENinstance *prev = NULL;
CSWinstance *here; GENmodel **oldmod;
CSWinstance *prev = NULL;
CSWmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->CSWnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->CSWmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ CSWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->CSWnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->CSWinstances; here; here = here->CSWnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/dio/diomdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
DIOmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) DIOmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
DIOmodel **model = (DIOmodel **) inModel; GENinstance *here;
DIOmodel *modfast = (DIOmodel *) kill; GENinstance *prev = NULL;
DIOinstance *here; GENmodel **oldmod;
DIOinstance *prev = NULL;
DIOmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->DIOnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->DIOmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ DIOmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->DIOnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->DIOinstances; here; here = here->DIOnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/hfet1/hfetmdel.c
View File

@ -14,17 +14,15 @@ Author: 1985 S. Hwang
int int
HFETAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) HFETAmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
HFETAmodel **model = (HFETAmodel **) inModel; GENinstance *here;
HFETAmodel *modfast = (HFETAmodel *) kill; GENinstance *prev = NULL;
HFETAinstance *here; GENmodel **oldmod;
HFETAinstance *prev = NULL;
HFETAmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->HFETAnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->HFETAmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -32,8 +30,8 @@ HFETAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->HFETAnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->HFETAinstances; here; here = here->HFETAnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/hfet2/hfet2mdel.c
View File

@ -14,17 +14,15 @@ Author: 1985 S. Hwang
int int
HFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) HFET2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
HFET2model **model = (HFET2model **) inModel; GENinstance *here;
HFET2model *modfast = (HFET2model *) kill; GENinstance *prev = NULL;
HFET2instance *here; GENmodel **oldmod;
HFET2instance *prev = NULL;
HFET2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->HFET2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->HFET2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -32,8 +30,8 @@ HFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->HFET2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->HFET2instances; here; here = here->HFET2nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/hisim2/hsm2mdel.c
View File

@ -61,17 +61,15 @@ to others."
int int
HSM2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) HSM2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
HSM2model **model = (HSM2model **) inModel; GENinstance *here;
HSM2model *modfast = (HSM2model *) kill; GENinstance *prev = NULL;
HSM2instance *here; GENmodel **oldmod;
HSM2instance *prev = NULL;
HSM2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->HSM2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->HSM2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -79,8 +77,8 @@ HSM2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->HSM2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->HSM2instances; here; here = here->HSM2nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/hisimhv1/hsmhvmdel.c
View File

@ -22,17 +22,15 @@
int int
HSMHVmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) HSMHVmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
HSMHVmodel **model = (HSMHVmodel **) inModel; GENinstance *here;
HSMHVmodel *modfast = (HSMHVmodel *) kill; GENinstance *prev = NULL;
HSMHVinstance *here; GENmodel **oldmod;
HSMHVinstance *prev = NULL;
HSMHVmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->HSMHVnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->HSMHVmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -40,8 +38,8 @@ HSMHVmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->HSMHVnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->HSMHVinstances; here; here = here->HSMHVnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/hisimhv2/hsmhv2mdel.c
View File

@ -64,17 +64,15 @@ June 2008 (revised October 2011)
int int
HSMHV2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) HSMHV2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
HSMHV2model **model = (HSMHV2model **) inModel; GENinstance *here;
HSMHV2model *modfast = (HSMHV2model *) kill; GENinstance *prev = NULL;
HSMHV2instance *here; GENmodel **oldmod;
HSMHV2instance *prev = NULL;
HSMHV2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->HSMHV2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->HSMHV2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -82,8 +80,8 @@ HSMHV2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->HSMHV2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->HSMHV2instances; here; here = here->HSMHV2nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/ind/indmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
INDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) INDmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
INDmodel **model = (INDmodel **) inModel; GENinstance *here;
INDmodel *modfast = (INDmodel *) kill; GENinstance *prev = NULL;
INDinstance *here; GENmodel **oldmod;
INDinstance *prev = NULL;
INDmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->INDnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->INDmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ INDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->INDnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->INDinstances; here; here = here->INDnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/ind/mutmdel.c
View File

@ -11,17 +11,15 @@ Author: 1985 Thomas L. Quarles
#ifdef MUTUAL #ifdef MUTUAL
int int
MUTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) MUTmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
MUTmodel **model = (MUTmodel **) inModel; GENinstance *here;
MUTmodel *modfast = (MUTmodel *) kill; GENinstance *prev = NULL;
MUTinstance *here; GENmodel **oldmod;
MUTinstance *prev = NULL;
MUTmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->MUTnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->MUTmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -29,8 +27,8 @@ MUTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->MUTnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->MUTinstances; here; here = here->MUTnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/isrc/isrcmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
ISRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) ISRCmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
ISRCmodel **model = (ISRCmodel **) inModel; GENinstance *here;
ISRCmodel *modfast = (ISRCmodel *) kill; GENinstance *prev = NULL;
ISRCinstance *here; GENmodel **oldmod;
ISRCinstance *prev = NULL;
ISRCmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->ISRCnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->ISRCmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ ISRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->ISRCnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->ISRCinstances; here; here = here->ISRCnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/jfet/jfetmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
JFETmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) JFETmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
JFETmodel **model = (JFETmodel **) inModel; GENinstance *here;
JFETmodel *modfast = (JFETmodel *) kill; GENinstance *prev = NULL;
JFETinstance *here; GENmodel **oldmod;
JFETinstance *prev = NULL;
JFETmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->JFETnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->JFETmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ JFETmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->JFETnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->JFETinstances; here; here = here->JFETnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/jfet2/jfet2mdel.c
View File

@ -14,17 +14,15 @@ Modified to jfet2 for PS model definition ( Anthony E. Parker )
int int
JFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) JFET2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
JFET2model **model = (JFET2model **) inModel; GENinstance *here;
JFET2model *modfast = (JFET2model *) kill; GENinstance *prev = NULL;
JFET2instance *here; GENmodel **oldmod;
JFET2instance *prev = NULL;
JFET2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->JFET2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->JFET2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -32,8 +30,8 @@ JFET2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->JFET2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->JFET2instances; here; here = here->JFET2nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/ltra/ltramdel.c
View File

@ -10,17 +10,15 @@ Author: 1990 Jaijeet S. Roychowdhury
int int
LTRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) LTRAmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
LTRAmodel **model = (LTRAmodel **) inModel; GENinstance *here;
LTRAmodel *modfast = (LTRAmodel *) kill; GENinstance *prev = NULL;
LTRAinstance *here; GENmodel **oldmod;
LTRAinstance *prev = NULL;
LTRAmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->LTRAnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->LTRAmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ LTRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->LTRAnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->LTRAinstances; here; here = here->LTRAnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/mes/mesmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 S. Hwang
int int
MESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) MESmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
MESmodel **model = (MESmodel **) inModel; GENinstance *here;
MESmodel *modfast = (MESmodel *) kill; GENinstance *prev = NULL;
MESinstance *here; GENmodel **oldmod;
MESinstance *prev = NULL;
MESmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->MESnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->MESmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ MESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->MESnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->MESinstances; here; here = here->MESnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/mesa/mesamdel.c
View File

@ -14,17 +14,15 @@ Author: 1985 S. Hwang
int int
MESAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) MESAmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
MESAmodel **model = (MESAmodel **) inModel; GENinstance *here;
MESAmodel *modfast = (MESAmodel *) kill; GENinstance *prev = NULL;
MESAinstance *here; GENmodel **oldmod;
MESAinstance *prev = NULL;
MESAmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->MESAnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->MESAmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -32,8 +30,8 @@ MESAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->MESAnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->MESAinstances; here; here = here->MESAnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/mos1/mos1mdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
MOS1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) MOS1mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
MOS1model **model = (MOS1model **) inModel; GENinstance *here;
MOS1model *modfast = (MOS1model *) kill; GENinstance *prev = NULL;
MOS1instance *here; GENmodel **oldmod;
MOS1instance *prev = NULL;
MOS1model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->MOS1nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->MOS1modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ MOS1mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->MOS1nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->MOS1instances; here; here = here->MOS1nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/mos2/mos2mdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
MOS2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) MOS2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
MOS2model **model = (MOS2model **) inModel; GENinstance *here;
MOS2model *modfast = (MOS2model *) kill; GENinstance *prev = NULL;
MOS2instance *here; GENmodel **oldmod;
MOS2instance *prev = NULL;
MOS2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->MOS2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->MOS2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ MOS2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->MOS2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->MOS2instances; here; here = here->MOS2nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/mos3/mos3mdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
MOS3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) MOS3mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
MOS3model **model = (MOS3model **) inModel; GENinstance *here;
MOS3model *modfast = (MOS3model *) kill; GENinstance *prev = NULL;
MOS3instance *here; GENmodel **oldmod;
MOS3instance *prev = NULL;
MOS3model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->MOS3nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->MOS3modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ MOS3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->MOS3nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->MOS3instances; here; here = here->MOS3nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/mos9/mos9mdel.c
View File

@ -11,17 +11,15 @@ Modified: Alan Gillespie
int int
MOS9mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) MOS9mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
MOS9model **model = (MOS9model **) inModel; GENinstance *here;
MOS9model *modfast = (MOS9model *) kill; GENinstance *prev = NULL;
MOS9instance *here; GENmodel **oldmod;
MOS9instance *prev = NULL;
MOS9model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->MOS9nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->MOS9modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -29,8 +27,8 @@ MOS9mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->MOS9nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->MOS9instances; here; here = here->MOS9nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

14
src/spicelib/devices/nbjt/nbjtmdel.c
View File

@ -15,15 +15,13 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NBJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) NBJTmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
NBJTmodel **model = (NBJTmodel **) inModel; GENmodel **oldmod;
NBJTmodel *modfast = (NBJTmodel *) kill;
NBJTmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->NBJTnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->NBJTmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -31,9 +29,9 @@ NBJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
if ((*model)->NBJTinstances) if ((*model)->GENinstances)
return E_NOTEMPTY; return E_NOTEMPTY;
*oldmod = (*model)->NBJTnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
FREE(*model); FREE(*model);
return OK; return OK;
} }

14
src/spicelib/devices/nbjt2/nbt2mdel.c
View File

@ -15,15 +15,13 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NBJT2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) NBJT2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
NBJT2model **model = (NBJT2model **) inModel; GENmodel **oldmod;
NBJT2model *modfast = (NBJT2model *) kill;
NBJT2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->NBJT2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->NBJT2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -31,9 +29,9 @@ NBJT2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
if ((*model)->NBJT2instances) if ((*model)->GENinstances)
return E_NOTEMPTY; return E_NOTEMPTY;
*oldmod = (*model)->NBJT2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
FREE(*model); FREE(*model);
return OK; return OK;
} }

4
src/spicelib/devices/ndev/ndevmdel.c
View File

@ -10,9 +10,9 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NDEVmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) NDEVmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
NG_IGNORE(inModel); NG_IGNORE(model);
NG_IGNORE(modname); NG_IGNORE(modname);
NG_IGNORE(kill); NG_IGNORE(kill);

18
src/spicelib/devices/numd/numdmdel.c
View File

@ -10,17 +10,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) NUMDmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
NUMDmodel **model = (NUMDmodel **) inModel; GENinstance *here;
NUMDmodel *modfast = (NUMDmodel *) kill; GENinstance *prev = NULL;
NUMDinstance *here; GENmodel **oldmod;
NUMDinstance *prev = NULL;
NUMDmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->NUMDnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->NUMDmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->NUMDnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->NUMDinstances; here; here = here->NUMDnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/numd2/nud2mdel.c
View File

@ -10,17 +10,15 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) NUMD2mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
NUMD2model **model = (NUMD2model **) inModel; GENinstance *here;
NUMD2model *modfast = (NUMD2model *) kill; GENinstance *prev = NULL;
NUMD2instance *here; GENmodel **oldmod;
NUMD2instance *prev = NULL;
NUMD2model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->NUMD2nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->NUMD2modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->NUMD2nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->NUMD2instances; here; here = here->NUMD2nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

14
src/spicelib/devices/numos/nummmdel.c
View File

@ -15,15 +15,13 @@ Author: 1987 Kartikeya Mayaram, U. C. Berkeley CAD Group
int int
NUMOSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) NUMOSmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
NUMOSmodel **model = (NUMOSmodel **) inModel; GENmodel **oldmod;
NUMOSmodel *modfast = (NUMOSmodel *) kill;
NUMOSmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->NUMOSnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->NUMOSmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -31,9 +29,9 @@ NUMOSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
if ((*model)->NUMOSinstances) if ((*model)->GENinstances)
return E_NOTEMPTY; return E_NOTEMPTY;
*oldmod = (*model)->NUMOSnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
FREE(*model); FREE(*model);
return OK; return OK;
} }

18
src/spicelib/devices/res/resmdel.c
View File

@ -10,17 +10,15 @@ Modified: Apr 2000 - Paolo Nenzi
int int
RESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) RESmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
RESmodel **model = (RESmodel **) inModel; GENinstance *here;
RESmodel *modfast = (RESmodel *) kill; GENinstance *prev = NULL;
RESinstance *here; GENmodel **oldmod;
RESinstance *prev = NULL;
RESmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->RESnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->RESmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ RESmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->RESnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->RESinstances; here; here = here->RESnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/soi3/soi3mdel.c
View File

@ -27,17 +27,15 @@ Acknowledgements : Rupert Howes and Pete Mole.
int int
SOI3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) SOI3mDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
SOI3model **model = (SOI3model **) inModel; GENinstance *here;
SOI3model *modfast = (SOI3model *) kill; GENinstance *prev = NULL;
SOI3instance *here; GENmodel **oldmod;
SOI3instance *prev = NULL;
SOI3model **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->SOI3nextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->SOI3modName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -45,8 +43,8 @@ SOI3mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->SOI3nextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->SOI3instances; here; here = here->SOI3nextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/sw/swmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Gordon Jacobs
int int
SWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) SWmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
SWmodel **model = (SWmodel **) inModel; GENinstance *here;
SWmodel *modfast = (SWmodel *) kill; GENinstance *prev = NULL;
SWinstance *here; GENmodel **oldmod;
SWinstance *prev = NULL;
SWmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->SWnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->SWmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ SWmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->SWnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->SWinstances; here; here = here->SWnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/tra/tramdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
TRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) TRAmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
TRAmodel **model = (TRAmodel **) inModel; GENinstance *here;
TRAmodel *modfast = (TRAmodel *) kill; GENinstance *prev = NULL;
TRAinstance *here; GENmodel **oldmod;
TRAinstance *prev = NULL;
TRAmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->TRAnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->TRAmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ TRAmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->TRAnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->TRAinstances; here; here = here->TRAnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/txl/txlmdel.c
View File

@ -11,17 +11,15 @@ Author: 1992 Charles Hough
int int
TXLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) TXLmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
TXLmodel **model = (TXLmodel **) inModel; GENinstance *here;
TXLmodel *modfast = (TXLmodel *) kill; GENinstance *prev = NULL;
TXLinstance *here; GENmodel **oldmod;
TXLinstance *prev = NULL;
TXLmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->TXLnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->TXLmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -29,8 +27,8 @@ TXLmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->TXLnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->TXLinstances; here; here = here->TXLnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/urc/urcmdel.c
View File

@ -10,17 +10,15 @@ Author: 1987 Thomas L. Quarles
int int
URCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) URCmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
URCmodel **model = (URCmodel **) inModel; GENinstance *here;
URCmodel *modfast = (URCmodel *) kill; GENinstance *prev = NULL;
URCinstance *here; GENmodel **oldmod;
URCinstance *prev = NULL;
URCmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->URCnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->URCmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ URCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->URCnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->URCinstances; here; here = here->URCnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

14
src/spicelib/devices/vbic/vbicmdel.c
View File

@ -18,15 +18,13 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH
int int
VBICmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) VBICmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
VBICmodel **model = (VBICmodel **) inModel; GENmodel **oldmod;
VBICmodel *modfast = (VBICmodel *) kill;
VBICmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->VBICnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->VBICmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -34,9 +32,9 @@ VBICmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
if ((*model)->VBICinstances) if ((*model)->GENinstances)
return E_NOTEMPTY; return E_NOTEMPTY;
*oldmod = (*model)->VBICnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
FREE(*model); FREE(*model);
return OK; return OK;
} }

18
src/spicelib/devices/vccs/vccsmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
VCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) VCCSmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
VCCSmodel **model = (VCCSmodel **) inModel; GENinstance *here;
VCCSmodel *modfast = (VCCSmodel *) kill; GENinstance *prev = NULL;
VCCSinstance *here; GENmodel **oldmod;
VCCSinstance *prev = NULL;
VCCSmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->VCCSnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->VCCSmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ VCCSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->VCCSnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->VCCSinstances; here; here = here->VCCSnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/vcvs/vcvsmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
VCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) VCVSmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
VCVSmodel **model = (VCVSmodel **) inModel; GENinstance *here;
VCVSmodel *modfast = (VCVSmodel *) kill; GENinstance *prev = NULL;
VCVSinstance *here; GENmodel **oldmod;
VCVSinstance *prev = NULL;
VCVSmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->VCVSnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->VCVSmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ VCVSmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->VCVSnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->VCVSinstances; here; here = here->VCVSnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;

18
src/spicelib/devices/vsrc/vsrcmdel.c
View File

@ -10,17 +10,15 @@ Author: 1985 Thomas L. Quarles
int int
VSRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) VSRCmDelete(GENmodel **model, IFuid modname, GENmodel *kill)
{ {
VSRCmodel **model = (VSRCmodel **) inModel; GENinstance *here;
VSRCmodel *modfast = (VSRCmodel *) kill; GENinstance *prev = NULL;
VSRCinstance *here; GENmodel **oldmod;
VSRCinstance *prev = NULL;
VSRCmodel **oldmod;
oldmod = model; oldmod = model;
for (; *model; model = &((*model)->VSRCnextModel)) { for (; *model; model = &((*model)->GENnextModel)) {
if ((*model)->VSRCmodName == modname || (modfast && *model == modfast)) if ((*model)->GENmodName == modname || (kill && *model == kill))
goto delgot; goto delgot;
oldmod = model; oldmod = model;
} }
@ -28,8 +26,8 @@ VSRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill)
return E_NOMOD; return E_NOMOD;
delgot: delgot:
*oldmod = (*model)->VSRCnextModel; /* cut deleted device out of list */ *oldmod = (*model)->GENnextModel; /* cut deleted device out of list */
for (here = (*model)->VSRCinstances; here; here = here->VSRCnextInstance) { for (here = (*model)->GENinstances; here; here = here->GENnextInstance) {
if (prev) if (prev)
FREE(prev); FREE(prev);
prev = here; prev = here;