From 0c0f21faaf2791577d57a55687c5944545db67bd Mon Sep 17 00:00:00 2001 From: rlar Date: Thu, 1 Nov 2012 22:53:43 +0100 Subject: [PATCH] hisim2, use TMALLOC, funcall, and NULL casts --- src/spicelib/devices/hisim2/hsm2noi.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/spicelib/devices/hisim2/hsm2noi.c b/src/spicelib/devices/hisim2/hsm2noi.c index e6dde7b7d..6ea23cfc0 100644 --- a/src/spicelib/devices/hisim2/hsm2noi.c +++ b/src/spicelib/devices/hisim2/hsm2noi.c @@ -84,13 +84,12 @@ int HSM2noise ( (void) sprintf(name, "onoise.%s%s", (char *)here->HSM2name, HSM2nNames[i]); data->namelist = - (IFuid *) trealloc((char *) data->namelist, - (data->numPlots + 1) * sizeof(IFuid)); + 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: @@ -98,24 +97,22 @@ int HSM2noise ( (void) sprintf(name, "onoise_total.%s%s", (char *)here->HSM2name, HSM2nNames[i]); data->namelist = - (IFuid *) trealloc((char *) data->namelist, - (data->numPlots + 1) * sizeof(IFuid)); + 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, - (data->numPlots + 1) * sizeof(IFuid)); + 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; }