util, refactor: Use GetPathArg to read "-settings" value

ryanofsky · ryanofsky · commit 615da97a072e · 2022-02-09T17:54:49.000-05:00
Take advantage of GetPathArg to simplify code slightly.
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -518,12 +518,12 @@ bool ArgsManager::InitSettings(std::string& error)
 
 bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp) const
 {
-    if (IsArgNegated("-settings")) {
+    fs::path settings = GetPathArg("-settings", fs::path{BITCOIN_SETTINGS_FILENAME});
+    if (settings.empty()) {
         return false;
     }
     if (filepath) {
-        std::string settings = GetArg("-settings", BITCOIN_SETTINGS_FILENAME);
-        *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), fs::PathFromString(temp ? settings + ".tmp" : settings));
+        *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), temp ? settings + ".tmp" : settings);
     }
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -518,12 +518,12 @@ bool ArgsManager::InitSettings(std::string& error)`
`518`	`518`
`519`	`519`	`bool ArgsManager::GetSettingsPath(fs::path* filepath, bool temp) const`
`520`	`520`	`{`
`521`		`- if (IsArgNegated("-settings")) {`
	`521`	`+ fs::path settings = GetPathArg("-settings", fs::path{BITCOIN_SETTINGS_FILENAME});`
	`522`	`+ if (settings.empty()) {`
`522`	`523`	`return false;`
`523`	`524`	`}`
`524`	`525`	`if (filepath) {`
`525`		`- std::string settings = GetArg("-settings", BITCOIN_SETTINGS_FILENAME);`
`526`		`- *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), fs::PathFromString(temp ? settings + ".tmp" : settings));`
	`526`	`+ *filepath = fsbridge::AbsPathJoin(GetDataDirNet(), temp ? settings + ".tmp" : settings);`
`527`	`527`	`}`
`528`	`528`	`return true;`
`529`	`529`	`}`