Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-17 05:30:43 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ReadConfigStream: assume the stream is good

Browse Source
This commit is contained in:
Anthony Towns 2018-03-29 15:03:00 +10:00
parent 6d5815aad0
commit 087c5d2040
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util.cpp
View File

@ -737,11 +737,8 @@ fs::path GetConfigFile(const std::string& confPath)
void ArgsManager::ReadConfigStream(std::istream& stream)
{
if (!stream.good())
return; // No bitcoin.conf file is OK
{
LOCK(cs_args);
std::set<std::string> setOptions;
setOptions.insert("*");
@ -755,13 +752,16 @@ void ArgsManager::ReadConfigStream(std::istream& stream)
mapArgs[strKey] = strValue;
mapMultiArgs[strKey].push_back(strValue);
}
}
}
void ArgsManager::ReadConfigFile(const std::string& confPath)
{
fs::ifstream stream(GetConfigFile(confPath));
// ok to not have a config file
if (stream.good()) {
ReadConfigStream(stream);
}
// If datadir is changed in .conf file:
ClearDatadirCache();