rename Checksum-FileSize to Filesize in hashsum mismatch

[apt.git] / ftparchive / byhash.cc

diff --git a/ftparchive/byhash.cc b/ftparchive/byhash.cc
index 04f8f1629f7117475b390cdda737fb04be492735..354d089c31c339ade54785a820676f7be715e9c8 100644 (file)
--- a/ftparchive/byhash.cc
+++ b/ftparchive/byhash.cc
@@ -41,16 +41,14 @@ void DeleteAllButMostRecent(std::string dir, int KeepFiles)
    auto files = GetListOfFilesInDir(dir, false);
    std::sort(files.begin(), files.end(), Cmp());
 
-   for (auto I=files.begin(); I<files.end()-KeepFiles; I++) {
-      unlink((*I).c_str());
-   }
+   for (auto I=files.begin(); I<files.end()-KeepFiles; ++I)
+      RemoveFile("DeleteAllButMostRecent", *I);
 }
 
 // Takes a input filename (e.g. binary-i386/Packages) and a hashstring
 // of the Input data and transforms it into a suitable by-hash filename
-std::string GenByHashFilename(std::string Input, HashString h)
+std::string GenByHashFilename(std::string ByHashOutputFile, HashString const &h)
 {
-   std::string ByHashOutputFile = Input;
    std::string const ByHash = "/by-hash/" + h.HashType() + "/" + h.HashValue();
    size_t trailing_slash = ByHashOutputFile.find_last_of("/");
    if (trailing_slash == std::string::npos)