summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/c99-to-c89.diff6
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6805ca953..accd2cb46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-12-30 Jim Meyering <jim@meyering.net>
+ * src/c99-to-c89.diff: Adjust remove.c offsets.
+
Clean up after the change of 2006-12-28.
* src/remove.c (AD_pop_and_chdir): Change **DIRP parameter to *DIRP,
now that this function never modifies the pointer. Adjust comments
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff
index dc33dd670..68513f50b 100644
--- a/src/c99-to-c89.diff
+++ b/src/c99-to-c89.diff
@@ -31,7 +31,7 @@ index 4728bdd..7477da5 100644
if (top->unremovable)
hash_free (top->unremovable);
obstack_blank (&ds->Active_dir, -(int) sizeof (struct AD_ent));
-@@ -1463,6 +1465,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1477,6 +1479,7 @@ rm_1 (Dirstack_state *ds, char const *fi
return RM_ERROR;
}
@@ -39,7 +39,7 @@ index 4728bdd..7477da5 100644
struct stat st;
cache_stat_init (&st);
cycle_check_init (&ds->cycle_check_state);
-@@ -1485,6 +1488,7 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1499,6 +1502,7 @@ rm_1 (Dirstack_state *ds, char const *fi
AD_push_initial (ds);
AD_INIT_OTHER_MEMBERS ();
@@ -47,7 +47,7 @@ index 4728bdd..7477da5 100644
enum RM_status status = remove_entry (AT_FDCWD, ds, filename, &st, x, NULL);
if (status == RM_NONEMPTY_DIR)
{
-@@ -1501,6 +1505,8 @@ rm_1 (Dirstack_state *ds, char const *fi
+@@ -1515,6 +1519,8 @@ rm_1 (Dirstack_state *ds, char const *fi
ds_clear (ds);
return status;