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

3 files changed, 21 insertions, 3 deletions

diff --git a/tests/test-canonicalize-lgpl.c b/tests/test-canonicalize-lgpl.c
index 19109d5836..7667983da5 100644
--- a/tests/test-canonicalize-lgpl.c
+++ b/tests/test-canonicalize-lgpl.c
@@ -43,6 +43,12 @@
 
 #define BASE "t-can-lgpl.tmp"
 
+static void *
+null_ptr (void)
+{
+  return NULL;
+}
+
 int
 main (void)
 {
@@ -75,7 +81,7 @@ main (void)
     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);
   }
diff --git a/tests/test-canonicalize.c b/tests/test-canonicalize.c
index 749cc1eec1..70b6341de9 100644
--- a/tests/test-canonicalize.c
+++ b/tests/test-canonicalize.c
@@ -44,6 +44,12 @@
 
 #define BASE "t-can.tmp"
 
+static void *
+null_ptr (void)
+{
+  return NULL;
+}
+
 int
 main (void)
 {
@@ -79,7 +85,7 @@ main (void)
     ASSERT (result2 == NULL);
     ASSERT (errno == ENOENT);
     errno = 0;
-    result1 = canonicalize_file_name (NULL);
+    result1 = canonicalize_file_name (null_ptr ());
     ASSERT (result1 == NULL);
     ASSERT (errno == EINVAL);
     errno = 0;
diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index 8f4c28c902..75a2505b7a 100644
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -38,6 +38,12 @@
     }                                                                        \
   while (0)
 
+static void *
+null_ptr (void)
+{
+  return NULL;
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -88,7 +94,7 @@ main (int argc, char *argv[])
 
   {
     const char input[] = "foo";
-    const char *result = memmem (input, strlen (input), NULL, 0);
+    const char *result = memmem (input, strlen (input), null_ptr (), 0);
     ASSERT (result == input);
   }