LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #13982: refactor: use fs:: over boost::filesystem::

Browse source 
4b3b85c597 refactor: use fs:: over boost::filesystem:: (fanquake)

Pull request description:

  Noticed while investigating #13973.

Tree-SHA512: 20a764d2ff460883fa0fd543c0a51031a9a202b40cfda9943f9995d3108c0a8296a3982b63bbd069167f73a1855003304a83df466763032ce7339b08b3a97d4b
This commit is contained in:
MarcoFalke 2018-08-15 11:07:34 -04:00
commit dc9d506681
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/logging.cpp
View file

@ -245,7 +245,7 @@ void BCLog::Logger::ShrinkDebugFile()
size_t log_size = 0; size_t log_size = 0;
try { try {
log_size = fs::file_size(m_file_path); log_size = fs::file_size(m_file_path);
} catch (boost::filesystem::filesystem_error &) {} } catch (const fs::filesystem_error&) {}
// If debug.log file is more than 10% bigger the RECENT_DEBUG_HISTORY_SIZE // If debug.log file is more than 10% bigger the RECENT_DEBUG_HISTORY_SIZE
// trim it down by saving only the last RECENT_DEBUG_HISTORY_SIZE bytes // trim it down by saving only the last RECENT_DEBUG_HISTORY_SIZE bytes

4
src/qt/guiutil.cpp
View file

@ -368,10 +368,10 @@ void openDebugLogfile()
bool openBitcoinConf() bool openBitcoinConf()
{ {
boost::filesystem::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)); fs::path pathConfig = GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME));
/* Create the file */ /* Create the file */
boost::filesystem::ofstream configFile(pathConfig, std::ios_base::app); fs::ofstream configFile(pathConfig, std::ios_base::app);
if (!configFile.good()) if (!configFile.good())
return false; return false;

6
src/wallet/rpcdump.cpp
View file

@ -706,15 +706,15 @@ UniValue dumpwallet(const JSONRPCRequest& request)
EnsureWalletIsUnlocked(pwallet); EnsureWalletIsUnlocked(pwallet);
boost::filesystem::path filepath = request.params[0].get_str(); fs::path filepath = request.params[0].get_str();
filepath = boost::filesystem::absolute(filepath); filepath = fs::absolute(filepath);
/* Prevent arbitrary files from being overwritten. There have been reports /* Prevent arbitrary files from being overwritten. There have been reports
* that users have overwritten wallet files this way: * that users have overwritten wallet files this way:
* https://github.com/bitcoin/bitcoin/issues/9934 * https://github.com/bitcoin/bitcoin/issues/9934
* It may also avoid other security issues. * It may also avoid other security issues.
*/ */
if (boost::filesystem::exists(filepath)) { if (fs::exists(filepath)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, filepath.string() + " already exists. If you are sure this is what you want, move it out of the way first"); throw JSONRPCError(RPC_INVALID_PARAMETER, filepath.string() + " already exists. If you are sure this is what you want, move it out of the way first");
} }