summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-09-29 12:27:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:04:48 -0500
commitdbbaccc2c05ca2220dbbb74a7368304a89d31c9c (patch)
treefe7b9485951134f4600450628e353f43bc17b8a7 /source3/lib
parent4850bc63104f5f2945d9e91cfbd99773a5bc570f (diff)
downloadsamba-dbbaccc2c05ca2220dbbb74a7368304a89d31c9c.tar.gz
samba-dbbaccc2c05ca2220dbbb74a7368304a89d31c9c.tar.bz2
samba-dbbaccc2c05ca2220dbbb74a7368304a89d31c9c.zip
r10606: pdb_*sql patches from
Uli Meis <a.sporto@gmail.com> Peter Rindfuss <rindfuss@wz-berlin.de> (This used to be commit 8bf124adaf4d6cacc18ebca82d96eabe47088151)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/talloc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/lib/talloc.c b/source3/lib/talloc.c
index 15b0f4ea7d..98cba8597e 100644
--- a/source3/lib/talloc.c
+++ b/source3/lib/talloc.c
@@ -989,7 +989,6 @@ static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) PRINT
static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap)
{
- struct talloc_chunk *tc;
int len, s_len;
va_list ap2;
@@ -997,11 +996,9 @@ static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap)
return talloc_vasprintf(NULL, fmt, ap);
}
- tc = talloc_chunk_from_ptr(s);
-
VA_COPY(ap2, ap);
- s_len = tc->size - 1;
+ s_len = strlen(s);
len = vsnprintf(NULL, 0, fmt, ap2);
s = talloc_realloc(NULL, s, char, s_len + len+1);