drop macro `NEW', use TMALLOC instead

This commit is contained in:
rlar 2015-12-19 19:26:53 +01:00
parent 9fde8e374a
commit 9546b178fb
16 changed files with 16 additions and 18 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -49,8 +49,6 @@
return (CODE); \
} while(0)
#define NEW(TYPE) (TMALLOC(TYPE, 1))
#define R_NORM(A,B) { \
if ((A) == 0.0) { \

View File

@ -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++;

View File

@ -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;