X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-memrchr.c;h=d6d36c03fc49a4d46114b1eb94b49ca369638b74;hb=6815bc73969d38c2226cf6e3366c1e4f4f756ba0;hp=962fc90cf20719c121dba996c07afe5273591aac;hpb=82381b9e5b37125305709d412d8322b35e5c4796;p=gnulib.git

diff --git a/tests/test-memrchr.c b/tests/test-memrchr.c
index 962fc90cf..d6d36c03f 100644
--- a/tests/test-memrchr.c
+++ b/tests/test-memrchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Free Software Foundation
+ * Copyright (C) 2008-2011 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,22 +19,13 @@
 
 #include <string.h>
 
-#include <stdio.h>
+#include "signature.h"
+SIGNATURE_CHECK (memrchr, void *, (void const *, int, size_t));
+
 #include <stdlib.h>
 
 #include "zerosize-ptr.h"
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-	{								     \
-	  fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-	  fflush (stderr);						     \
-	  abort ();							     \
-	}								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 /* Calculating void * + int is not portable, so this wrapper converts
    to char * to make the tests easier to write.  */
@@ -76,7 +67,7 @@ main (void)
     size_t repeat = 10000;
     for (; repeat > 0; repeat--)
       {
-	ASSERT (MEMRCHR (input, 'c', n) == input + n - 3);
+        ASSERT (MEMRCHR (input, 'c', n) == input + n - 3);
       }
   }
 
@@ -85,12 +76,12 @@ main (void)
     int i, j;
     for (i = 0; i < 32; i++)
       {
-	for (j = 0; j < 256; j++)
-	  input[i + j] = j;
-	for (j = 0; j < 256; j++)
-	  {
-	    ASSERT (MEMRCHR (input + i, j, 256) == input + i + j);
-	  }
+        for (j = 0; j < 256; j++)
+          input[i + j] = j;
+        for (j = 0; j < 256; j++)
+          {
+            ASSERT (MEMRCHR (input + i, j, 256) == input + i + j);
+          }
       }
   }