hisim2, apply commit "use TMALLOC, funcall, and NULL casts"

This commit is contained in:
rlar 2015-03-27 16:45:48 +01:00
parent 9970ce590d
commit 495988608a
1 changed files with 9 additions and 15 deletions

View File

@ -124,39 +124,33 @@ int HSM2noise (
for ( i = 0; i < HSM2NSRCS; i++ ) {
(void) sprintf(name, "onoise.%s%s",
(char *)here->HSM2name, HSM2nNames[i]);
data->namelist =
(IFuid *) trealloc((char *) data->namelist,
((long unsigned int)data->numPlots + 1) * sizeof(IFuid));
data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
if (!data->namelist)
return(E_NOMEM);
(*(SPfrontEnd->IFnewUid))
SPfrontEnd->IFnewUid
(ckt, &(data->namelist[data->numPlots++]),
(IFuid) NULL, name, UID_OTHER, NULL);
NULL, name, UID_OTHER, NULL);
}
break;
case INT_NOIZ:
for ( i = 0; i < HSM2NSRCS; i++ ) {
(void) sprintf(name, "onoise_total.%s%s",
(char *)here->HSM2name, HSM2nNames[i]);
data->namelist =
(IFuid *) trealloc((char *) data->namelist,
((long unsigned int)data->numPlots + 1) * sizeof(IFuid));
data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
if (!data->namelist)
return(E_NOMEM);
(*(SPfrontEnd->IFnewUid))
SPfrontEnd->IFnewUid
(ckt, &(data->namelist[data->numPlots++]),
(IFuid) NULL, name, UID_OTHER, NULL);
NULL, name, UID_OTHER, NULL);
(void) sprintf(name, "inoise_total.%s%s",
(char *)here->HSM2name, HSM2nNames[i]);
data->namelist =
(IFuid *) trealloc((char *) data->namelist,
((long unsigned int)data->numPlots + 1) * sizeof(IFuid));
data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1);
if (!data->namelist)
return(E_NOMEM);
(*(SPfrontEnd->IFnewUid))
SPfrontEnd->IFnewUid
(ckt, &(data->namelist[data->numPlots++]),
(IFuid) NULL, name, UID_OTHER, NULL);
NULL, name, UID_OTHER, NULL);
}
break;
}