replace free() by tfree() or txfree

This commit is contained in:
Holger Vogt 2017-11-04 15:49:03 +01:00
parent 84761c125f
commit 338e1bf6fa
14 changed files with 37 additions and 37 deletions

View File

@ -489,7 +489,7 @@ done:
tfree(fdvec); tfree(fdvec);
tfree(win); tfree(win);
free(reald); tfree(reald);
free_pnode(names); free_pnode(names);
} }

View File

@ -76,8 +76,8 @@ static void
tesFreeSystemInfo(TesSystemInfo *info) tesFreeSystemInfo(TesSystemInfo *info)
{ {
if (info != NULL) { if (info != NULL) {
free(info->cpuModelName); tfree(info->cpuModelName);
free(info->osName); tfree(info->osName);
} }
} }
@ -323,7 +323,7 @@ tesCreateSystemInfo(TesSystemInfo *info)
} }
} }
info->numPhysicalProcessors = numProcs; info->numPhysicalProcessors = numProcs;
free(physIDs); tfree(physIDs);
} }
/* another test to get number of logical processors /* another test to get number of logical processors
@ -341,7 +341,7 @@ tesCreateSystemInfo(TesSystemInfo *info)
* } * }
*/ */
free(inStr); tfree(inStr);
fclose(file); fclose(file);
} else { } else {
error = TES_FAIL; error = TES_FAIL;

View File

@ -413,8 +413,8 @@ com_undefine(wordlist *wlist)
struct udfunc *next = udf->ud_next; struct udfunc *next = udf->ud_next;
cp_remkword(CT_UDFUNCS, udf->ud_name); cp_remkword(CT_UDFUNCS, udf->ud_name);
free_pnode(udf->ud_text); free_pnode(udf->ud_text);
free(udf->ud_name); tfree(udf->ud_name);
free(udf); tfree(udf);
udf = next; udf = next;
} }
udfuncs = NULL; udfuncs = NULL;
@ -432,8 +432,8 @@ com_undefine(wordlist *wlist)
udfuncs = udf->ud_next; udfuncs = udf->ud_next;
cp_remkword(CT_UDFUNCS, wlist->wl_word); cp_remkword(CT_UDFUNCS, wlist->wl_word);
free_pnode(udf->ud_text); free_pnode(udf->ud_text);
free(udf->ud_name); tfree(udf->ud_name);
free(udf); tfree(udf);
} else { } else {
prev_udf = udf; prev_udf = udf;
} }

View File

@ -1401,7 +1401,7 @@ com_alter_mod(wordlist *wl)
{ {
char *dir_name = ngdirname(filename); char *dir_name = ngdirname(filename);
modeldeck = inp_readall(modfile, dir_name, 0, 0, NULL); modeldeck = inp_readall(modfile, dir_name, 0, 0, NULL);
free(dir_name); tfree(dir_name);
} }
tfree(input); tfree(input);
tfree(filename); tfree(filename);

View File

@ -317,8 +317,8 @@ read_a_lib(char *y, char *dir_name)
fclose(newfp); fclose(newfp);
} }
free(yy); tfree(yy);
free(y_resolved); tfree(y_resolved);
return lib; return lib;
} }

View File

@ -552,7 +552,7 @@ db_print_pnode_tree(struct pnode *p, char *print)
fclose(db_stream); fclose(db_stream);
if (print) if (print)
printf("%s:%d: %s {%s}\n%s\n", __FILE__, __LINE__, __func__, print, buf); printf("%s:%d: %s {%s}\n%s\n", __FILE__, __LINE__, __func__, print, buf);
free(buf); tfree(buf);
#endif #endif
} }

View File

