GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(int_vasprintf): ARGS should not be a pointer.

Browse Source
This commit is contained in:
Werner Koch 2003-11-13 07:26:53 +00:00
parent 2f1226cea9
commit c2740411a9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpgme/ChangeLog
View File

@ -1,3 +1,7 @@
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> 2003-10-31 Werner Koch <wk@gnupg.org>
* keylist.c (parse_timestamp): Detect ISO 8601 timestamps and try * keylist.c (parse_timestamp): Detect ISO 8601 timestamps and try

10
gpgme/vasprintf.c
View File

@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA. */
#include <stdarg.h> #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__) \ #if defined (__GNUC__) && defined (__PPC__) \
&& (defined (_CALL_SYSV) || defined (_WIN32)) && (defined (_CALL_SYSV) || defined (_WIN32))
#define va_copy(d, s) (*(d) = *(s)) #define va_copy(d, s) (*(d) = *(s))
@ -43,13 +43,13 @@ Boston, MA 02111-1307, USA. */
int global_total_width; int global_total_width;
#endif #endif
static int int_vasprintf (char **, const char *, va_list *); static int int_vasprintf (char **, const char *, va_list);
static int static int
int_vasprintf (result, format, args) int_vasprintf (result, format, args)
char **result; char **result;
const char *format; const char *format;
va_list *args; va_list args;
{ {
const char *p = format; const char *p = format;
/* Add one to make sure that it is never zero, which might cause malloc /* 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; int total_width = strlen (format) + 1;
va_list ap; va_list ap;
va_copy (ap, *args); va_copy (ap, args);
while (*p != '\0') while (*p != '\0')
{ {
@ -130,7 +130,7 @@ int_vasprintf (result, format, args)
#endif #endif
*result = malloc (total_width); *result = malloc (total_width);
if (*result != NULL) if (*result != NULL)
return vsprintf (*result, format, *args); return vsprintf (*result, format, args);
else else
return 0; return 0;
} }