nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-14 09:37:34 -05:00
Code Issues Projects Releases Wiki Activity

Add an extended version of ctrl_alloc which permits you to provide a

Browse Source 
custom free function, in case you need to ctrl_alloc a structure which
then has additional dynamically allocated things dangling off it.

[originally from svn r9922]
This commit is contained in:
Simon Tatham
2013-07-14 10:46:29 +00:00
parent 2f6d6a839d
commit ff09d5379b
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dialog.c
View File

@ -47,6 +47,7 @@ struct controlbox *ctrl_new_box(void)
ret->ctrlsets = NULL;
ret->nfrees = ret->freesize = 0;
ret->frees = NULL;
ret->freefuncs = NULL;
return ret;
}
@ -59,9 +60,10 @@ void ctrl_free_box(struct controlbox *b)
ctrl_free_set(b->ctrlsets[i]);
}
for (i = 0; i < b->nfrees; i++)
sfree(b->frees[i]);
b->freefuncs[i](b->frees[i]);
sfree(b->ctrlsets);
sfree(b->frees);
sfree(b->freefuncs);
sfree(b);
}
@ -181,7 +183,8 @@ struct controlset *ctrl_getset(struct controlbox *b,
}
/* Allocate some private data in a controlbox. */
void *ctrl_alloc(struct controlbox *b, size_t size)
void *ctrl_alloc_with_free(struct controlbox *b, size_t size,
ctrl_freefn_t freefunc)
{
void *p;
/*
@ -192,11 +195,24 @@ void *ctrl_alloc(struct controlbox *b, size_t size)
if (b->nfrees >= b->freesize) {
b->freesize = b->nfrees + 32;
b->frees = sresize(b->frees, b->freesize, void *);
b->freefuncs = sresize(b->freefuncs, b->freesize, ctrl_freefn_t);
}
b->frees[b->nfrees++] = p;
b->frees[b->nfrees] = p;
b->freefuncs[b->nfrees] = freefunc;
b->nfrees++;
return p;
}
static void ctrl_default_free(void *p)
{
sfree(p);
}
void *ctrl_alloc(struct controlbox *b, size_t size)
{
return ctrl_alloc_with_free(b, size, ctrl_default_free);
}
static union control *ctrl_new(struct controlset *s, int type,
intorptr helpctx, handler_fn handler,
intorptr context)