@ -659,7 +659,7 @@ spif_getparam_special(CKTcircuit *ckt, char **name, char *param, int ind, int do
{ {
char *x = tv->va_name; char *x = tv->va_name;
tv->va_name = tprintf("%s [%s]", tv->va_name, device->instanceParms[i].keyword); tv->va_name = tprintf("%s [%s]", tv->va_name, device->instanceParms[i].keyword);
free(x); tfree(x);
} }
if (vv) if (vv)
tv->va_next = 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; char *x = tv->va_name;
tv->va_name = tprintf("%s [%s]", tv->va_name, device->modelParms[i].keyword); 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 */ /* tv->va_string = device->modelParms[i].keyword; Put the name of the variable */
if (vv) if (vv)

View File

@ -104,8 +104,8 @@ f_alpha(int n_pts, int n_exp, double X[], double Q_d, double alpha)
#endif #endif
free(hfa); tfree(hfa);
free(wfa); tfree(wfa);
/* fft tables will be freed in vsrcaccept.c and isrcaccept.c /* fft tables will be freed in vsrcaccept.c and isrcaccept.c
fftFree(); */ fftFree(); */
fprintf(stdout, "%d 1/f noise values in time domain created\n", n_pts); fprintf(stdout, "%d 1/f noise values in time domain created\n", n_pts);

View File

@ -678,20 +678,20 @@ cp_variablesubst(wordlist *wlist)
char *x = nwl->wl_word; char *x = nwl->wl_word;
char *tail_ = copy(tail); char *tail_ = copy(tail);
nwl->wl_word = tprintf("%.*s%s", prefix_len, wl->wl_word, nwl->wl_word); nwl->wl_word = tprintf("%.*s%s", prefix_len, wl->wl_word, nwl->wl_word);
free(x); tfree(x);
if (wlist == wl) if (wlist == wl)
wlist = nwl; wlist = nwl;
wl = wl_splice(wl, nwl); wl = wl_splice(wl, nwl);
i = (int) strlen(wl->wl_word); i = (int) strlen(wl->wl_word);
x = wl->wl_word; x = wl->wl_word;
wl->wl_word = tprintf("%s%s", wl->wl_word, tail_); wl->wl_word = tprintf("%s%s", wl->wl_word, tail_);
free(x); tfree(x);
free(tail_); tfree(tail_);
} else if (prefix_len || *tail) { } else if (prefix_len || *tail) {
char *x = wl->wl_word; char *x = wl->wl_word;
wl->wl_word = tprintf("%.*s%s", prefix_len, wl->wl_word, tail); wl->wl_word = tprintf("%.*s%s", prefix_len, wl->wl_word, tail);
i = prefix_len; i = prefix_len;
free(x); tfree(x);
} else { } else {
wordlist *next = wl->wl_next; wordlist *next = wl->wl_next;
if (wlist == wl) if (wlist == wl)

View File

@ -680,10 +680,10 @@ app_rl_readlines(void)
cp_evloop(expanded_line); cp_evloop(expanded_line);
add_history(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 */ /* History gets written in ../fte/misccoms.c com_quit */

View File

@ -748,7 +748,7 @@ cx_sortorder(void *data, short int type, int length, int *newlength, short int *
d[i] = array_amplitudes[i].index; d[i] = array_amplitudes[i].index;
} }
free(array_amplitudes); tfree(array_amplitudes);
/* Otherwise it is 0, but tmalloc zeros the stuff already. */ /* Otherwise it is 0, but tmalloc zeros the stuff already. */
return ((void *) d); return ((void *) d);

View File

@ -81,13 +81,13 @@ void fftFree(void)
int i1; int i1;
for (i1=8*sizeof(int)/2-1; i1>=0; i1--) { for (i1=8*sizeof(int)/2-1; i1>=0; i1--) {
if (BRLowArray[i1] != NULL) { if (BRLowArray[i1] != NULL) {
free(BRLowArray[i1]); tfree(BRLowArray[i1]);
BRLowArray[i1] = NULL; BRLowArray[i1] = NULL;
} }
} }
for (i1=8*sizeof(int)-1; i1>=0; i1--) { for (i1=8*sizeof(int)-1; i1>=0; i1--) {
if (UtblArray[i1] != NULL) { if (UtblArray[i1] != NULL) {
free(UtblArray[i1]); tfree(UtblArray[i1]);
UtblArray[i1] = NULL; UtblArray[i1] = NULL;
} }
} }

View File

@ -160,7 +160,7 @@ basename(const char *name)
int len; int len;
if (tmp) { if (tmp) {
free(tmp); tfree(tmp);
tmp = NULL; tmp = NULL;
} }

View File

@ -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) { \ #define MATRIX_FREE(mat, m, j) { \
int k; \ int k; \
for (k = 0; k < m; k++) { \ for (k = 0; k < m; k++) { \
free(mat[k]); \ tfree(mat[k]); \
} \ } \
free(mat); \ tfree(mat); \
} }
#define MAX_DEG 8 #define MAX_DEG 8
@ -225,7 +225,7 @@ do { if((here->ptr = SMPmakeElt(matrix, here->first, here->second)) == NULL){\
} }
here->CPLibr1Given = 1; here->CPLibr1Given = 1;
} }
free(branchname); tfree(branchname);
branchname = TMALLOC(char *, here->dimension); branchname = TMALLOC(char *, here->dimension);
if (! here->CPLibr2Given) { if (! here->CPLibr2Given) {
for (m = 0; m < here->dimension; m++) { 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; here->CPLibr2Given = 1;
} }
free(branchname); tfree(branchname);
for (m = 0; m < here->dimension; m++) { for (m = 0; m < here->dimension; m++) {
for (node = ckt->CKTnodes; node; node = node->next) { for (node = ckt->CKTnodes; node; node = node->next) {
@ -337,10 +337,10 @@ CPLunsetup(GENmodel *inModel, CKTcircuit *ckt)
} }
} }
free(here->CPLposNodes); tfree(here->CPLposNodes);
free(here->CPLnegNodes); tfree(here->CPLnegNodes);
free(here->CPLibr1); tfree(here->CPLibr1);
free(here->CPLibr2); tfree(here->CPLibr2);
/* reset switches */ /* reset switches */
here->CPLdcGiven=0; here->CPLdcGiven=0;
@ -584,7 +584,7 @@ free_vector(double *v, int nl, int nh)
{ {
NG_IGNORE(nh); NG_IGNORE(nh);
free(v + nl); txfree(v + nl);
} }
static void static void