X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-getndelim2.c;h=18e15a210a78a6424e1071436d4891e010835e26;hb=6676cd901ebffe806000d9e7e459ccabe2e80195;hp=10ec1d8e61bbe276462edd41fb6b0fd1d05e3b4d;hpb=463890eaa2cb1f303b100f6889421761149e936f;p=gnulib.git

diff --git a/tests/test-getndelim2.c b/tests/test-getndelim2.c
index 10ec1d8e6..18e15a210 100644
--- a/tests/test-getndelim2.c
+++ b/tests/test-getndelim2.c
@@ -1,5 +1,5 @@
 /* Test of getndelim2() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,26 +19,16 @@
 
 #include <config.h>
 
+#include "getndelim2.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "getndelim2.h"
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 int
-main (int argc, char **argv)
+main (void)
 {
   FILE *f;
   char *line = NULL;
@@ -138,19 +128,19 @@ main (int argc, char **argv)
 
     result = getndelim2 (&line, &len, 0, GETNLINE_NO_LIMIT, 'g', 'f', f);
     ASSERT (result == 501 * 14 - 1);
-    ASSERT (501 * 14 < len);
+    ASSERT (501 * 14 <= len);
     buffer[499] = 'f';
     buffer[500] = '\0';
     ASSERT (strcmp (buffer, line + 501 * 13) == 0);
 
     result = getndelim2 (&line, &len, 501 * 14 - 1, GETNLINE_NO_LIMIT,
-			 EOF, EOF, f);
+                         EOF, EOF, f);
     ASSERT (result == 1);
     buffer[500] = '\n';
     ASSERT (strcmp (buffer, line + 501 * 13) == 0);
 
     result = getndelim2 (&line, &len, 501 * 14 - 1, GETNLINE_NO_LIMIT,
-			 EOF, EOF, f);
+                         EOF, EOF, f);
     buffer[500] = '\0';
     ASSERT (strcmp (buffer, line + 501 * 13) == 0);
     ASSERT (result == -1);