From a1bf859c95b686a113a8c7b28f53d2f94a6f075b Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Wed, 19 May 2021 17:24:00 +0200 Subject: [PATCH] Revert "Plug a memory leak in transmission line cpl" This reverts commit 54458ba172e39f2b461aa5c3866c8a98dac0de89. --- src/spicelib/devices/cpl/cplext.h | 1 - src/spicelib/devices/cpl/cplinit.c | 2 +- src/spicelib/devices/cpl/cplsetup.c | 18 ------------------ 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/spicelib/devices/cpl/cplext.h b/src/spicelib/devices/cpl/cplext.h index dd80f6a0d..2225084aa 100644 --- a/src/spicelib/devices/cpl/cplext.h +++ b/src/spicelib/devices/cpl/cplext.h @@ -11,4 +11,3 @@ extern int CPLmParam(int,IFvalue*, GENmodel*); extern int CPLparam(int,IFvalue*, GENinstance*, IFvalue*); extern int CPLsetup(SMPmatrix*, GENmodel*, CKTcircuit*, int*); extern int CPLunsetup(GENmodel*, CKTcircuit*); -extern int CPLdevDelete(GENinstance*); diff --git a/src/spicelib/devices/cpl/cplinit.c b/src/spicelib/devices/cpl/cplinit.c index 2b2300a61..b6a9aff7c 100644 --- a/src/spicelib/devices/cpl/cplinit.c +++ b/src/spicelib/devices/cpl/cplinit.c @@ -44,7 +44,7 @@ SPICEdev CPLinfo = { .DEVaccept = NULL, .DEVdestroy = NULL, .DEVmodDelete = NULL, - .DEVdelete = CPLdevDelete, + .DEVdelete = NULL, .DEVsetic = NULL, .DEVask = CPLask, .DEVmodAsk = CPLmAsk, diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index bac821342..3913e6d83 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -2146,21 +2146,3 @@ static int rotate(int dim_in, int p, int q) } -int -CPLdevDelete(GENinstance* inst) -{ - VI_list* tmplist, * prevlist; - CPLinstance* here = (CPLinstance*)inst; - if (here->cplines2) - tfree(here->cplines2); - if (here->cplines) { - prevlist = tmplist = here->cplines->vi_head; - while (tmplist) { - tmplist = tmplist->next; - tfree(prevlist); - prevlist = tmplist; - } - tfree(here->cplines); - } - return OK; -}