4 files changed, 45 insertions, 35 deletions
diff --git a/tests/portable/asprintf-t.c b/tests/portable/asprintf-t.c
index a79c7f4..d42e740 100644
--- a/tests/portable/asprintf-t.c
+++ b/tests/portable/asprintf-t.c
@@ -1,15 +1,21 @@
-/* $Id$ */
-/* asprintf and vasprintf test suite. */
-
-/* Written by Russ Allbery <rra@stanford.edu>
-   Copyright 2006 Board of Trustees, Leland Stanford Jr. University
-   See LICENSE for licensing terms. */
+/* $Id$
+ *
+ * asprintf and vasprintf test suite.
+ *
+ * Written by Russ Allbery <rra@stanford.edu>
+ * Copyright 2006, 2008 Board of Trustees, Leland Stanford Jr. University
+ *
+ * See LICENSE for licensing terms.
+ */
 
 #include <config.h>
-#include <system.h>
+#include <portable/system.h>
 
 #include <tests/libtest.h>
 
+int test_asprintf(char **, const char *, ...);
+int test_vasprintf(char **, const char *, va_list);
+
 static int
 vatest(char **result, const char *format, ...)
 {
@@ -17,7 +23,7 @@ vatest(char **result, const char *format, ...)
     int status;
 
     va_start(args, format);
-    status = vasprintf(result, format, args);
+    status = test_vasprintf(result, format, args);
     va_end(args);
     return status;
 }
@@ -29,11 +35,11 @@ main(void)
 
     test_init(12);
 
-    ok_int(1, 7, asprintf(&result, "%s", "testing"));
+    ok_int(1, 7, test_asprintf(&result, "%s", "testing"));
     ok_string(2, "testing", result);
     free(result);
     ok(3, 1);
-    ok_int(4, 0, asprintf(&result, "%s", ""));
+    ok_int(4, 0, test_asprintf(&result, "%s", ""));
     ok_string(5, "", result);
     free(result);
     ok(6, 1);
diff --git a/tests/portable/snprintf-t.c b/tests/portable/snprintf-t.c
index 9159fcf..c33e0e7 100644
--- a/tests/portable/snprintf-t.c
+++ b/tests/portable/snprintf-t.c
@@ -1,28 +1,30 @@
-/* $Id$ */
-/* snprintf test suite. */
-
-/* Copyright (c) 2004, 2005, 2006
-       by Internet Systems Consortium, Inc. ("ISC")
-   Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-       2002, 2003 by The Internet Software Consortium and Rich Salz
-
-   This code is derived from software contributed to the Internet Software
-   Consortium by Rich Salz.
-
-   Permission to use, copy, modify, and distribute this software for any
-   purpose with or without fee is hereby granted, provided that the above
-   copyright notice and this permission notice appear in all copies.
-
-   THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-   REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-   MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY
-   SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+/* $Id$
+ *
+ * snprintf test suite.
+ *
+ * Copyright (c) 2004, 2005, 2006
+ *     by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+ *     2002, 2003 by The Internet Software Consortium and Rich Salz
+ *
+ * This code is derived from software contributed to the Internet Software
+ * Consortium by Rich Salz.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
 
 #include <config.h>
-#include <system.h>
+#include <portable/system.h>
 
 #include <tests/libtest.h>
 
@@ -90,6 +92,7 @@ static unsigned long long ullong_nums[] = {
     0
 };
 
+
 static void
 test_format(int n, int truncate, const char *expected, int count,
             const char *format, ...)
@@ -113,6 +116,7 @@ test_format(int n, int truncate, const char *expected, int count,
     }
 }
 
+
 int
 main(void)
 {
diff --git a/tests/portable/strlcat-t.c b/tests/portable/strlcat-t.c
index 5ad8b6f..c860803 100644
--- a/tests/portable/strlcat-t.c
+++ b/tests/portable/strlcat-t.c
@@ -24,7 +24,7 @@
  */
 
 #include <config.h>
-#include <system.h>
+#include <portable/system.h>
 
 #include <tests/libtest.h>
 
diff --git a/tests/portable/strlcpy-t.c b/tests/portable/strlcpy-t.c
index 6427374..8fb1f9c 100644
--- a/tests/portable/strlcpy-t.c
+++ b/tests/portable/strlcpy-t.c
@@ -24,7 +24,7 @@
  */
 
 #include <config.h>
-#include <system.h>
+#include <portable/system.h>
 
 #include <tests/libtest.h>