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

diff --git a/tests/test-memmem.c b/tests/test-memmem.c
index 3ce54c7ac..7f0f9257a 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-2009 Free Software Foundation
  * Written by Bruno Haible and Eric Blake
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,16 +19,20 @@
 
 #include <string.h>
 
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "zerosize-ptr.h"
+
 #define ASSERT(expr) \
   do									     \
     {									     \
       if (!(expr))							     \
         {								     \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
           abort ();							     \
         }								     \
     }									     \
@@ -42,7 +46,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,9 +80,9 @@ 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);
   }
 
@@ -152,10 +157,8 @@ main (int argc, char *argv[])
 	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
@@ -179,10 +182,8 @@ main (int argc, char *argv[])
 	    ASSERT (result == NULL);
 	  }
       }
-    if (haystack != NULL)
-      free (haystack);
-    if (needle != NULL)
-      free (needle);
+    free (haystack);
+    free (needle);
   }
 
   return 0;