phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-02 14:37:42 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add [[nodiscard]] where ignoring a Result return type is an error

Browse source
This commit is contained in:
MarcoFalke 2023-05-29 13:15:47 +02:00
parent a2e111b8a3
commit dddde27f6f
No known key found for this signature in database
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/addrdb.cpp
View file

@ -210,7 +210,8 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro
return util::Error{strprintf(_("Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start."), return util::Error{strprintf(_("Invalid or corrupt peers.dat (%s). If you believe this is a bug, please report it to %s. As a workaround, you can move the file (%s) out of the way (rename, move, or delete) to have a new one created on the next start."),
e.what(), PACKAGE_BUGREPORT, fs::quoted(fs::PathToString(path_addr)))}; e.what(), PACKAGE_BUGREPORT, fs::quoted(fs::PathToString(path_addr)))};
} }
return std::move(addrman); // std::move should be unneccessary but is temporarily needed to work around clang bug (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092) return {std::move(addrman)}; // std::move should be unneccessary but is temporarily needed to work around clang bug
// (https://github.com/bitcoin/bitcoin/pull/25977#issuecomment-1561270092)
} }
void DumpAnchors(const fs::path& anchors_db_path, const std::vector<CAddress>& anchors) void DumpAnchors(const fs::path& anchors_db_path, const std::vector<CAddress>& anchors)

5
src/kernel/checks.h
View file

@ -16,8 +16,7 @@ struct Context;
/** /**
* Ensure a usable environment with all necessary library support. * Ensure a usable environment with all necessary library support.
*/ */
util::Result<void> SanityChecks(const Context&); [[nodiscard]] util::Result<void> SanityChecks(const Context&);
} // namespace kernel
}
#endif // BITCOIN_KERNEL_CHECKS_H #endif // BITCOIN_KERNEL_CHECKS_H

2
src/node/blockmanager_args.h
View file

@ -12,7 +12,7 @@
class ArgsManager; class ArgsManager;
namespace node { namespace node {
util::Result<void> ApplyArgsManOptions(const ArgsManager& args, BlockManager::Options& opts); [[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, BlockManager::Options& opts);
} // namespace node } // namespace node
#endif // BITCOIN_NODE_BLOCKMANAGER_ARGS_H #endif // BITCOIN_NODE_BLOCKMANAGER_ARGS_H

2
src/node/chainstatemanager_args.h
View file

@ -11,7 +11,7 @@
class ArgsManager; class ArgsManager;
namespace node { namespace node {
util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts); [[nodiscard]] util::Result<void> ApplyArgsManOptions(const ArgsManager& args, ChainstateManager::Options& opts);
} // namespace node } // namespace node
#endif // BITCOIN_NODE_CHAINSTATEMANAGER_ARGS_H #endif // BITCOIN_NODE_CHAINSTATEMANAGER_ARGS_H

2
src/txdb.h
View file

@ -99,6 +99,6 @@ public:
EXCLUSIVE_LOCKS_REQUIRED(::cs_main); EXCLUSIVE_LOCKS_REQUIRED(::cs_main);
}; };
util::Result<void> CheckLegacyTxindex(CBlockTreeDB& block_tree_db); [[nodiscard]] util::Result<void> CheckLegacyTxindex(CBlockTreeDB& block_tree_db);
#endif // BITCOIN_TXDB_H #endif // BITCOIN_TXDB_H

2
src/wallet/wallet.h
View file

@ -1074,7 +1074,7 @@ struct MigrationResult {
}; };
//! Do all steps to migrate a legacy wallet to a descriptor wallet //! Do all steps to migrate a legacy wallet to a descriptor wallet
util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context); [[nodiscard]] util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context);
} // namespace wallet } // namespace wallet
#endif // BITCOIN_WALLET_WALLET_H #endif // BITCOIN_WALLET_WALLET_H