From: Jim Meyering <meyering@redhat.com>
Date: Sun, 18 Nov 2007 20:19:33 +0000 (+0100)
Subject: Remove unused parameter in remove.c.
X-Git-Tag: v6.9.90~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98ed526f44839dec30d0f7dc352d919ee58f47ad;p=platform%2Fupstream%2Fcoreutils.git

Remove unused parameter in remove.c.

* src/remove.c (fd_to_subdirp): Remove unused parameter.
(remove_cwd_entries, remove_dir): Update callers.
---

diff --git a/ChangeLog b/ChangeLog
index d24863a..77682b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-18  Jim Meyering  <meyering@redhat.com>
 
+	Remove unused parameter in remove.c.
+	* src/remove.c (fd_to_subdirp): Remove unused parameter.
+	(remove_cwd_entries, remove_dir): Update callers.
+
 	bootstrap: work also with 4-argument variant of AC_INIT (from gnulib)
 	2007-11-18  Sergey Poznyakoff  <gray@gnu.org.ua>
 	* bootstrap (gnulib_extra_files): Adjust sed command.
diff --git a/src/remove.c b/src/remove.c
index 1c6166d..11e2ccb 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -1197,7 +1197,7 @@ remove_entry (int fd_cwd, Dirstack_state const *ds, char const *filename,
    isn't restored.  */
 static DIR *
 fd_to_subdirp (int fd_cwd, char const *f,
-	       struct rm_options const *x, int prev_errno,
+	       int prev_errno,
 	       struct stat *subdir_sb,
 	       int *cwd_errno ATTRIBUTE_UNUSED)
 {
@@ -1309,7 +1309,7 @@ remove_cwd_entries (DIR **dirp,
 	case RM_NONEMPTY_DIR:
 	  {
 	    DIR *subdir_dirp = fd_to_subdirp (dirfd (*dirp), f,
-					      x, errno, subdir_sb, NULL);
+					      errno, subdir_sb, NULL);
 	    if (subdir_dirp == NULL)
 	      {
 		status = RM_ERROR;
@@ -1397,7 +1397,7 @@ remove_dir (int fd_cwd, Dirstack_state *ds, char const *dir,
      fd_to_subdirp's fstat, along with the `fstat' and the dev/ino
      comparison in AD_push ensure that we detect it and fail.  */
 
-  DIR *dirp = fd_to_subdirp (fd_cwd, dir, x, 0, dir_st, cwd_errno);
+  DIR *dirp = fd_to_subdirp (fd_cwd, dir, 0, dir_st, cwd_errno);
 
   if (dirp == NULL)
     {