# # # patch "file_io.cc" # from [b770c3c79705465b970d3cef9b066825e34069cd] # to [6683cf8d459a89597caf1eb3ce01800fe4404643] # # patch "key_store.cc" # from [b6fed5993775bff8dd4e377c04c440e1d17328d4] # to [f5eb38fefbb147b3dfab40ac8462a27dd65b6bf7] # # patch "lua.cc" # from [753de9935cdaaf02658cf8f7b38d318563f145e9] # to [bb919b7d41842bcc07c2d7c442ef415f7978a83b] # # patch "platform-wrapped.hh" # from [2ea673d7e51b36dc70b933191a90fe709aaa2115] # to [56fdcf095ffef702042d9483aaeb62bc832369a1] # # patch "platform.hh" # from [087ce9de4576d093203693159cd99412bf21c89a] # to [c1bed5059d0e2d277020e38680f33a7c070cce80] # # patch "tester.cc" # from [a92e282d849052d4b5fbc423577457068fee877a] # to [adb12440ea0b944027ea7f8eb35e06acbce2bcce] # # patch "unix/fs.cc" # from [216c1ac46fa07c136aa521c871b39806e4391669] # to [596c23f1dfd904b4e1b89808ed7ccfc69b0c8a22] # # patch "win32/fs.cc" # from [4e8d4a113a02dcbc60256241680df4e0686580c8] # to [bfa29f215a130b7ebeceaef079c359757c923c20] # # patch "work.cc" # from [6121b48399665ea41043e2f67905412d22a3fc8c] # to [dd642c4fb0d409f31421f8f0945656994cd9f619] # ============================================================ --- file_io.cc b770c3c79705465b970d3cef9b066825e34069cd +++ file_io.cc 6683cf8d459a89597caf1eb3ce01800fe4404643 @@ -123,7 +123,7 @@ directory_empty(any_path const & path) directory_empty_helper h; try { - do_read_directory(path, h, h, h); + read_directory(path, h, h, h); } catch (directory_not_empty_exception) { return false; } @@ -398,7 +398,7 @@ walk_tree_recursive(file_path const & pa fill_path_vec fill_files(path, files, false); fill_path_vec fill_dirs(path, dirs, true); - do_read_directory(path, fill_files, fill_dirs); + read_directory(path, fill_files, fill_dirs); for (vector::const_iterator i = files.begin(); i != files.end(); ++i) ============================================================ --- key_store.cc b6fed5993775bff8dd4e377c04c440e1d17328d4 +++ key_store.cc f5eb38fefbb147b3dfab40ac8462a27dd65b6bf7 @@ -227,7 +227,7 @@ key_store_state::maybe_read_key_dir() vector key_files; fill_path_vec fill_key_files(key_dir, key_files, false); dirent_ignore ignore; - do_read_directory(key_dir, fill_key_files, ignore, ignore); + read_directory(key_dir, fill_key_files, ignore, ignore); keyreader kr(*this); for (vector::const_iterator i = key_files.begin(); ============================================================ --- lua.cc 753de9935cdaaf02658cf8f7b38d318563f145e9 +++ lua.cc bb919b7d41842bcc07c2d7c442ef415f7978a83b @@ -602,7 +602,7 @@ run_directory(lua_State * st, char const { ignore_directories id; record_if_matches rim(path, pattern, arr); - do_read_directory(path, rim, id, id); + read_directory(path, rim, id, id); } sort(arr.begin(), arr.end()); ============================================================ --- platform-wrapped.hh 2ea673d7e51b36dc70b933191a90fe709aaa2115 +++ platform-wrapped.hh 56fdcf095ffef702042d9483aaeb62bc832369a1 @@ -72,21 +72,21 @@ inline void }; inline void -do_read_directory(any_path const & path, - dirent_consumer & files, - dirent_consumer & dirs, - dirent_consumer & specials) +read_directory(any_path const & path, + dirent_consumer & files, + dirent_consumer & dirs, + dirent_consumer & specials) { - do_read_directory(path.as_external(), files, dirs, specials); + read_directory(path.as_external(), files, dirs, specials); } inline void -do_read_directory(any_path const & path, - dirent_consumer & files, - dirent_consumer & dirs) +read_directory(any_path const & path, + dirent_consumer & files, + dirent_consumer & dirs) { special_file_error sfe(path); - do_read_directory(path.as_external(), files, dirs, sfe); + read_directory(path.as_external(), files, dirs, sfe); } #endif ============================================================ --- platform.hh 087ce9de4576d093203693159cd99412bf21c89a +++ platform.hh c1bed5059d0e2d277020e38680f33a7c070cce80 @@ -128,10 +128,10 @@ struct dirent_consumer virtual ~dirent_consumer() {} virtual void consume(const char *) = 0; }; -void do_read_directory(std::string const & path, - dirent_consumer & files, - dirent_consumer & dirs, - dirent_consumer & other_files); +void read_directory(std::string const & path, + dirent_consumer & files, + dirent_consumer & dirs, + dirent_consumer & other_files); void make_accessible(std::string const & name); void rename_clobberingly(std::string const & from, std::string const & to); ============================================================ --- tester.cc a92e282d849052d4b5fbc423577457068fee877a +++ tester.cc adb12440ea0b944027ea7f8eb35e06acbce2bcce @@ -152,7 +152,7 @@ void do_make_tree_accessible(string cons struct fill_vec get_subdirs(subdirs); struct file_accessible_maker access_files(p); - do_read_directory(p, access_files, get_subdirs, access_files); + read_directory(p, access_files, get_subdirs, access_files); for(vector::const_iterator i = subdirs.begin(); i != subdirs.end(); i++) do_make_tree_accessible(p + "/" + *i); @@ -199,7 +199,7 @@ void do_copy_recursive(string const & fr struct fill_vec get_subdirs(subdirs), get_specials(specials); struct file_copier copy_files(from, to); - do_read_directory(from, copy_files, get_subdirs, get_specials); + read_directory(from, copy_files, get_subdirs, get_specials); E(specials.empty(), origin::user, F("cannot copy special files in '%s'") % from); for (vector::const_iterator i = subdirs.begin(); @@ -433,7 +433,7 @@ LUAEXT(read_directory, ) string path(luaL_checkstring(LS, -1)); build_table tbl(LS); - do_read_directory(path, tbl, tbl, tbl); + read_directory(path, tbl, tbl, tbl); } catch(recoverable_failure &) { ============================================================ --- unix/fs.cc 216c1ac46fa07c136aa521c871b39806e4391669 +++ unix/fs.cc 596c23f1dfd904b4e1b89808ed7ccfc69b0c8a22 @@ -173,10 +173,10 @@ void } void -do_read_directory(string const & path, - dirent_consumer & files, - dirent_consumer & dirs, - dirent_consumer & specials) +read_directory(string const & path, + dirent_consumer & files, + dirent_consumer & dirs, + dirent_consumer & specials) { string p(path); if (p == "") @@ -369,7 +369,7 @@ do_remove_recursive(string const & path) delete_nondir del(path); record_subdirs rec(path, subdirs); - do_read_directory(path, del, rec, del); + read_directory(path, del, rec, del); for (vector::const_iterator i = subdirs.begin(); i != subdirs.end(); i++) do_remove_recursive(*i); ============================================================ --- win32/fs.cc 4e8d4a113a02dcbc60256241680df4e0686580c8 +++ win32/fs.cc bfa29f215a130b7ebeceaef079c359757c923c20 @@ -205,10 +205,10 @@ void } void -do_read_directory(std::string const & path, - dirent_consumer & files, - dirent_consumer & dirs, - dirent_consumer & /* specials */) +read_directory(std::string const & path, + dirent_consumer & files, + dirent_consumer & dirs, + dirent_consumer & /* specials */) { dirhandle dir(path); WIN32_FIND_DATA d; ============================================================ --- work.cc 6121b48399665ea41043e2f67905412d22a3fc8c +++ work.cc dd642c4fb0d409f31421f8f0945656994cd9f619 @@ -911,7 +911,7 @@ addition_builder::visit_dir(file_path co directory_has_unignored_files dhuf(work, path); try { - do_read_directory(path, dhuf, dhuf, dhuf); + read_directory(path, dhuf, dhuf, dhuf); } catch (directory_has_unignored_files_exception) { @@ -1073,7 +1073,7 @@ editable_working_tree::detach_node(file_ vector files, dirs; fill_path_vec fill_files(src_pth, files, false); fill_path_vec fill_dirs(src_pth, dirs, true); - do_read_directory(src_pth, fill_files, fill_dirs); + read_directory(src_pth, fill_files, fill_dirs); for (vector::const_iterator i = files.begin(); i != files.end(); ++i) @@ -1148,7 +1148,7 @@ editable_working_tree::attach_node(node_ vector files, dirs; fill_path_vec fill_files(src_pth, files, false); fill_path_vec fill_dirs(src_pth, dirs, true); - do_read_directory(src_pth, fill_files, fill_dirs); + read_directory(src_pth, fill_files, fill_dirs); for (vector::const_iterator i = files.begin(); i != files.end(); ++i)