sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

bit neater talloc_asprintf() implementation

Browse Source 
(This used to be commit 8ca8875cd9)
This commit is contained in:
Andrew Tridgell 2001-10-14 09:32:14 +00:00
parent 0567d2d969
commit 47a0b69029
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/lib/talloc.c
View File

@ -169,30 +169,22 @@ char *talloc_strdup(TALLOC_CTX *t, char *p)
/* allocate a bit of memory from the specified pool */
char *talloc_asprintf(TALLOC_CTX *t, const char *fmt, ...)
{
struct talloc_chunk *tc;
va_list ap;
char *str;
size_t ret;
int len;
char *ret;
tc = malloc(sizeof(*tc));
if (!tc)
return NULL;
/* work out how long it will be */
va_start(ap, fmt);
len = vsnprintf(NULL, 0, fmt, ap);
va_end(ap);
ret = talloc(t, len);
if (!ret) return NULL;
va_start(ap, fmt);
ret = vasprintf(&str, fmt, ap);
vsnprintf(ret, len, fmt, ap);
va_end(ap);
if (ret <= 0)
{
SAFE_FREE(tc);
return NULL;
}
tc->ptr = str;
tc->size = ret + 1;
tc->next = t->list;
t->list = tc;
t->total_alloc_size += tc->size;
return str;
return ret;
}