* bootstrap.conf (gnulib_modules): Add sys_stat, since we use it directly too.

* lib/.cvsignore, lib/.gitignore: Add root-dev-ino.c, root-dev-ino.h.
* m4/.cvsignore, m4/.gitignore: Add root-dev-ino.m4.
* src/ls.c (DIRED_FPUTS_LITERAL, PUSH_CURRENT_DIRED_POS):
Omit unnecessary parenthesization of args.
* src/od.c (EQUAL_BLOCKS): Likewise.
* src/system.h (STREQ, ASSIGN_STRDUPA): Likewise.

diff --git a/ChangeLog b/ChangeLog
index a9a80f5..9c1213b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * bootstrap.conf (gnulib_modules): Add sys_stat, since we use it
+       directly too.
+       * lib/.cvsignore, lib/.gitignore: Add root-dev-ino.c, root-dev-ino.h.
+       * m4/.cvsignore, m4/.gitignore: Add root-dev-ino.m4.
+       * src/ls.c (DIRED_FPUTS_LITERAL, PUSH_CURRENT_DIRED_POS):
+       Omit unnecessary parenthesization of args.
+       * src/od.c (EQUAL_BLOCKS): Likewise.
+       * src/system.h (STREQ, ASSIGN_STRDUPA): Likewise.
+
 2006-11-16  Jim Meyering  <jim@meyering.net>
 
        * tests/tail-2/append-only: If chattr +a fails, exit 77 (to tell

diff --git a/bootstrap.conf b/bootstrap.conf
index dcfce05..36a829b 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -59,7 +59,7 @@ gnulib_modules="
        safe-read same
        save-cwd savedir savewd settime sha1 sig2str ssize_t stat-macros
        stat-time stdbool stdlib-safer stpcpy strcase strftime
-       strpbrk strtoimax strtoumax strverscmp timespec tzset
+       strpbrk strtoimax strtoumax strverscmp sys_stat timespec tzset
        unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
        uptime userspec utimecmp utimens vasprintf verify version-etc-fsf
        wcwidth winsz-ioctl winsz-termios xalloc xgetcwd xgethostname

diff --git a/lib/.cvsignore b/lib/.cvsignore
index 0d9fd48..c6409b6 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -253,6 +253,8 @@ regexec.c
 rename-dest-slash.c
 rename.c
 rmdir.c
+root-dev-ino.c
+root-dev-ino.h
 rpmatch.c
 safe-read.c
 safe-read.h

diff --git a/lib/.gitignore b/lib/.gitignore
index bc9ad9e..7387f35 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -243,6 +243,8 @@ regexec.c
 rename-dest-slash.c
 rename.c
 rmdir.c
+root-dev-ino.c
+root-dev-ino.h
 rpmatch.c
 safe-read.c
 safe-read.h

diff --git a/m4/.cvsignore b/m4/.cvsignore
index 4f3a47a..67eecb5 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -161,6 +161,7 @@ rename-dest-slash.m4
 rename.m4
 rmdir-errno.m4
 rmdir.m4
+root-dev-ino.m4
 rpmatch.m4
 safe-read.m4
 safe-write.m4

diff --git a/m4/.gitignore b/m4/.gitignore
index 09f6348..9f9dcf5 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -154,6 +154,7 @@ rename-dest-slash.m4
 rename.m4
 rmdir-errno.m4
 rmdir.m4
+root-dev-ino.m4
 rpmatch.m4
 safe-read.m4
 safe-write.m4

diff --git a/src/ls.c b/src/ls.c
index c17a501..03164b1 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -863,11 +863,11 @@ static size_t dired_pos;
 
 /* Write S to STREAM and increment DIRED_POS by S_LEN.  */
 #define DIRED_FPUTS(s, stream, s_len) \
-    do {fputs ((s), (stream)); dired_pos += s_len;} while (0)
+    do {fputs (s, stream); dired_pos += s_len;} while (0)
 
 /* Like DIRED_FPUTS, but for use when S is a literal string.  */
 #define DIRED_FPUTS_LITERAL(s, stream) \
-    do {fputs ((s), (stream)); dired_pos += sizeof((s)) - 1;} while (0)
+    do {fputs (s, stream); dired_pos += sizeof (s) - 1;} while (0)
 
 #define DIRED_INDENT()                                                 \
     do                                                                 \
@@ -892,7 +892,7 @@ static struct obstack subdired_obstack;
   do                                                                   \
     {                                                                  \
       if (dired)                                                       \
-       obstack_grow ((obs), &dired_pos, sizeof (dired_pos));           \
+       obstack_grow (obs, &dired_pos, sizeof (dired_pos));             \
     }                                                                  \
   while (0)
 

diff --git a/src/od.c b/src/od.c
index 19871d3..b358a0f 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -1175,7 +1175,7 @@ write_block (uintmax_t current_offset, size_t n_bytes,
   static bool first = true;
   static bool prev_pair_equal = false;
 
-#define EQUAL_BLOCKS(b1, b2) (memcmp ((b1), (b2), bytes_per_block) == 0)
+#define EQUAL_BLOCKS(b1, b2) (memcmp (b1, b2, bytes_per_block) == 0)
 
   if (abbreviate_duplicate_blocks
       && !first && n_bytes == bytes_per_block

diff --git a/src/system.h b/src/system.h
index edb3ede..9cc144c 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -293,7 +293,7 @@ select_plural (uintmax_t n)
   return (n <= ULONG_MAX ? n : n % PLURAL_REDUCER + PLURAL_REDUCER);
 }
 
-#define STREQ(a, b) (strcmp ((a), (b)) == 0)
+#define STREQ(a, b) (strcmp (a, b) == 0)
 
 #if !HAVE_DECL_FREE
 void free ();
@@ -506,7 +506,7 @@ enum
       const char *s_ = (S);                    \
       size_t len_ = strlen (s_) + 1;           \
       char *tmp_dest_ = alloca (len_);         \
-      DEST = memcpy (tmp_dest_, (s_), len_);   \
+      DEST = memcpy (tmp_dest_, s_, len_);     \
     }                                          \
   while (0)
 #endif