From 338e1bf6fa4647c2732082a5b51a167b062cf7dd Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sat, 4 Nov 2017 15:49:03 +0100 Subject: [PATCH] replace free() by tfree() or txfree --- src/frontend/com_fft.c | 2 +- src/frontend/com_sysinfo.c | 8 ++++---- src/frontend/define.c | 8 ++++---- src/frontend/device.c | 2 +- src/frontend/inpcom.c | 4 ++-- src/frontend/parse.c | 2 +- src/frontend/spiceif.c | 4 ++-- src/frontend/trannoise/1-f-code.c | 4 ++-- src/frontend/variable.c | 8 ++++---- src/main.c | 4 ++-- src/maths/cmaths/cmath1.c | 2 +- src/maths/fft/fftext.c | 4 ++-- src/misc/util.c | 2 +- src/spicelib/devices/cpl/cplsetup.c | 20 ++++++++++---------- 14 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/frontend/com_fft.c b/src/frontend/com_fft.c index 555d0a3dc..6159debd7 100644 --- a/src/frontend/com_fft.c +++ b/src/frontend/com_fft.c @@ -489,7 +489,7 @@ done: tfree(fdvec); tfree(win); - free(reald); + tfree(reald); free_pnode(names); } diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c index 456319b45..0fdc64b06 100644 --- a/src/frontend/com_sysinfo.c +++ b/src/frontend/com_sysinfo.c @@ -76,8 +76,8 @@ static void tesFreeSystemInfo(TesSystemInfo *info) { if (info != NULL) { - free(info->cpuModelName); - free(info->osName); + tfree(info->cpuModelName); + tfree(info->osName); } } @@ -323,7 +323,7 @@ tesCreateSystemInfo(TesSystemInfo *info) } } info->numPhysicalProcessors = numProcs; - free(physIDs); + tfree(physIDs); } /* another test to get number of logical processors @@ -341,7 +341,7 @@ tesCreateSystemInfo(TesSystemInfo *info) * } */ - free(inStr); + tfree(inStr); fclose(file); } else { error = TES_FAIL; diff --git a/src/frontend/define.c b/src/frontend/define.c index b8523c424..f572d8a57 100644 --- a/src/frontend/define.c +++ b/src/frontend/define.c @@ -413,8 +413,8 @@ com_undefine(wordlist *wlist) struct udfunc *next = udf->ud_next; cp_remkword(CT_UDFUNCS, udf->ud_name); free_pnode(udf->ud_text); - free(udf->ud_name); - free(udf); + tfree(udf->ud_name); + tfree(udf); udf = next; } udfuncs = NULL; @@ -432,8 +432,8 @@ com_undefine(wordlist *wlist) udfuncs = udf->ud_next; cp_remkword(CT_UDFUNCS, wlist->wl_word); free_pnode(udf->ud_text); - free(udf->ud_name); - free(udf); + tfree(udf->ud_name); + tfree(udf); } else { prev_udf = udf; } diff --git a/src/frontend/device.c b/src/frontend/device.c index daa9ef7e1..4a0c16685 100644 --- a/src/frontend/device.c +++ b/src/frontend/device.c @@ -1401,7 +1401,7 @@ com_alter_mod(wordlist *wl) { char *dir_name = ngdirname(filename); modeldeck = inp_readall(modfile, dir_name, 0, 0, NULL); - free(dir_name); + tfree(dir_name); } tfree(input); tfree(filename); diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index a677d513d..60880e878 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -317,8 +317,8 @@ read_a_lib(char *y, char *dir_name) fclose(newfp); } - free(yy); - free(y_resolved); + tfree(yy); + tfree(y_resolved); return lib; } diff --git a/src/frontend/parse.c b/src/frontend/parse.c index 691a660db..775dcb12c 100644 --- a/src/frontend/parse.c +++ b/src/frontend/parse.c @@ -552,7 +552,7 @@ db_print_pnode_tree(struct pnode *p, char *print) fclose(db_stream); if (print) printf("%s:%d: %s {%s}\n%s\n", __FILE__, __LINE__, __func__, print, buf); - free(buf); + tfree(buf); #endif } diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index d0cf6fd83..8507b44e6 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -659,7 +659,7 @@ spif_getparam_special(CKTcircuit *ckt, char **name, char *param, int ind, int do { char *x = tv->va_name; tv->va_name = tprintf("%s [%s]", tv->va_name, device->instanceParms[i].keyword); - free(x); + tfree(x); } if (vv) tv->va_next = vv; @@ -704,7 +704,7 @@ spif_getparam_special(CKTcircuit *ckt, char **name, char *param, int ind, int do { char *x = tv->va_name; tv->va_name = tprintf("%s [%s]", tv->va_name, device->modelParms[i].keyword); - free(x); + tfree(x); } /* tv->va_string = device->modelParms[i].keyword; Put the name of the variable */ if (vv) diff --git a/src/frontend/trannoise/1-f-code.c b/src/frontend/trannoise/1-f-code.c index f03da97de..d000619d9 100644 --- a/src/frontend/trannoise/1-f-code.c +++ b/src/frontend/trannoise/1-f-code.c @@ -104,8 +104,8 @@ f_alpha(int n_pts, int n_exp, double X[], double Q_d, double alpha) #endif - free(hfa); - free(wfa); + tfree(hfa); + tfree(wfa); /* fft tables will be freed in vsrcaccept.c and isrcaccept.c fftFree(); */ fprintf(stdout, "%d 1/f noise values in time domain created\n", n_pts); diff --git a/src/frontend/variable.c b/src/frontend/variable.c index 781be0d2b..6652b053d 100644 --- a/src/frontend/variable.c +++ b/src/frontend/variable.c @@ -678,20 +678,20 @@ cp_variablesubst(wordlist *wlist) char *x = nwl->wl_word; char *tail_ = copy(tail); nwl->wl_word = tprintf("%.*s%s", prefix_len, wl->wl_word, nwl->wl_word); - free(x); + tfree(x); if (wlist == wl) wlist = nwl; wl = wl_splice(wl, nwl); i = (int) strlen(wl->wl_word); x = wl->wl_word; wl->wl_word = tprintf("%s%s", wl->wl_word, tail_); - free(x); - free(tail_); + tfree(x); + tfree(tail_); } else if (prefix_len || *tail) { char *x = wl->wl_word; wl->wl_word = tprintf("%.*s%s", prefix_len, wl->wl_word, tail); i = prefix_len; - free(x); + tfree(x); } else { wordlist *next = wl->wl_next; if (wlist == wl) diff --git a/src/main.c b/src/main.c index f9faba647..de3d0b540 100644 --- a/src/main.c +++ b/src/main.c @@ -680,10 +680,10 @@ app_rl_readlines(void) cp_evloop(expanded_line); add_history(expanded_line); } - free(expanded_line); + tfree(expanded_line); } - free(line); + tfree(line); } /* History gets written in ../fte/misccoms.c com_quit */ diff --git a/src/maths/cmaths/cmath1.c b/src/maths/cmaths/cmath1.c index 5a9c35b2c..d5d2b7734 100644 --- a/src/maths/cmaths/cmath1.c +++ b/src/maths/cmaths/cmath1.c @@ -748,7 +748,7 @@ cx_sortorder(void *data, short int type, int length, int *newlength, short int * d[i] = array_amplitudes[i].index; } - free(array_amplitudes); + tfree(array_amplitudes); /* Otherwise it is 0, but tmalloc zeros the stuff already. */ return ((void *) d); diff --git a/src/maths/fft/fftext.c b/src/maths/fft/fftext.c index f2528bcf7..6dc6400e8 100644 --- a/src/maths/fft/fftext.c +++ b/src/maths/fft/fftext.c @@ -81,13 +81,13 @@ void fftFree(void) int i1; for (i1=8*sizeof(int)/2-1; i1>=0; i1--) { if (BRLowArray[i1] != NULL) { - free(BRLowArray[i1]); + tfree(BRLowArray[i1]); BRLowArray[i1] = NULL; } } for (i1=8*sizeof(int)-1; i1>=0; i1--) { if (UtblArray[i1] != NULL) { - free(UtblArray[i1]); + tfree(UtblArray[i1]); UtblArray[i1] = NULL; } } diff --git a/src/misc/util.c b/src/misc/util.c index 36bfc6c68..e8f1e58ce 100644 --- a/src/misc/util.c +++ b/src/misc/util.c @@ -160,7 +160,7 @@ basename(const char *name) int len; if (tmp) { - free(tmp); + tfree(tmp); tmp = NULL; } diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index ac5026aa4..d859616b2 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -28,14 +28,14 @@ Modified: 2004 Paolo Nenzi - (ng)spice integration } \ } -#define VECTOR_FREE(vec) free(vec) +#define VECTOR_FREE(vec) tfree(vec) #define MATRIX_FREE(mat, m, j) { \ int k; \ for (k = 0; k < m; k++) { \ - free(mat[k]); \ + tfree(mat[k]); \ } \ - free(mat); \ + tfree(mat); \ } #define MAX_DEG 8 @@ -225,7 +225,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ } here->CPLibr1Given = 1; } - free(branchname); + tfree(branchname); branchname = TMALLOC(char *, here->dimension); if (! here->CPLibr2Given) { for (m = 0; m < here->dimension; m++) { @@ -239,7 +239,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\ } here->CPLibr2Given = 1; } - free(branchname); + tfree(branchname); for (m = 0; m < here->dimension; m++) { for (node = ckt->CKTnodes; node; node = node->next) { @@ -337,10 +337,10 @@ CPLunsetup(GENmodel *inModel, CKTcircuit *ckt) } } - free(here->CPLposNodes); - free(here->CPLnegNodes); - free(here->CPLibr1); - free(here->CPLibr2); + tfree(here->CPLposNodes); + tfree(here->CPLnegNodes); + tfree(here->CPLibr1); + tfree(here->CPLibr2); /* reset switches */ here->CPLdcGiven=0; @@ -584,7 +584,7 @@ free_vector(double *v, int nl, int nh) { NG_IGNORE(nh); - free(v + nl); + txfree(v + nl); } static void