partial Merge bitcoin#29040: refactor: Remove pre-C++20 code, fs::path cleanup

knst · knst · commit a219a8be154b · 2024-10-12T20:02:06.000+07:00
It fixes return reference to const variable under mutex which is not a good idea
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -420,7 +420,7 @@ std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) co
     return std::nullopt;
 }
 
-const fs::path& ArgsManager::GetBlocksDirPath() const
+const fs::path ArgsManager::GetBlocksDirPath() const
 {
     LOCK(cs_args);
     fs::path& path = m_cached_blocks_path;
@@ -445,7 +445,7 @@ const fs::path& ArgsManager::GetBlocksDirPath() const
     return path;
 }
 
-const fs::path& ArgsManager::GetDataDir(bool net_specific) const
+const fs::path ArgsManager::GetDataDir(bool net_specific) const
 {
     LOCK(cs_args);
     fs::path& path = net_specific ? m_cached_network_datadir_path : m_cached_datadir_path;
diff --git a/src/util/system.h b/src/util/system.h
@@ -288,23 +288,23 @@ class ArgsManager
      *
      * @return Blocks path which is network specific
      */
-    const fs::path& GetBlocksDirPath() const;
+    const fs::path GetBlocksDirPath() const;
 
     /**
      * Get data directory path
      *
      * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
      * @post Returned directory path is created unless it is empty
      */
-    const fs::path& GetDataDirBase() const { return GetDataDir(false); }
+    const fs::path GetDataDirBase() const { return GetDataDir(false); }
 
     /**
      * Get data directory path with appended network identifier
      *
      * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
      * @post Returned directory path is created unless it is empty
      */
-    const fs::path& GetDataDirNet() const { return GetDataDir(true); }
+    const fs::path GetDataDirNet() const { return GetDataDir(true); }
 
     fs::path GetBackupsDirPath();
 
@@ -483,7 +483,7 @@ class ArgsManager
      * @return Absolute path on success, otherwise an empty path when a non-directory path would be returned
      * @post Returned directory path is created unless it is empty
      */
-    const fs::path& GetDataDir(bool net_specific) const;
+    const fs::path GetDataDir(bool net_specific) const;
 
     // Helper function for LogArgs().
     void logArgsPrefix(

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ std::optional<unsigned int> ArgsManager::GetArgFlags(const std::string& name) co`
`420`	`420`	`return std::nullopt;`
`421`	`421`	`}`
`422`	`422`
`423`		`-const fs::path& ArgsManager::GetBlocksDirPath() const`
	`423`	`+const fs::path ArgsManager::GetBlocksDirPath() const`
`424`	`424`	`{`
`425`	`425`	`LOCK(cs_args);`
`426`	`426`	`fs::path& path = m_cached_blocks_path;`
`@@ -445,7 +445,7 @@ const fs::path& ArgsManager::GetBlocksDirPath() const`
`445`	`445`	`return path;`
`446`	`446`	`}`
`447`	`447`
`448`		`-const fs::path& ArgsManager::GetDataDir(bool net_specific) const`
	`448`	`+const fs::path ArgsManager::GetDataDir(bool net_specific) const`
`449`	`449`	`{`
`450`	`450`	`LOCK(cs_args);`
`451`	`451`	`fs::path& path = net_specific ? m_cached_network_datadir_path : m_cached_datadir_path;`