From 4e148b115eddfd10abacf702292bc53530a212b4 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 13 Nov 2003 07:31:58 +0000 Subject: [PATCH] Silly me: Reverted last change. The code here is actually okay but when driving the one for gnupg, the bug was probably introduced. --- trunk/gpgme/ChangeLog | 4 ---- trunk/gpgme/vasprintf.c | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index c0c66a5..2966d6b 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,7 +1,3 @@ -2003-11-13 Werner Koch - - * vasprintf.c (int_vasprintf): ARGS should not be a pointer. - 2003-10-31 Werner Koch * keylist.c (parse_timestamp): Detect ISO 8601 timestamps and try diff --git a/trunk/gpgme/vasprintf.c b/trunk/gpgme/vasprintf.c index d8275f6..77113a3 100644 --- a/trunk/gpgme/vasprintf.c +++ b/trunk/gpgme/vasprintf.c @@ -43,13 +43,13 @@ Boston, MA 02111-1307, USA. */ int global_total_width; #endif -static int int_vasprintf (char **, const char *, va_list); +static int int_vasprintf (char **, const char *, va_list *); static int int_vasprintf (result, format, args) char **result; const char *format; - va_list args; + va_list *args; { const char *p = format; /* Add one to make sure that it is never zero, which might cause malloc @@ -57,7 +57,7 @@ int_vasprintf (result, format, args) int total_width = strlen (format) + 1; va_list ap; - va_copy (ap, args); + va_copy (ap, *args); while (*p != '\0') { @@ -130,7 +130,7 @@ int_vasprintf (result, format, args) #endif *result = malloc (total_width); if (*result != NULL) - return vsprintf (*result, format, args); + return vsprintf (*result, format, *args); else return 0; } -- 2.26.2