From: Jim Meyering <jim@meyering.net>
Date: Sun, 26 Nov 2006 17:47:54 +0000 (+0100)
Subject: * src/remove.c (fd_to_subdirp): Remove unused parameter, ds.
X-Git-Tag: COREUTILS-6_7~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e2f415d172e8074e6e3d051c310fd460feb6205;p=platform%2Fupstream%2Fcoreutils.git

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

diff --git a/ChangeLog b/ChangeLog
index 67520d1..2e0e5f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-11-26  Jim Meyering  <jim@meyering.net>
 
+	* src/remove.c (fd_to_subdirp): Remove unused parameter, ds.
+	Update callers.
+
 	* src/c99-to-c89.diff: Adjust for changes in rm.c and in remove.c.
 
 	* src/rm.c (main): Remove unnecessary (assuming C99) braces.
diff --git a/src/remove.c b/src/remove.c
index 4728bdd..3dc6929 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -1106,7 +1106,7 @@ remove_entry (int fd_cwd, Dirstack_state const *ds, char const *filename,
 static DIR *
 fd_to_subdirp (int fd_cwd, char const *f,
 	       struct rm_options const *x, int prev_errno,
-	       struct stat *subdir_sb, Dirstack_state *ds,
+	       struct stat *subdir_sb,
 	       int *cwd_errno ATTRIBUTE_UNUSED)
 {
   int open_flags = O_RDONLY | O_NOCTTY | O_NOFOLLOW | O_NONBLOCK;
@@ -1216,7 +1216,7 @@ remove_cwd_entries (DIR **dirp,
 	case RM_NONEMPTY_DIR:
 	  {
 	    DIR *subdir_dirp = fd_to_subdirp (dirfd (*dirp), f,
-					      x, errno, subdir_sb, ds, NULL);
+					      x, errno, subdir_sb, NULL);
 	    if (subdir_dirp == NULL)
 	      {
 		status = RM_ERROR;
@@ -1304,7 +1304,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, ds, cwd_errno);
+  DIR *dirp = fd_to_subdirp (fd_cwd, dir, x, 0, dir_st, cwd_errno);
 
   if (dirp == NULL)
     {