devices/**/XXXdel.c, unify, rename variables

rename  model, modPtr, instPtr --> inModel, model, fast
  rename  inst --> here
This commit is contained in:
rlar 2018-01-04 19:43:46 +01:00
parent ad3486e93e
commit b7c2cf709a
6 changed files with 36 additions and 36 deletions

View File

@ -10,17 +10,17 @@ Author: 1987 Kanwar Jit Singh
int
ASRCdelete(GENmodel *model, IFuid name, GENinstance **kill)
ASRCdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
{
ASRCinstance **instPtr = (ASRCinstance **) kill;
ASRCmodel *modPtr = (ASRCmodel *) model;
ASRCinstance **fast = (ASRCinstance **) kill;
ASRCmodel *model = (ASRCmodel *) inModel;
ASRCinstance **prev = NULL;
ASRCinstance *here;
for (; modPtr; modPtr = modPtr->ASRCnextModel) {
prev = &(modPtr->ASRCinstances);
for (; model; model = model->ASRCnextModel) {
prev = &(model->ASRCinstances);
for (here = *prev; here; here = *prev) {
if (here->ASRCname == name || (instPtr && here == *instPtr)) {
if (here->ASRCname == name || (fast && here == *fast)) {
*prev = here->ASRCnextInstance;
FREE(here);
return OK;

View File

@ -20,17 +20,17 @@ NBJTdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
NBJTmodel *model = (NBJTmodel *) inModel;
NBJTinstance **fast = (NBJTinstance **) kill;
NBJTinstance **prev = NULL;
NBJTinstance *inst;
NBJTinstance *here;
for (; model; model = model->NBJTnextModel) {
prev = &(model->NBJTinstances);
for (inst = *prev; inst; inst = *prev) {
if (inst->NBJTname == name || (fast && inst == *fast)) {
*prev = inst->NBJTnextInstance;
FREE(inst);
for (here = *prev; here; here = *prev) {
if (here->NBJTname == name || (fast && here == *fast)) {
*prev = here->NBJTnextInstance;
FREE(here);
return OK;
}
prev = &(inst->NBJTnextInstance);
prev = &(here->NBJTnextInstance);
}
}

View File

@ -20,17 +20,17 @@ NBJT2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
NBJT2model *model = (NBJT2model *) inModel;
NBJT2instance **fast = (NBJT2instance **) kill;
NBJT2instance **prev = NULL;
NBJT2instance *inst;
NBJT2instance *here;
for (; model; model = model->NBJT2nextModel) {
prev = &(model->NBJT2instances);
for (inst = *prev; inst; inst = *prev) {
if (inst->NBJT2name == name || (fast && inst == *fast)) {
*prev = inst->NBJT2nextInstance;
FREE(inst);
for (here = *prev; here; here = *prev) {
if (here->NBJT2name == name || (fast && here == *fast)) {
*prev = here->NBJT2nextInstance;
FREE(here);
return OK;
}
prev = &(inst->NBJT2nextInstance);
prev = &(here->NBJT2nextInstance);
}
}

View File

@ -15,17 +15,17 @@ NUMDdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
NUMDmodel *model = (NUMDmodel *) inModel;
NUMDinstance **fast = (NUMDinstance **) kill;
NUMDinstance **prev = NULL;
NUMDinstance *inst;
NUMDinstance *here;
for (; model; model = model->NUMDnextModel) {
prev = &(model->NUMDinstances);
for (inst = *prev; inst; inst = *prev) {
if (inst->NUMDname == name || (fast && inst == *fast)) {
*prev = inst->NUMDnextInstance;
FREE(inst);
for (here = *prev; here; here = *prev) {
if (here->NUMDname == name || (fast && here == *fast)) {
*prev = here->NUMDnextInstance;
FREE(here);
return OK;
}
prev = &(inst->NUMDnextInstance);
prev = &(here->NUMDnextInstance);
}
}

View File

@ -15,17 +15,17 @@ NUMD2delete(GENmodel *inModel, IFuid name, GENinstance **kill)
NUMD2model *model = (NUMD2model *) inModel;
NUMD2instance **fast = (NUMD2instance **) kill;
NUMD2instance **prev = NULL;
NUMD2instance *inst;
NUMD2instance *here;
for (; model; model = model->NUMD2nextModel) {
prev = &(model->NUMD2instances);
for (inst = *prev; inst; inst = *prev) {
if (inst->NUMD2name == name || (fast && inst == *fast)) {
*prev = inst->NUMD2nextInstance;
FREE(inst);
for (here = *prev; here; here = *prev) {
if (here->NUMD2name == name || (fast && here == *fast)) {
*prev = here->NUMD2nextInstance;
FREE(here);
return OK;
}
prev = &(inst->NUMD2nextInstance);
prev = &(here->NUMD2nextInstance);
}
}

View File

@ -20,17 +20,17 @@ NUMOSdelete(GENmodel *inModel, IFuid name, GENinstance **kill)
NUMOSmodel *model = (NUMOSmodel *) inModel;
NUMOSinstance **fast = (NUMOSinstance **) kill;
NUMOSinstance **prev = NULL;
NUMOSinstance *inst;
NUMOSinstance *here;
for (; model; model = model->NUMOSnextModel) {
prev = &(model->NUMOSinstances);
for (inst = *prev; inst; inst = *prev) {
if (inst->NUMOSname == name || (fast && inst == *fast)) {
*prev = inst->NUMOSnextInstance;
FREE(inst);
for (here = *prev; here; here = *prev) {
if (here->NUMOSname == name || (fast && here == *fast)) {
*prev = here->NUMOSnextInstance;
FREE(here);
return OK;
}
prev = &(inst->NUMOSnextInstance);
prev = &(here->NUMOSnextInstance);
}
}