Fixes, mostly from Simon Josefsson.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index f92f90831d01718f17a7c8cc83d19f3c005db1eb..a701b151fb77f5dd9c834b7c3d23e2c7b743981e 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,6 +1,8 @@
-2004-10-01  Bruno Haible  <bruno@clisp.org>
+2004-10-01  Simon Josefsson  <jas@extundo.com>
+            Bruno Haible  <bruno@clisp.org>
 
-       * snprintf.c: Include <string.h>.
+       * snprintf.c: Include <stdarg.h>, <stdlib.h>, <string.h>.
+       (snprintf): Declare 'args'.
 
 2004-09-30  Simon Josefsson  <jas@extundo.com>
 

diff --git a/lib/snprintf.c b/lib/snprintf.c
index 417dd33e198b3b28356ed0850fc3db51e84915fe..92c265289a3730865150acb7c9781092b9f555cf 100644 (file)
--- a/lib/snprintf.c
+++ b/lib/snprintf.c
@@ -20,10 +20,14 @@
 # include <config.h>
 #endif
 
-/* Get specification.  */
+/* Specification.  */
 #include "snprintf.h"
 
-/* Get memcpy.  */
+/* Get va_list, va_start, va_end. */
+#include <stdarg.h>
+/* Get free. */
+#include <stdlib.h>
+/* Get memcpy, size_t. */
 #include <string.h>
 
 /* Get vasnprintf.  */
@@ -40,19 +44,24 @@
 int
 snprintf (char *str, size_t size, const char *format, ...)
 {
+  char *output;
   size_t len;
-  char *out = vasnprintf (NULL, &len, format, args);
+  va_list args;
 
-  if (!out)
+  va_start (args, format);
+  output = vasnprintf (NULL, &len, format, args);
+  va_end (args);
+
+  if (!output)
     return -1;
 
   if (str)
     {
-      memcpy (str, out, MIN (len + 1, size));
+      memcpy (str, output, MIN (len + 1, size));
       str[size - 1] = '\0';
     }
 
-  free (out);
+  free (output);
 
   return len;
 }