From: Werner Koch <wk@gnupg.org>
Date: Thu, 13 Nov 2003 07:31:58 +0000 (+0000)
Subject: Silly me:  Reverted last change.  The code here is actually okay but
X-Git-Tag: gpgme-0-4-4~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23a2e04133c09bb4884058189abb703f3027cd75;p=gpgme.git

Silly me:  Reverted last change.  The code here is actually okay but
when driving the one for gnupg, the bug was probably introduced.
---

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index c0c66a5..2966d6b 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,7 +1,3 @@
-2003-11-13  Werner Koch  <wk@gnupg.org>
-
-	* vasprintf.c (int_vasprintf): ARGS should not be a pointer.
-
 2003-10-31  Werner Koch  <wk@gnupg.org>
 
 	* keylist.c (parse_timestamp): Detect ISO 8601 timestamps and try
diff --git a/gpgme/vasprintf.c b/gpgme/vasprintf.c
index d8275f6..77113a3 100644
--- a/gpgme/vasprintf.c
+++ b/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;
 }