From 997147fc9703bbb182f643fe159a7513f9cb93e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 1 Apr 2019 17:31:45 -0400
Subject: [PATCH] fileutils: cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I3229003d89a4c4855fb9429dd4fe9bff02ef7985
Reviewed-by: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
---
src/call_factory.cpp | 4 ++--
src/fileutils.cpp | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/call_factory.cpp b/src/call_factory.cpp
index 2f75ebe621..3ad0f4f724 100644
--- a/src/call_factory.cpp
+++ b/src/call_factory.cpp
@@ -115,11 +115,11 @@ CallFactory::getAllCalls<Call>() const
for (const auto& itemmap : callMaps_) {
const auto& map = itemmap.second;
- for (const auto item : map)
+ v.reserve(v.size() + map.size());
+ for (const auto& item : map)
v.push_back(item.second);
}
- v.shrink_to_fit();
return v;
}
diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index 70915a4c22..ffd2eceefc 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -412,10 +412,10 @@ readDirectory(const std::string& dir)
#else
while ((entry = readdir(dp)) != nullptr) {
#endif
- const std::string fname {entry->d_name};
+ std::string fname {entry->d_name};
if (fname == "." || fname == "..")
continue;
- files.push_back(std::move(fname));
+ files.emplace_back(std::move(fname));
}
closedir(dp);
return files;
@@ -691,7 +691,7 @@ recursive_mkdir(const std::string& path, mode_t mode)
if (mkdir(path.data()) != 0) {
#endif
if (errno == ENOENT) {
- recursive_mkdir(path.substr(0, path.find_last_of(DIR_SEPARATOR_STR)), mode);
+ recursive_mkdir(path.substr(0, path.find_last_of(DIR_SEPARATOR_CH)), mode);
#ifndef _WIN32
if (mkdir(path.data(), mode) != 0) {
#else
--
GitLab