diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-12 22:22:50 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-12 22:22:50 +0200 |
commit | 6152d7e8ddd0f7e5009674c25e3f8fcdaade784b (patch) | |
tree | 8471614028f3eab91a34257f76777593bbc283bc /filedistribution | |
parent | e7c01afea43e4ce2592f99a9cccb62cfb355704c (diff) |
Add -Wformat-security
Diffstat (limited to 'filedistribution')
3 files changed, 7 insertions, 8 deletions
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp index 9668e09bcc8..6455d6e67ae 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp +++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloader.cpp @@ -285,7 +285,7 @@ FileDownloader::pathToCompletedFile(const std::string& fileReference) const { boost::optional<FileDownloader::ResumeDataBuffer> FileDownloader::getResumeData(const std::string& fileReference) { - LOG(debug, ("Reading resume data for " + fileReference).c_str()); + LOG(debug, "%s", ("Reading resume data for " + fileReference).c_str()); try { fs::path path = (_dbPath / fileReference).string() + resumeDataSuffix; if (fs::exists(path)) { @@ -294,7 +294,7 @@ FileDownloader::getResumeData(const std::string& fileReference) { std::istream_iterator<char> iterator(file), end; std::copy(iterator, end, std::back_inserter(result)); - LOG(debug, ("Successfully retrieved resume data for " + fileReference).c_str()); + LOG(debug, "%s", ("Successfully retrieved resume data for " + fileReference).c_str()); if (result.size() < 50) { LOG(info, "Very small resume file %zu bytes.", result.size()); } @@ -303,7 +303,7 @@ FileDownloader::getResumeData(const std::string& fileReference) { } } catch(...) { //resume data is only an optimization - LOG(info, ("Error while reading resume data for " + fileReference).c_str()); + LOG(info, "%s", ("Error while reading resume data for " + fileReference).c_str()); } return boost::optional<ResumeDataBuffer>(); } diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp index 669cc550003..1763b798f03 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp +++ b/filedistribution/src/vespa/filedistribution/distributor/filedownloadermanager.cpp @@ -14,10 +14,10 @@ using filedistribution::Path; namespace { void logStartDownload(const std::set<std::string> & filesToDownload) { std::ostringstream msg; - msg <<"StartDownloads:" <<std::endl; + msg << "StartDownloads:" << std::endl; std::copy(filesToDownload.begin(), filesToDownload.end(), std::ostream_iterator<std::string>(msg, "\n")); - LOG(debug, msg.str().c_str()); + LOG(debug, "%s", msg.str().c_str()); } } //anonymous namespace diff --git a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp index 9ce31e0dd3a..b01acb10f87 100644 --- a/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp +++ b/filedistribution/src/vespa/filedistribution/model/filedistributionmodelimpl.cpp @@ -111,7 +111,7 @@ FileDistributionModelImpl::getPeers(const std::string& fileReference, size_t max LOG(debug, "Found %zu peers for path '%s'", result.size(), path.string().c_str()); return result; } catch(ZKNodeDoesNotExistsException&) { - LOG(debug, ("No peer entries available for " + fileReference).c_str()); + LOG(debug, "%s", ("No peer entries available for " + fileReference).c_str()); return PeerEntries(); } } @@ -119,8 +119,7 @@ FileDistributionModelImpl::getPeers(const std::string& fileReference, size_t max fs::path FileDistributionModelImpl::getPeerEntryPath(const std::string& fileReference) { std::ostringstream entry; - entry <<_hostName - <<ZKFileDBModel::_peerEntrySeparator <<_port; + entry <<_hostName << ZKFileDBModel::_peerEntrySeparator <<_port; return _fileDBModel.getPeersPath(fileReference) / entry.str(); } |