# 
# 
# patch "ChangeLog"
#  from [160712b2d9190a93bd87608f7008bbb4ec1042fc]
#    to [990f26b6046d2e803a5776e61b90ba04454a8397]
# 
# patch "file_io.cc"
#  from [fc51aea25a93757f5f9f3e90ac8069c50baaff80]
#    to [2128664fe9acc07e084954a0bfa9a2f023282dd0]
# 
# patch "file_io.hh"
#  from [53777cabb1b517c78add6314e6f903087d93cdd2]
#    to [edc9dd29a54f9352dcaec319098f0c3ebd2a978e]
# 
============================================================
--- ChangeLog	160712b2d9190a93bd87608f7008bbb4ec1042fc
+++ ChangeLog	990f26b6046d2e803a5776e61b90ba04454a8397
@@ -1,3 +1,9 @@
+2007-01-14  Derek Scherger  <address@hidden>
+
+	* file_io.{cc,hh} (walk_tree_recursive): use entry instead of di
+	for consistency
+	(walk_tree): remove unused require_existing_path arg
+
 2007-01-14  Matthew Gregan  <address@hidden>
 
 	* sqlite/*: Import SQLite 3.3.10.
============================================================
--- file_io.cc	fc51aea25a93757f5f9f3e90ac8069c50baaff80
+++ file_io.cc	2128664fe9acc07e084954a0bfa9a2f023282dd0
@@ -481,8 +481,8 @@ walk_tree_recursive(fs::path const & abs
         }
 
       if (!fs::exists(entry)
-          || di->string() == "."
-          || di->string() == "..")
+          || entry.string() == "."
+          || entry.string() == "..")
         {
           // ignore
           continue;
@@ -533,8 +533,7 @@ walk_tree(file_path const & path,
 // from some (safe) sub-entry of cwd
 void
 walk_tree(file_path const & path,
-          tree_walker & walker,
-          bool require_existing_path)
+          tree_walker & walker)
 {
   if (path.empty())
     {
@@ -545,8 +544,7 @@ walk_tree(file_path const & path,
   switch (get_path_status(path))
     {
     case path::nonexistent:
-      N(!require_existing_path, F("no such file or directory: '%s'") % path);
-      walker.visit_file(path);
+      N(false, F("no such file or directory: '%s'") % path);
       break;
     case path::file:
       walker.visit_file(path);
============================================================
--- file_io.hh	53777cabb1b517c78add6314e6f903087d93cdd2
+++ file_io.hh	edc9dd29a54f9352dcaec319098f0c3ebd2a978e
@@ -102,8 +102,7 @@ void walk_tree(file_path const & path,
 // from some safe sub-dir of cwd
 // file_path of "" means cwd
 void walk_tree(file_path const & path,
-               tree_walker & walker,
-               bool require_existing_path = true);
+               tree_walker & walker);