* src/system.h (DOT_OR_DOTDOT): Remove macro. Rewrite as a...

(dot_or_dotdot): ...new static inline function.
* src/remove.c (rm_1): Reflect this renaming.
* src/ls.c (basename_is_dot_or_dotdot): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 2f461cf9536339ef95ba0808b79fd3ed7877ae4d..1b373b2d5bb713e4819f700b226641016c3b9847 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-08-27  Jim Meyering  <jim@meyering.net>
 
+       * src/system.h (DOT_OR_DOTDOT): Remove macro.  Rewrite as a...
+       (dot_or_dotdot): ...new static inline function.
+       * src/remove.c (rm_1): Reflect this renaming.
+       * src/ls.c (basename_is_dot_or_dotdot): Likewise.
+
        * src/copy.c (copy_internal): Add comments.
 
 2006-08-26  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/src/ls.c b/src/ls.c
index 8b4fb2e433b8f7d65bc7af003cefde2a73ceb37e..4d71f3286a5fbaf8be90106ac6c7de34cf5dd73c 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -2814,7 +2814,7 @@ static bool
 basename_is_dot_or_dotdot (const char *name)
 {
   char const *base = last_component (name);
-  return DOT_OR_DOTDOT (base);
+  return dot_or_dotdot (base);
 }
 
 /* Remove any entries from FILES that are for directories,

diff --git a/src/remove.c b/src/remove.c
index 5de52df23d707dcfd3592be40d6ec85ce4d5ac93..368375864455f6450823f824276af26520102712 100644 (file)
--- a/src/remove.c
+++ b/src/remove.c
@@ -1372,7 +1372,7 @@ rm_1 (Dirstack_state *ds, char const *filename,
       struct rm_options const *x, int *cwd_errno)
 {
   char const *base = last_component (filename);
-  if (DOT_OR_DOTDOT (base))
+  if (dot_or_dotdot (base))
     {
       error (0, 0, _("cannot remove `.' or `..'"));
       return RM_ERROR;

diff --git a/src/system.h b/src/system.h
index 29bd1be554e9b7041a9bb93a4bd3e6aca18edba6..226c863c937421f47a67219abaaa2455fdca00bf 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -447,9 +447,14 @@ uid_t getuid ();
 #include "unlocked-io.h"
 #include "same-inode.h"
 
-#define DOT_OR_DOTDOT(Basename) \
-  (Basename[0] == '.' && (Basename[1] == '\0' \
-                         || (Basename[1] == '.' && Basename[2] == '\0')))
+static inline bool
+dot_or_dotdot (char const *file_name)
+{
+  return (file_name[0] == '.'
+         && (file_name[1] == '\0'
+             || (file_name[1] == '.'
+                 && file_name[2] == '\0')));
+}
 
 /* A wrapper for readdir so that callers don't see entries for `.' or `..'.  */
 static inline struct dirent const *
@@ -458,7 +463,7 @@ readdir_ignoring_dot_and_dotdot (DIR *dirp)
   while (1)
     {
       struct dirent const *dp = readdir (dirp);
-      if (dp == NULL || ! DOT_OR_DOTDOT (dp->d_name))
+      if (dp == NULL || ! dot_or_dotdot (dp->d_name))
        return dp;
     }
 }