diff options
| author | Jim Meyering <jim@meyering.net> | 2006-11-26 18:47:54 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-11-26 18:47:54 +0100 |
| commit | 5e2f415d172e8074e6e3d051c310fd460feb6205 (patch) | |
| tree | 88391fe4b72e5b4ea2c1dc1cad8b7817335dbae5 /src/remove.c | |
| parent | d6a37dfa3b0e93a408c5b0d83a4b8e5f9746a607 (diff) | |
| download | coreutils-5e2f415d172e8074e6e3d051c310fd460feb6205.tar.xz | |
* src/remove.c (fd_to_subdirp): Remove unused parameter, ds.
Update callers.
Diffstat (limited to 'src/remove.c')
| -rw-r--r-- | src/remove.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/remove.c b/src/remove.c index 4728bdd3a..3dc692947 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) { |