aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-04-11 12:41:55 +0200
committerRiccardo Spagni <ric@spagni.net>2019-04-11 12:41:55 +0200
commit19e37c05d6ddcd70bc60286654a6a42731bbba4e (patch)
tree2d6bbc2475f8d2815457f1f53f8258366c94a415 /src
parentMerge pull request #5366 (diff)
parentutil: name replace_file arguments better (diff)
downloadmonero-19e37c05d6ddcd70bc60286654a6a42731bbba4e.tar.xz
Merge pull request #5367
07b716bf util: name replace_file arguments better (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/common/util.cpp8
-rw-r--r--src/common/util.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/common/util.cpp b/src/common/util.cpp
index 728efc294..3388974ce 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -641,16 +641,16 @@ std::string get_nix_version_display_string()
return res;
}
- std::error_code replace_file(const std::string& replacement_name, const std::string& replaced_name)
+ std::error_code replace_file(const std::string& old_name, const std::string& new_name)
{
int code;
#if defined(WIN32)
// Maximizing chances for success
std::wstring wide_replacement_name;
- try { wide_replacement_name = string_tools::utf8_to_utf16(replacement_name); }
+ try { wide_replacement_name = string_tools::utf8_to_utf16(old_name); }
catch (...) { return std::error_code(GetLastError(), std::system_category()); }
std::wstring wide_replaced_name;
- try { wide_replaced_name = string_tools::utf8_to_utf16(replaced_name); }
+ try { wide_replaced_name = string_tools::utf8_to_utf16(new_name); }
catch (...) { return std::error_code(GetLastError(), std::system_category()); }
DWORD attributes = ::GetFileAttributesW(wide_replaced_name.c_str());
@@ -662,7 +662,7 @@ std::string get_nix_version_display_string()
bool ok = 0 != ::MoveFileExW(wide_replacement_name.c_str(), wide_replaced_name.c_str(), MOVEFILE_REPLACE_EXISTING);
code = ok ? 0 : static_cast<int>(::GetLastError());
#else
- bool ok = 0 == std::rename(replacement_name.c_str(), replaced_name.c_str());
+ bool ok = 0 == std::rename(old_name.c_str(), new_name.c_str());
code = ok ? 0 : errno;
#endif
return std::error_code(code, std::system_category());
diff --git a/src/common/util.h b/src/common/util.h
index 77a5a9af6..f6d5c9b1f 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -145,7 +145,7 @@ namespace tools
bool create_directories_if_necessary(const std::string& path);
/*! \brief std::rename wrapper for nix and something strange for windows.
*/
- std::error_code replace_file(const std::string& replacement_name, const std::string& replaced_name);
+ std::error_code replace_file(const std::string& old_name, const std::string& new_name);
bool sanitize_locale();