X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-memmem.c;h=a9d3558c2bea4bfaca5bbd4bd25fbbf564e77fab;hb=fe9ecba865a2015187a862f25ada175a5d3d8aa8;hp=3ce54c7acc4928e68fdae956eb7b9a9a1437ebf1;hpb=9d8d6cd7a56291988ca24977416d64dda885ed49;p=gnulib.git

diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index 3ce54c7ac..a9d3558c2 100644
--- a/tests/test-memmem.c
+++ b/tests/test-memmem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2004, 2007-2010 Free Software Foundation, Inc.
  * Written by Bruno Haible and Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,20 +19,21 @@
 
 #include <string.h>
 
-#include <stdio.h>
+#include "signature.h"
+SIGNATURE_CHECK (memmem, void *, (void const *, size_t, void const *, size_t));
+
+#include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "zerosize-ptr.h"
+#include "macros.h"
+
+static void *
+null_ptr (void)
+{
+  return NULL;
+}
 
 int
 main (int argc, char *argv[])
@@ -42,7 +43,8 @@ main (int argc, char *argv[])
      caused by SIGALRM.  All known platforms that lack alarm also lack
      memmem, and the replacement memmem is known to not take too
      long.  */
-  alarm (10);
+  signal (SIGALRM, SIG_DFL);
+  alarm (100);
 #endif
 
   {
@@ -75,15 +77,15 @@ main (int argc, char *argv[])
     ASSERT (result == input + 11);
   }
 
-  /* Check that length 0 does not dereference NULL.  */
+  /* Check that length 0 does not dereference the pointer.  */
   {
-    const char *result = memmem (NULL, 0, "foo", 3);
+    const char *result = memmem (zerosize_ptr (), 0, "foo", 3);
     ASSERT (result == NULL);
   }
 
   {
     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);
   }
 
@@ -99,15 +101,15 @@ main (int argc, char *argv[])
     char *haystack = (char *) malloc (m + 1);
     if (haystack != NULL)
       {
-	memset (haystack, 'A', m);
-	haystack[0] = 'B';
+        memset (haystack, 'A', m);
+        haystack[0] = 'B';
 
-	for (; repeat > 0; repeat--)
-	  {
-	    ASSERT (memmem (haystack, m, needle, n) == haystack + 1);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (memmem (haystack, m, needle, n) == haystack + 1);
+          }
 
-	free (haystack);
+        free (haystack);
       }
   }
 
@@ -123,14 +125,14 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (m + 1);
     if (needle != NULL)
       {
-	memset (needle, 'A', m);
+        memset (needle, 'A', m);
 
-	for (; repeat > 0; repeat--)
-	  {
-	    ASSERT (memmem (haystack, n, needle, m) == NULL);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            ASSERT (memmem (haystack, n, needle, m) == NULL);
+          }
 
-	free (needle);
+        free (needle);
       }
   }
 
@@ -141,21 +143,19 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (m + 1);
     if (haystack != NULL && needle != NULL)
       {
-	const char *result;
+        const char *result;
 
-	memset (haystack, 'A', 2 * m);
-	haystack[2 * m] = 'B';
+        memset (haystack, 'A', 2 * m);
+        haystack[2 * m] = 'B';
 
-	memset (needle, 'A', m);
-	needle[m] = 'B';
+        memset (needle, 'A', m);
+        needle[m] = 'B';
 
-	result = memmem (haystack, 2 * m + 1, needle, m + 1);
-	ASSERT (result == haystack + m);
+        result = memmem (haystack, 2 * m + 1, needle, m + 1);
+        ASSERT (result == haystack + m);
       }
-    if (needle != NULL)
-      free (needle);
-    if (haystack != NULL)
-      free (haystack);
+    free (needle);
+    free (haystack);
   }
 
   /* Check that long needles not present in a haystack can be handled
@@ -168,21 +168,19 @@ main (int argc, char *argv[])
     char *needle = (char *) malloc (n);
     if (haystack != NULL && needle != NULL)
       {
-	const char *result;
+        const char *result;
 
-	memset (haystack, 'A', m);
-	memset (needle, 'B', n);
+        memset (haystack, 'A', m);
+        memset (needle, 'B', n);
 
-	for (; repeat > 0; repeat--)
-	  {
-	    result = memmem (haystack, m, needle, n);
-	    ASSERT (result == NULL);
-	  }
+        for (; repeat > 0; repeat--)
+          {
+            result = memmem (haystack, m, needle, n);
+            ASSERT (result == NULL);
+          }
       }
-    if (haystack != NULL)
-      free (haystack);
-    if (needle != NULL)
-      free (needle);
+    free (haystack);
+    free (needle);
   }
 
   return 0;