From bdf12bca0f99adb96d795d7bc250eb9d8ee63dde Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 22 Dec 2019 13:26:06 +0700 Subject: [PATCH] Make Process::location static. --- src/base/kernel/Base.cpp | 2 +- src/base/kernel/Entry.cpp | 4 ++-- src/base/kernel/Process.cpp | 12 +++++++++--- src/base/kernel/Process.h | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/base/kernel/Base.cpp b/src/base/kernel/Base.cpp index 03aaaca5f..42d274676 100644 --- a/src/base/kernel/Base.cpp +++ b/src/base/kernel/Base.cpp @@ -127,7 +127,7 @@ private: return config.release(); } - chain.addFile(process->location(Process::ExeLocation, "config.json")); + chain.addFile(Process::location(Process::ExeLocation, "config.json")); if (read(chain, config)) { return config.release(); diff --git a/src/base/kernel/Entry.cpp b/src/base/kernel/Entry.cpp index 1d1b7eb84..58f9438b0 100644 --- a/src/base/kernel/Entry.cpp +++ b/src/base/kernel/Entry.cpp @@ -101,9 +101,9 @@ static int showVersion() #ifdef XMRIG_FEATURE_HWLOC -static int exportTopology(const Process &process) +static int exportTopology(const Process &) { - const String path = process.location(Process::ExeLocation, "topology.xml"); + const String path = Process::location(Process::ExeLocation, "topology.xml"); hwloc_topology_t topology; hwloc_topology_init(&topology); diff --git a/src/base/kernel/Process.cpp b/src/base/kernel/Process.cpp index fae0d6794..4fc3ea3a3 100644 --- a/src/base/kernel/Process.cpp +++ b/src/base/kernel/Process.cpp @@ -31,7 +31,10 @@ #include "base/tools/Chrono.h" -static size_t location(xmrig::Process::Location location, char *buf, size_t max) +namespace xmrig { + + +static size_t getLocation(Process::Location location, char *buf, size_t max) { using namespace xmrig; @@ -48,6 +51,9 @@ static size_t location(xmrig::Process::Location location, char *buf, size_t max) } +} // namespace xmrig + + xmrig::Process::Process(int argc, char **argv) : m_arguments(argc, argv) { @@ -55,12 +61,12 @@ xmrig::Process::Process(int argc, char **argv) : } -xmrig::String xmrig::Process::location(Location location, const char *fileName) const +xmrig::String xmrig::Process::location(Location location, const char *fileName) { constexpr const size_t max = 520; char *buf = new char[max](); - size_t size = ::location(location, buf, max); + size_t size = getLocation(location, buf, max); if (size == 0) { delete [] buf; diff --git a/src/base/kernel/Process.h b/src/base/kernel/Process.h index 22959044b..12cfc904c 100644 --- a/src/base/kernel/Process.h +++ b/src/base/kernel/Process.h @@ -48,7 +48,7 @@ public: Process(int argc, char **argv); - String location(Location location, const char *fileName = nullptr) const; + static String location(Location location, const char *fileName = nullptr); inline const Arguments &arguments() const { return m_arguments; }