FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from gcc

Browse source
This commit is contained in:
DJ Delorie 2003-10-30 21:31:43 +00:00
parent bb489b3c99
commit 2382c03f5a
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libiberty/vasprintf.c
View file

@ -59,13 +59,13 @@ not be allocated, minus one is returned and @code{NULL} is stored in
*/
static int int_vasprintf PARAMS ((char **, const char *, va_list *));
static int int_vasprintf PARAMS ((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
@ -73,7 +73,11 @@ int_vasprintf (result, format, args)
int total_width = strlen (format) + 1;
va_list ap;
memcpy ((PTR) &ap, (PTR) args, sizeof (va_list));
#ifdef va_copy
va_copy (ap, args);
#else
memcpy ((PTR) &ap, (PTR) &args, sizeof (va_list));
#endif
while (*p != '\0')
{
@ -135,12 +139,15 @@ int_vasprintf (result, format, args)
p++;
}
}
#ifdef va_copy
va_end (ap);
#endif
#ifdef TEST
global_total_width = total_width;
#endif
*result = (char *) malloc (total_width);
if (*result != NULL)
return vsprintf (*result, format, *args);
return vsprintf (*result, format, args);
else
return -1;
}
@ -155,7 +162,7 @@ vasprintf (result, format, args)
va_list args;
#endif
{
return int_vasprintf (result, format, &args);
return int_vasprintf (result, format, args);
}
#ifdef TEST