New module 'arg-nonnull'. Declare which arguments expect non-NULL values.

[gnulib.git] / tests / test-canonicalize-lgpl.c

diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index 39025fa..7667983 100644 (file)
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -29,26 +29,28 @@
 
 #include "same-inode.h"
 
-#if !HAVE_SYMLINK
-# define symlink(a,b) (-1)
-#endif /* !HAVE_SYMLINK */
-
 #define ASSERT(expr) \
-  do                                                                        \
-    {                                                                       \
-      if (!(expr))                                                          \
-        {                                                                   \
+  do                                                                         \
+    {                                                                        \
+      if (!(expr))                                                           \
+        {                                                                    \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);                                                  \
-          abort ();                                                         \
-        }                                                                   \
-    }                                                                       \
+          fflush (stderr);                                                   \
+          abort ();                                                          \
+        }                                                                    \
+    }                                                                        \
   while (0)
 
 #define BASE "t-can-lgpl.tmp"
 
+static void *
+null_ptr (void)
+{
+  return NULL;
+}
+
 int
-main ()
+main (void)
 {
 #ifdef GNULIB_CANONICALIZE
   /* No need to test canonicalize-lgpl module if canonicalize is also
@@ -72,14 +74,14 @@ main ()
     char *result = canonicalize_file_name (BASE "//./..//" BASE "/tra");
     ASSERT (result != NULL);
     ASSERT (strstr (result, "/" BASE "/tra")
-           == result + strlen (result) - strlen ("/" BASE "/tra"));
+            == result + strlen (result) - strlen ("/" BASE "/tra"));
     free (result);
     errno = 0;
     result = canonicalize_file_name ("");
     ASSERT (result == NULL);
     ASSERT (errno == ENOENT);
     errno = 0;
-    result = canonicalize_file_name (NULL);
+    result = canonicalize_file_name (null_ptr ());
     ASSERT (result == NULL);
     ASSERT (errno == EINVAL);
   }
@@ -107,8 +109,8 @@ main ()
     {
       ASSERT (remove (BASE "/tra") == 0);
       ASSERT (rmdir (BASE) == 0);
-      fputs ("skipping test: symlinks not supported on this filesystem\n",
-            stderr);
+      fputs ("skipping test: symlinks not supported on this file system\n",
+             stderr);
       return 77;
     }
   ASSERT (symlink ("bef", BASE "/plo") == 0);
@@ -127,7 +129,7 @@ main ()
     ASSERT (result2 != NULL);
     ASSERT (strcmp (result1, result2) == 0);
     ASSERT (strcmp (result1 + strlen (result1) - strlen ("/" BASE "/tra"),
-                   "/" BASE "/tra") == 0);
+                    "/" BASE "/tra") == 0);
     free (result1);
     free (result2);
   }
@@ -143,7 +145,7 @@ main ()
     ASSERT (strcmp (result1, result2) == 0);
     ASSERT (strcmp (result2, result3) == 0);
     ASSERT (strcmp (result1 + strlen (result1) - strlen ("/" BASE "/lum"),
-                   "/" BASE "/lum") == 0);
+                    "/" BASE "/lum") == 0);
     free (result1);
     free (result2);
     free (result3);
@@ -197,13 +199,13 @@ main ()
     ASSERT (stat ("//", &st2) == 0);
     if (SAME_INODE (st1, st2))
       {
-       ASSERT (strcmp (result1, "/") == 0);
-       ASSERT (strcmp (result2, "/") == 0);
+        ASSERT (strcmp (result1, "/") == 0);
+        ASSERT (strcmp (result2, "/") == 0);
       }
     else
       {
-       ASSERT (strcmp (result1, "//") == 0);
-       ASSERT (strcmp (result2, "//") == 0);
+        ASSERT (strcmp (result1, "//") == 0);
+        ASSERT (strcmp (result2, "//") == 0);
       }
     free (result1);
     free (result2);