X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-fflush2.c;h=ac2217d7e0736601dc0a14cbc2033dd977d65ebb;hb=70a72e0f50411ccc776379a761725d8c8bec58a3;hp=a395c6dbad14ff02c23edc8cb4c460beeed3a106;hpb=2ce0c024d8f5f537b8c1b2509c615af1ea430537;p=gnulib.git

diff --git a/tests/test-fflush2.c b/tests/test-fflush2.c
index a395c6dba..ac2217d7e 100644
--- a/tests/test-fflush2.c
+++ b/tests/test-fflush2.c
@@ -1,5 +1,5 @@
 /* Test of POSIX compatible fflush() function.
-   Copyright (C) 2008-2009 Free Software Foundation, Inc.
+   Copyright (C) 2008-2011 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
@@ -18,21 +18,8 @@
 
 #include <stdio.h>
 
-#include <stdlib.h>
-
 #include "binary-io.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)
@@ -47,74 +34,74 @@ main (int argc, char **argv)
     switch (argv[1][0])
       {
       case '1':
-	/* Check fflush after a backup ungetc() call.  This is case 1a in
-	   terms of
-	   <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>,
-	   according to the Austin Group's resolution on 2009-01-08.  */
+        /* Check fflush after a backup ungetc() call.  This is case 1a in
+           terms of
+           <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>,
+           according to the Austin Group's resolution on 2009-01-08.  */
 
-	c = fgetc (stdin);
-	ASSERT (c == '#');
+        c = fgetc (stdin);
+        ASSERT (c == '#');
 
-	c = fgetc (stdin);
-	ASSERT (c == '!');
+        c = fgetc (stdin);
+        ASSERT (c == '!');
 
-	/* Here the file-position indicator must be 2.  */
+        /* Here the file-position indicator must be 2.  */
 
-	c = ungetc ('!', stdin);
-	ASSERT (c == '!');
+        c = ungetc ('!', stdin);
+        ASSERT (c == '!');
 
-	fflush (stdin);
+        fflush (stdin);
 
-	/* Here the file-position indicator must be 1.  */
+        /* Here the file-position indicator must be 1.  */
 
-	c = fgetc (stdin);
-	ASSERT (c == '!');
+        c = fgetc (stdin);
+        ASSERT (c == '!');
 
-	c = fgetc (stdin);
-	ASSERT (c == '/');
+        c = fgetc (stdin);
+        ASSERT (c == '/');
 
-	return 0;
+        return 0;
 
       case '2':
-	/* Check fflush after a non-backup ungetc() call.  This is case 2a in
-	   terms of
-	   <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>,
-	   according to the Austin Group's resolution on 2009-01-08.  */
-	/* Check that fflush after a non-backup ungetc() call discards the
-	   ungetc buffer.  This is mandated by POSIX
-	   <http://www.opengroup.org/susv3/functions/ungetc.html>:
-	     "The value of the file-position indicator for the stream after
-	      reading or discarding all pushed-back bytes shall be the same
-	      as it was before the bytes were pushed back."
-	   <http://www.opengroup.org/austin/aardvark/latest/xshbug3.txt>
-	     "[After fflush(),] the file offset of the underlying open file
-	      description shall be set to the file position of the stream, and
-	      any characters pushed back onto the stream by ungetc() or
-	      ungetwc() that have not subsequently been read from the stream
-	      shall be discarded."  */
+        /* Check fflush after a non-backup ungetc() call.  This is case 2a in
+           terms of
+           <http://lists.gnu.org/archive/html/bug-gnulib/2008-03/msg00131.html>,
+           according to the Austin Group's resolution on 2009-01-08.  */
+        /* Check that fflush after a non-backup ungetc() call discards the
+           ungetc buffer.  This is mandated by POSIX
+           <http://www.opengroup.org/susv3/functions/ungetc.html>:
+             "The value of the file-position indicator for the stream after
+              reading or discarding all pushed-back bytes shall be the same
+              as it was before the bytes were pushed back."
+           <http://www.opengroup.org/austin/aardvark/latest/xshbug3.txt>
+             "[After fflush(),] the file offset of the underlying open file
+              description shall be set to the file position of the stream, and
+              any characters pushed back onto the stream by ungetc() or
+              ungetwc() that have not subsequently been read from the stream
+              shall be discarded."  */
 
-	c = fgetc (stdin);
-	ASSERT (c == '#');
+        c = fgetc (stdin);
+        ASSERT (c == '#');
 
-	c = fgetc (stdin);
-	ASSERT (c == '!');
+        c = fgetc (stdin);
+        ASSERT (c == '!');
 
-	/* Here the file-position indicator must be 2.  */
+        /* Here the file-position indicator must be 2.  */
 
-	c = ungetc ('@', stdin);
-	ASSERT (c == '@');
+        c = ungetc ('@', stdin);
+        ASSERT (c == '@');
 
-	fflush (stdin);
+        fflush (stdin);
 
-	/* Here the file-position indicator must be 1.  */
+        /* Here the file-position indicator must be 1.  */
 
-	c = fgetc (stdin);
-	ASSERT (c == '!');
+        c = fgetc (stdin);
+        ASSERT (c == '!');
 
-	c = fgetc (stdin);
-	ASSERT (c == '/');
+        c = fgetc (stdin);
+        ASSERT (c == '/');
 
-	return 0;
+        return 0;
       }
 
   return 1;