From a0e8c91d89e72ab2b63cfdf286edbf10c9dac43c Mon Sep 17 00:00:00 2001 From: rlar Date: Thu, 4 Jan 2018 23:20:38 +0100 Subject: [PATCH] devices/**/XXXmdel.c, unify variable and argument names --- src/spicelib/devices/asrc/asrcmdel.c | 6 +++--- src/spicelib/devices/bjt/bjtmdel.c | 4 ++-- src/spicelib/devices/isrc/isrcmdel.c | 4 ++-- src/spicelib/devices/numd/numdmdel.c | 6 +++--- src/spicelib/devices/numd2/nud2mdel.c | 6 +++--- src/spicelib/devices/vbic/vbicmdel.c | 4 ++-- src/spicelib/devices/vsrc/vsrcmdel.c | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/spicelib/devices/asrc/asrcmdel.c b/src/spicelib/devices/asrc/asrcmdel.c index 5298d8db0..280c69c54 100644 --- a/src/spicelib/devices/asrc/asrcmdel.c +++ b/src/spicelib/devices/asrc/asrcmdel.c @@ -10,10 +10,10 @@ Author: 1987 Kanwar Jit Singh int -ASRCmDelete(GENmodel **modList, IFuid modname, GENmodel *killModel) +ASRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { - ASRCmodel **model = (ASRCmodel **) modList; - ASRCmodel *modfast = (ASRCmodel *) killModel; + ASRCmodel **model = (ASRCmodel **) inModel; + ASRCmodel *modfast = (ASRCmodel *) kill; ASRCinstance *here; ASRCinstance *prev = NULL; ASRCmodel **oldmod; diff --git a/src/spicelib/devices/bjt/bjtmdel.c b/src/spicelib/devices/bjt/bjtmdel.c index 271ea1e10..6e7f86abb 100644 --- a/src/spicelib/devices/bjt/bjtmdel.c +++ b/src/spicelib/devices/bjt/bjtmdel.c @@ -16,9 +16,9 @@ Author: 1985 Thomas L. Quarles int -BJTmDelete(GENmodel **inModels, IFuid modname, GENmodel *kill) +BJTmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { - BJTmodel **model = (BJTmodel **) inModels; + BJTmodel **model = (BJTmodel **) inModel; BJTmodel *modfast = (BJTmodel *) kill; BJTmodel **oldmod; diff --git a/src/spicelib/devices/isrc/isrcmdel.c b/src/spicelib/devices/isrc/isrcmdel.c index 6f48ea9df..9aced1dea 100644 --- a/src/spicelib/devices/isrc/isrcmdel.c +++ b/src/spicelib/devices/isrc/isrcmdel.c @@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles int -ISRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *fast) +ISRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { ISRCmodel **model = (ISRCmodel **) inModel; - ISRCmodel *modfast = (ISRCmodel *) fast; + ISRCmodel *modfast = (ISRCmodel *) kill; ISRCinstance *here; ISRCinstance *prev = NULL; ISRCmodel **oldmod; diff --git a/src/spicelib/devices/numd/numdmdel.c b/src/spicelib/devices/numd/numdmdel.c index b73788074..8a82ce6ac 100644 --- a/src/spicelib/devices/numd/numdmdel.c +++ b/src/spicelib/devices/numd/numdmdel.c @@ -14,7 +14,7 @@ NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { NUMDmodel **model = (NUMDmodel **) inModel; NUMDmodel *modfast = (NUMDmodel *) kill; - NUMDinstance *inst; + NUMDinstance *here; NUMDinstance *prev = NULL; NUMDmodel **oldmod; @@ -29,10 +29,10 @@ NUMDmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) delgot: *oldmod = (*model)->NUMDnextModel; /* cut deleted device out of list */ - for (inst = (*model)->NUMDinstances; inst; inst = inst->NUMDnextInstance) { + for (here = (*model)->NUMDinstances; here; here = here->NUMDnextInstance) { if (prev) FREE(prev); - prev = inst; + prev = here; } if (prev) FREE(prev); diff --git a/src/spicelib/devices/numd2/nud2mdel.c b/src/spicelib/devices/numd2/nud2mdel.c index 2caba9528..b2428b45f 100644 --- a/src/spicelib/devices/numd2/nud2mdel.c +++ b/src/spicelib/devices/numd2/nud2mdel.c @@ -14,7 +14,7 @@ NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { NUMD2model **model = (NUMD2model **) inModel; NUMD2model *modfast = (NUMD2model *) kill; - NUMD2instance *inst; + NUMD2instance *here; NUMD2instance *prev = NULL; NUMD2model **oldmod; @@ -29,10 +29,10 @@ NUMD2mDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) delgot: *oldmod = (*model)->NUMD2nextModel; /* cut deleted device out of list */ - for (inst = (*model)->NUMD2instances; inst; inst = inst->NUMD2nextInstance) { + for (here = (*model)->NUMD2instances; here; here = here->NUMD2nextInstance) { if (prev) FREE(prev); - prev = inst; + prev = here; } if (prev) FREE(prev); diff --git a/src/spicelib/devices/vbic/vbicmdel.c b/src/spicelib/devices/vbic/vbicmdel.c index df3eea090..b85f39a4b 100644 --- a/src/spicelib/devices/vbic/vbicmdel.c +++ b/src/spicelib/devices/vbic/vbicmdel.c @@ -18,9 +18,9 @@ Spice3 Implementation: 2003 Dietmar Warning DAnalyse GmbH int -VBICmDelete(GENmodel **inModels, IFuid modname, GENmodel *kill) +VBICmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { - VBICmodel **model = (VBICmodel **) inModels; + VBICmodel **model = (VBICmodel **) inModel; VBICmodel *modfast = (VBICmodel *) kill; VBICmodel **oldmod; diff --git a/src/spicelib/devices/vsrc/vsrcmdel.c b/src/spicelib/devices/vsrc/vsrcmdel.c index 7c759a284..9232e968c 100644 --- a/src/spicelib/devices/vsrc/vsrcmdel.c +++ b/src/spicelib/devices/vsrc/vsrcmdel.c @@ -10,10 +10,10 @@ Author: 1985 Thomas L. Quarles int -VSRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *fast) +VSRCmDelete(GENmodel **inModel, IFuid modname, GENmodel *kill) { VSRCmodel **model = (VSRCmodel **) inModel; - VSRCmodel *modfast = (VSRCmodel *) fast; + VSRCmodel *modfast = (VSRCmodel *) kill; VSRCinstance *here; VSRCinstance *prev = NULL; VSRCmodel **oldmod;