CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-25 10:16:53 +02:00
Code Issues Projects Releases Wiki Activity

* src/c99-to-c89.diff: Remove 3 bogus hunks.

Browse Source
This commit is contained in:
Jim Meyering
2006-11-26 18:49:55 +01:00
parent 5e2f415d17
commit 549bbdf7b4
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+2
View File
@@ -1,5 +1,7 @@
2006-11-26 Jim Meyering <jim@meyering.net>
* src/c99-to-c89.diff: Remove 3 bogus hunks.
* src/remove.c (fd_to_subdirp): Remove unused parameter, ds.
Update callers.
src/c99-to-c89.diff
-27
View File
@@ -31,33 +31,6 @@ index 4728bdd..7477da5 100644
if (top->unremovable)
hash_free (top->unremovable);
obstack_blank (&ds->Active_dir, -(int) sizeof (struct AD_ent));
@@ -1106,7 +1108,7 @@ remove_entry (int fd_cwd, Dirstack_state
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 +1218,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 +1306,7 @@ remove_dir (int fd_cwd, Dirstack_state *
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)
{
@@ -1463,6 +1465,7 @@ rm_1 (Dirstack_state *ds, char const *fi
return RM_ERROR;
}