From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 25 Nov 2006 09:55:32 +0000 (+0100)
Subject: * src/remove.c (rm_1): Remove decl of local, fd_cwd.
X-Git-Tag: COREUTILS-6_7~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02e24f25939824e5292549c7d90e018e6efad01f;p=thirdparty%2Fcoreutils.git

* src/remove.c (rm_1): Remove decl of local, fd_cwd.

Replace each of two uses with literal AT_FDCWD.

Signed-off-by: Paul Eggert <eggert@cs.ucla.edu>
---

diff --git a/ChangeLog b/ChangeLog
index 74079b6e00..cca0cf3a8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* src/remove.c (rm_1): Remove decl of local, fd_cwd.
+	Replace each of two uses with literal AT_FDCWD.
+
 2006-11-25  Jim Meyering  <jim@meyering.net>
 
 	* Makefile.am (EXTRA_DIST): Remove announce-gen from here, too.
diff --git a/src/remove.c b/src/remove.c
index add85dd7ba..1b4c4c4f8f 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -1490,8 +1490,7 @@ rm_1 (Dirstack_state *ds, char const *filename,
   AD_push_initial (ds);
   AD_INIT_OTHER_MEMBERS ();
 
-  int fd_cwd = AT_FDCWD;
-  enum RM_status status = remove_entry (fd_cwd, ds, filename, &st, x, NULL);
+  enum RM_status status = remove_entry (AT_FDCWD, ds, filename, &st, x, NULL);
   if (status == RM_NONEMPTY_DIR)
     {
       /* In the event that remove_dir->remove_cwd_entries detects
@@ -1500,7 +1499,7 @@ rm_1 (Dirstack_state *ds, char const *filename,
       if (setjmp (ds->current_arg_jumpbuf))
 	status = RM_ERROR;
       else
-	status = remove_dir (fd_cwd, ds, filename, &st, x, cwd_errno);
+	status = remove_dir (AT_FDCWD, ds, filename, &st, x, cwd_errno);
 
       AD_stack_clear (ds);
     }