vasnprintf test: Reduce code duplication.

diff --git a/ChangeLog b/ChangeLog
index c1810ba..d347b26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-04-10  Bruno Haible  <bruno@clisp.org>
 
+       vasnprintf test: Reduce code duplication.
+       * tests/test-vasnprintf.c (test_function): New function, extracted from
+       test_vasnprintf.
+       (test_vasnprintf, test_asnprintf): Invoke it.
+
+2010-04-10  Bruno Haible  <bruno@clisp.org>
+
        strnlen: Fix warning in C++ mode on MacOS X.
        * lib/string.in.h (strnlen): Use the modern idiom.
        * m4/strnlen.m4 (gl_FUNC_STRNLEN): Set REPLACE_STRNLEN to 1, instead of

diff --git a/tests/test-vasnprintf.c b/tests/test-vasnprintf.c
index e283142..15401eb 100644 (file)
--- a/tests/test-vasnprintf.c
+++ b/tests/test-vasnprintf.c
@@ -26,20 +26,8 @@
 
 #include "macros.h"
 
-static char *
-my_asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
-{
-  va_list args;
-  char *ret;
-
-  va_start (args, format);
-  ret = vasnprintf (resultbuf, lengthp, format, args);
-  va_end (args);
-  return ret;
-}
-
 static void
-test_vasnprintf ()
+test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
 {
   char buf[8];
   int size;
@@ -73,39 +61,28 @@ test_vasnprintf ()
     }
 }
 
-static void
-test_asnprintf ()
+static char *
+my_asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
 {
-  char buf[8];
-  int size;
+  va_list args;
+  char *ret;
 
-  for (size = 0; size <= 8; size++)
-    {
-      size_t length = size;
-      char *result = asnprintf (NULL, &length, "%d", 12345);
-      ASSERT (result != NULL);
-      ASSERT (strcmp (result, "12345") == 0);
-      ASSERT (length == 5);
-      free (result);
-    }
+  va_start (args, format);
+  ret = vasnprintf (resultbuf, lengthp, format, args);
+  va_end (args);
+  return ret;
+}
 
-  for (size = 0; size <= 8; size++)
-    {
-      size_t length;
-      char *result;
+static void
+test_vasnprintf ()
+{
+  test_function (my_asnprintf);
+}
 
-      memcpy (buf, "DEADBEEF", 8);
-      length = size;
-      result = asnprintf (buf, &length, "%d", 12345);
-      ASSERT (result != NULL);
-      ASSERT (strcmp (result, "12345") == 0);
-      ASSERT (length == 5);
-      if (size < 6)
-        ASSERT (result != buf);
-      ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
-      if (result != buf)
-        free (result);
-    }
+static void
+test_asnprintf ()
+{
+  test_function (asnprintf);
 }
 
 int