diff --git a/src/ciderlib/input/boundary.c b/src/ciderlib/input/boundary.c index 30f1a2335..d0be8c935 100644 --- a/src/ciderlib/input/boundary.c +++ b/src/ciderlib/input/boundary.c @@ -67,7 +67,7 @@ BDRYnewCard(GENcard **inCard, GENmodel *inModel) BDRYcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( BDRYcard ); + newCard = TMALLOC(BDRYcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/contact.c b/src/ciderlib/input/contact.c index d67a3254f..e1a90a342 100644 --- a/src/ciderlib/input/contact.c +++ b/src/ciderlib/input/contact.c @@ -42,7 +42,7 @@ CONTnewCard(GENcard **inCard, GENmodel *inModel) CONTcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( CONTcard ); + newCard = TMALLOC(CONTcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/domain.c b/src/ciderlib/input/domain.c index afc32e46a..6117c437c 100644 --- a/src/ciderlib/input/domain.c +++ b/src/ciderlib/input/domain.c @@ -59,7 +59,7 @@ DOMNnewCard(GENcard **inCard, GENmodel *inModel) DOMNcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( DOMNcard ); + newCard = TMALLOC(DOMNcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/doping.c b/src/ciderlib/input/doping.c index 0c5dd3601..b512ef7eb 100644 --- a/src/ciderlib/input/doping.c +++ b/src/ciderlib/input/doping.c @@ -76,7 +76,7 @@ DOPnewCard(GENcard **inCard, GENmodel *inModel) DOPcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( DOPcard ); + newCard = TMALLOC(DOPcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/electrod.c b/src/ciderlib/input/electrod.c index 8fc9513a0..cd88b28f4 100644 --- a/src/ciderlib/input/electrod.c +++ b/src/ciderlib/input/electrod.c @@ -47,7 +47,7 @@ ELCTnewCard(GENcard **inCard, GENmodel *inModel) ELCTcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( ELCTcard ); + newCard = TMALLOC(ELCTcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/material.c b/src/ciderlib/input/material.c index ea2f89ea8..7bbbd58d4 100644 --- a/src/ciderlib/input/material.c +++ b/src/ciderlib/input/material.c @@ -102,7 +102,7 @@ MATLnewCard(GENcard **inCard, GENmodel *inModel) MATLcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( MATLcard ); + newCard = TMALLOC(MATLcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/mesh.c b/src/ciderlib/input/mesh.c index 13ce00df8..07c520ed4 100644 --- a/src/ciderlib/input/mesh.c +++ b/src/ciderlib/input/mesh.c @@ -60,7 +60,7 @@ XMSHnewCard(GENcard **inCard, GENmodel *inModel) MESHcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( MESHcard ); + newCard = TMALLOC(MESHcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); @@ -86,7 +86,7 @@ YMSHnewCard(GENcard **inCard, GENmodel *inModel) MESHcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( MESHcard ); + newCard = TMALLOC(MESHcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/method.c b/src/ciderlib/input/method.c index 02e313e54..5182e1fd5 100644 --- a/src/ciderlib/input/method.c +++ b/src/ciderlib/input/method.c @@ -49,7 +49,7 @@ METHnewCard(GENcard **inCard, GENmodel *inModel) tmpCard = model->GENmethods; if (!tmpCard) { /* First in list */ - newCard = NEW( METHcard ); + newCard = TMALLOC(METHcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/mobility.c b/src/ciderlib/input/mobility.c index 614c7e9ed..955c3f16e 100644 --- a/src/ciderlib/input/mobility.c +++ b/src/ciderlib/input/mobility.c @@ -55,7 +55,7 @@ MOBnewCard(GENcard **inCard, GENmodel *inModel) MOBcard *tmpCard, *newCard; GENnumModel *model = (GENnumModel *)inModel; - newCard = NEW( MOBcard ); + newCard = TMALLOC(MOBcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/models.c b/src/ciderlib/input/models.c index fea7e588b..ac3d70df6 100644 --- a/src/ciderlib/input/models.c +++ b/src/ciderlib/input/models.c @@ -61,7 +61,7 @@ MODLnewCard(GENcard **inCard, GENmodel *inModel) tmpCard = model->GENmodels; if (!tmpCard) { /* First in list */ - newCard = NEW( MODLcard ); + newCard = TMALLOC(MODLcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/optionsc.c b/src/ciderlib/input/optionsc.c index 2bc385ccd..e8ba415fc 100644 --- a/src/ciderlib/input/optionsc.c +++ b/src/ciderlib/input/optionsc.c @@ -68,7 +68,7 @@ OPTNnewCard(GENcard **inCard, GENmodel *inModel) tmpCard = model->GENoptions; if (!tmpCard) { /* First in list */ - newCard = NEW( OPTNcard ); + newCard = TMALLOC(OPTNcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/ciderlib/input/output.c b/src/ciderlib/input/output.c index 8775d3a3e..b6d00da49 100644 --- a/src/ciderlib/input/output.c +++ b/src/ciderlib/input/output.c @@ -91,7 +91,7 @@ OUTPnewCard(GENcard **inCard, GENmodel *inModel) tmpCard = model->GENoutputs; if (!tmpCard) { /* First in list */ - newCard = NEW( OUTPcard ); + newCard = TMALLOC(OUTPcard, 1); if (!newCard) { *inCard = NULL; return(E_NOMEM); diff --git a/src/frontend/gens.c b/src/frontend/gens.c index 959da2241..5a4a9ac0c 100644 --- a/src/frontend/gens.c +++ b/src/frontend/gens.c @@ -30,7 +30,7 @@ dgen_init(CKTcircuit *ckt, wordlist *wl, int nomix, int flag, int model) NG_IGNORE(nomix); - dg = NEW(dgen); + dg = TMALLOC(dgen, 1); dg->ckt = ckt; dg->instance = NULL; dg->model = NULL; diff --git a/src/include/ngspice/macros.h b/src/include/ngspice/macros.h index c4dc970a7..c9fc389e6 100644 --- a/src/include/ngspice/macros.h +++ b/src/include/ngspice/macros.h @@ -49,8 +49,6 @@ return (CODE); \ } while(0) -#define NEW(TYPE) (TMALLOC(TYPE, 1)) - #define R_NORM(A,B) { \ if ((A) == 0.0) { \ diff --git a/src/spicelib/analysis/cktpzstr.c b/src/spicelib/analysis/cktpzstr.c index 8e50d8e22..a18097278 100644 --- a/src/spicelib/analysis/cktpzstr.c +++ b/src/spicelib/analysis/cktpzstr.c @@ -234,7 +234,7 @@ PZeval(int strat, PZtrial **set, PZtrial **new_trial_p) int error; PZtrial *new_trial; - new_trial = NEW(PZtrial); + new_trial = TMALLOC(PZtrial, 1); new_trial->multiplicity = 0; new_trial->count = 0; new_trial->seq_num = Seq_Num++; diff --git a/src/spicelib/analysis/cktsgen.c b/src/spicelib/analysis/cktsgen.c index 70cc4c13d..7d3a082d6 100644 --- a/src/spicelib/analysis/cktsgen.c +++ b/src/spicelib/analysis/cktsgen.c @@ -22,7 +22,7 @@ sgen_init(CKTcircuit *ckt, int is_dc) { sgen *sg; - sg = NEW(sgen); + sg = TMALLOC(sgen, 1); sg->param = 99999; sg->is_instparam = 0; sg->dev = -1;