diff options
| author | Werner Koch <[email protected]> | 2003-11-13 07:31:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-11-13 07:31:58 +0000 |
| commit | 23a2e04133c09bb4884058189abb703f3027cd75 (patch) | |
| tree | 192f683e2c3752b7fe4a740208cfbf46bb4ad622 | |
| parent | (int_vasprintf): ARGS should not be a pointer. (diff) | |
| download | gpgme-23a2e04133c09bb4884058189abb703f3027cd75.tar.gz gpgme-23a2e04133c09bb4884058189abb703f3027cd75.zip | |
Silly me: Reverted last change. The code here is actually okay but
when driving the one for gnupg, the bug was probably introduced.
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/vasprintf.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index c0c66a5a..2966d6be 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,7 +1,3 @@ -2003-11-13 Werner Koch <[email protected]> - - * vasprintf.c (int_vasprintf): ARGS should not be a pointer. - 2003-10-31 Werner Koch <[email protected]> * keylist.c (parse_timestamp): Detect ISO 8601 timestamps and try diff --git a/gpgme/vasprintf.c b/gpgme/vasprintf.c index d8275f65..77113a31 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; } |