summaryrefslogtreecommitdiff
path: root/ftparchive
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-10-30 16:44:27 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-04 18:04:05 +0100
commite2ea6b63d333e6999d855a026a005726067c38ac (patch)
tree6e8854e4bb4d57eefa8e3af2177d1fdd932dab4f /ftparchive
parent294a80209a0c6ea617a14fb2ae650d4fd329eab5 (diff)
reenable gcc warnings for deprecated functions
In the meantime the strange warnings disappeared, so we can get back to showing them – and fix the one occurance which creeped in in the meantime. Git-Dch: Ignore
Diffstat (limited to 'ftparchive')
-rw-r--r--ftparchive/byhash.cc3
-rw-r--r--ftparchive/byhash.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/ftparchive/byhash.cc b/ftparchive/byhash.cc
index 04f8f1629..0a38457c0 100644
--- a/ftparchive/byhash.cc
+++ b/ftparchive/byhash.cc
@@ -48,9 +48,8 @@ void DeleteAllButMostRecent(std::string dir, int KeepFiles)
// 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)
diff --git a/ftparchive/byhash.h b/ftparchive/byhash.h
index ce05397ad..9fbb479a7 100644
--- a/ftparchive/byhash.h
+++ b/ftparchive/byhash.h
@@ -11,6 +11,8 @@
#ifndef BYHASH_H
#define BYHASH_H
+#include <string>
+
class HashString;
// Delete all files in "dir" except for the number specified in "KeepFiles"
@@ -18,6 +20,6 @@ class HashString;
void DeleteAllButMostRecent(std::string dir, int KeepFiles);
// takes a regular input filename
-std::string GenByHashFilename(std::string Input, HashString h);
+std::string GenByHashFilename(std::string Input, HashString const &h);
#endif