va_{start,end} fixes; from Thomas Klausner

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10739 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-09-24 12:16:37 +00:00
parent c884ea3911
commit c413a3c0fa

View File

@@ -496,6 +496,7 @@ snprintf (char *str, size_t sz, const char *format, ...)
va_start(args, format); va_start(args, format);
ret = vsnprintf (str, sz, format, args); ret = vsnprintf (str, sz, format, args);
va_end(args);
#ifdef PARANOIA #ifdef PARANOIA
{ {
@@ -506,14 +507,15 @@ snprintf (char *str, size_t sz, const char *format, ...)
if (tmp == NULL) if (tmp == NULL)
abort (); abort ();
va_start(args, format);
ret2 = vsprintf (tmp, format, args); ret2 = vsprintf (tmp, format, args);
va_end(args);
if (ret != ret2 || strcmp(str, tmp)) if (ret != ret2 || strcmp(str, tmp))
abort (); abort ();
free (tmp); free (tmp);
} }
#endif #endif
va_end(args);
return ret; return ret;
} }
#endif #endif
@@ -527,6 +529,7 @@ asprintf (char **ret, const char *format, ...)
va_start(args, format); va_start(args, format);
val = vasprintf (ret, format, args); val = vasprintf (ret, format, args);
va_end(args);
#ifdef PARANOIA #ifdef PARANOIA
{ {
@@ -536,14 +539,15 @@ asprintf (char **ret, const char *format, ...)
if (tmp == NULL) if (tmp == NULL)
abort (); abort ();
va_start(args, format);
ret2 = vsprintf (tmp, format, args); ret2 = vsprintf (tmp, format, args);
va_end(args);
if (val != ret2 || strcmp(*ret, tmp)) if (val != ret2 || strcmp(*ret, tmp))
abort (); abort ();
free (tmp); free (tmp);
} }
#endif #endif
va_end(args);
return val; return val;
} }
#endif #endif