From 1f5b0f852be0e3e0609842c7cfa1212262b209a1 Mon Sep 17 00:00:00 2001 From: rlar Date: Fri, 27 Mar 2015 19:22:16 +0100 Subject: [PATCH] hisimhv2, apply commit "use TMALLOC, funcall, and NULL casts" --- src/spicelib/devices/hisimhv2/hsmhvnoi.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/spicelib/devices/hisimhv2/hsmhvnoi.c b/src/spicelib/devices/hisimhv2/hsmhvnoi.c index 71d044637..f36b82ecb 100644 --- a/src/spicelib/devices/hisimhv2/hsmhvnoi.c +++ b/src/spicelib/devices/hisimhv2/hsmhvnoi.c @@ -121,39 +121,33 @@ int HSMHV2noise ( for ( i = 0; i < HSMHV2NSRCS; i++ ) { (void) sprintf(name, "onoise.%s%s", (char *)here->HSMHV2name, HSMHV2nNames[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 < HSMHV2NSRCS; i++ ) { (void) sprintf(name, "onoise_total.%s%s", (char *)here->HSMHV2name, HSMHV2nNames[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->HSMHV2name, HSMHV2nNames[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; }