bug-coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FYI: remove use of AC_FUNC_SETVBUF_REVERSED


From: Jim Meyering
Subject: FYI: remove use of AC_FUNC_SETVBUF_REVERSED
Date: Tue, 12 Dec 2006 14:42:35 +0100

FYI, I've just done this:

        * src/system.h (SETVBUF): Remove definition, now that the
        autoconf macro, AC_FUNC_SETVBUF_REVERSED, does nothing.
        * src/tee.c (tee_files): s/SETVBUF/setvbuf/.
        * src/od.c (open_next_file): Likewise.
        * m4/jm-macros.m4: Remove AC_FUNC_SETVBUF_REVERSED, now that it's a 
no-op.

diff --git a/src/od.c b/src/od.c
index a0c2474..706a469 100644
--- a/src/od.c
+++ b/src/od.c
@@ -928,7 +928,7 @@ open_next_file (void)
   while (in_stream == NULL);

   if (limit_bytes_to_format & !flag_dump_strings)
-    SETVBUF (in_stream, NULL, _IONBF, 0);
+    setvbuf (in_stream, NULL, _IONBF, 0);

   return ok;
 }
diff --git a/src/system.h b/src/system.h
index 9cc144c..2a90913 100644
--- a/src/system.h
+++ b/src/system.h
@@ -389,14 +389,6 @@ readdir_ignoring_dot_and_dotdot (DIR *dirp)
     }
 }

-#if SETVBUF_REVERSED
-# define SETVBUF(Stream, Buffer, Type, Size) \
-    setvbuf (Stream, Type, Buffer, Size)
-#else
-# define SETVBUF(Stream, Buffer, Type, Size) \
-    setvbuf (Stream, Buffer, Type, Size)
-#endif
-
 /* Factor out some of the common --help and --version processing code.  */

 /* These enum values cannot possibly conflict with the option values
diff --git a/src/tee.c b/src/tee.c
index f612181..d21edbc 100644
--- a/src/tee.c
+++ b/src/tee.c
@@ -161,7 +161,7 @@ tee_files (int nfiles, const char **files)
      the first one correspond to standard output.   */
   descriptors[0] = stdout;
   files[0] = _("standard output");
-  SETVBUF (stdout, NULL, _IONBF, 0);
+  setvbuf (stdout, NULL, _IONBF, 0);

   for (i = 1; i <= nfiles; i++)
     {
@@ -174,7 +174,7 @@ tee_files (int nfiles, const char **files)
          ok = false;
        }
       else
-       SETVBUF (descriptors[i], NULL, _IONBF, 0);
+       setvbuf (descriptors[i], NULL, _IONBF, 0);
     }

   while (1)

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 5bf46a9..fe9970b 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 104   -*- autoconf -*-
+#serial 105   -*- autoconf -*-

 dnl Misc type-related macros for coreutils.

@@ -50,9 +50,6 @@ AC_DEFUN([coreutils_MACROS],
   AC_DEFINE(ARGMATCH_DIE_DECL, [extern void usage ()],
            [Define to the declaration of the xargmatch failure function.])

-  dnl Used to define SETVBUF in ../src/system.h.
-  AC_FUNC_SETVBUF_REVERSED
-
   # used by ls
   AC_REQUIRE([gl_CLOCK_TIME])
   # used by shred




reply via email to

[Prev in Thread] Current Thread [Next in Thread]