aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2003-11-13 07:26:53 +0000
committerWerner Koch <[email protected]>2003-11-13 07:26:53 +0000
commitc2740411a95b0e1548ac5a823f0bdce6c64ee944 (patch)
tree40479e076e49886b1cb6a548fcdedbe1993a9780
parent(parse_timestamp): Detect ISO 8601 timestamps and try (diff)
downloadgpgme-c2740411a95b0e1548ac5a823f0bdce6c64ee944.tar.gz
gpgme-c2740411a95b0e1548ac5a823f0bdce6c64ee944.zip
(int_vasprintf): ARGS should not be a pointer.
-rw-r--r--gpgme/ChangeLog4
-rw-r--r--gpgme/vasprintf.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 2966d6be..c0c66a5a 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+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 0159867d..d8275f65 100644
--- a/gpgme/vasprintf.c
+++ b/gpgme/vasprintf.c
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA. */
#include <stdarg.h>
-#ifndef va_copy /* accroding to POSIX, va_copy is a macro */
+#ifndef va_copy /* According to POSIX, va_copy is a macro. */
#if defined (__GNUC__) && defined (__PPC__) \
&& (defined (_CALL_SYSV) || defined (_WIN32))
#define va_copy(d, s) (*(d) = *(s))
@@ -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;
}