diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-05-02 07:32:04 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-05-02 07:32:04 +1000 |
| commit | 169f12940462da90d6cdbbd1c8f170fa978d959a (patch) | |
| tree | bb9a82c2e458f6149939720e9291f9e2b05985bd /ctdb/lib/replace/snprintf.c | |
| parent | 3a05ad1402c20df868abb2aeb56a6d9e3be1f884 (diff) | |
| download | samba-169f12940462da90d6cdbbd1c8f170fa978d959a.tar.gz samba-169f12940462da90d6cdbbd1c8f170fa978d959a.tar.xz samba-169f12940462da90d6cdbbd1c8f170fa978d959a.zip | |
merge latest versions of lib/replace, lib/talloc, lib/tdb and lib/events into ctdb bzr tree
(This used to be ctdb commit eaea8a9fa8d2f5e08f3af619fa1008a663f39053)
Diffstat (limited to 'ctdb/lib/replace/snprintf.c')
| -rw-r--r-- | ctdb/lib/replace/snprintf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ctdb/lib/replace/snprintf.c b/ctdb/lib/replace/snprintf.c index b38d8dad34..9f8a7657e5 100644 --- a/ctdb/lib/replace/snprintf.c +++ b/ctdb/lib/replace/snprintf.c @@ -742,6 +742,8 @@ static int dopr(char *buffer, size_t maxlen, const char *format, va_list args_in ret = currlen; done: + va_end(args); + while (chunks) { cnk = chunks->next; free(chunks); @@ -1260,16 +1262,16 @@ static int add_cnk_list_entry(struct pr_chunk_x **list, va_list ap2; VA_COPY(ap2, ap); - ret = vsnprintf(NULL, 0, format, ap2); + va_end(ap2); if (ret <= 0) return ret; (*ptr) = (char *)malloc(ret+1); if (!*ptr) return -1; VA_COPY(ap2, ap); - ret = vsnprintf(*ptr, ret+1, format, ap2); + va_end(ap2); return ret; } |