un-FIXME: Can't use freeList for variable length allocations

This commit is contained in:
Michael Davidsaver
2012-07-06 13:35:28 -04:00
parent e23a5ae8ed
commit a9eff6c5e9
2 changed files with 8 additions and 9 deletions

View File

@@ -300,7 +300,7 @@ static int store_string_value(const chfPluginArgDef *opt, void *user, const char
static void freeInstanceData(chfFilter *f)
{
free(f->found); /* FIXME: Use a free-list */
free(f->found);
free(f); /* FIXME: Use a free-list */
}
@@ -326,7 +326,6 @@ static parse_result parse_start(chFilter *filter)
f->nextParam = -1;
/* Bit array to find missing required keys */
/* FIXME: Use a free-list */
f->found = calloc( (p->nopts/32)+1, sizeof(epicsUInt32) );
if (!f->found) {
fprintf(stderr,"chfConfigParseStart: bit array calloc failed\n");
@@ -344,7 +343,7 @@ static parse_result parse_start(chFilter *filter)
return parse_continue;
errplugin:
free(f->found); /* FIXME: Use a free-list */
free(f->found);
errbitarray:
free(f); /* FIXME: Use a free-list */
errfctx:
@@ -519,7 +518,7 @@ static void channel_close(chFilter *filter)
if (p->pif->channel_close) p->pif->channel_close(filter->chan, f->puser);
if (p->pif->freePvt) p->pif->freePvt(f->puser);
free(f->found); /* FIXME: Use a free-list */
free(f->found);
free(f); /* FIXME: Use a free-list */
}

View File

@@ -232,17 +232,17 @@ static const yajl_parser_config chf_config =
static void * chf_malloc(void *ctx, unsigned int sz)
{
return malloc(sz); /* FIXME: free-list */
return malloc(sz);
}
static void * chf_realloc(void *ctx, void *ptr, unsigned int sz)
{
return realloc(ptr, sz); /* FIXME: free-list */
return realloc(ptr, sz);
}
static void chf_free(void *ctx, void *ptr)
{
return free(ptr); /* FIXME: free-list */
return free(ptr);
}
static const yajl_alloc_funcs chf_alloc =
@@ -464,7 +464,7 @@ dbChannel * dbChannelCreate(const char *name)
/* FIXME: Use free-list */
chan = (dbChannel *) callocMustSucceed(1, sizeof(*chan), "dbChannelCreate");
chan->name = epicsStrDup(name); /* FIXME: free-list */
chan->name = epicsStrDup(name);
ellInit(&chan->filters);
ellInit(&chan->pre_chain);
ellInit(&chan->post_chain);
@@ -715,7 +715,7 @@ void dbChannelDelete(dbChannel *chan)
filter->plug->fif->channel_close(filter);
free(filter);
}
free((char *) chan->name); /* FIXME: Use free-list */
free((char *) chan->name);
free(chan); /* FIXME: Use free-list */
}