aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-05-29 13:15:47 +0200
committerMarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>2023-05-29 13:12:45 +0200
commitdddde27f6fbcff7cdb31f7138efc5d8363537b03 (patch)
tree32926f8c0e0c2e9e62db57333543bb665d1646ca /src
parenta2e111b8a3d17e328eba6111f6c9138543255f3d (diff)
downloadbitcoin-dddde27f6fbcff7cdb31f7138efc5d8363537b03.tar.xz
Add [[nodiscard]] where ignoring a Result return type is an error
Diffstat (limited to 'src')
-rw-r--r--src/addrdb.cpp3
-rw-r--r--src/kernel/checks.h5
-rw-r--r--src/node/blockmanager_args.h2
-rw-r--r--src/node/chainstatemanager_args.h2
-rw-r--r--src/txdb.h2
-rw-r--r--src/wallet/wallet.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/addrdb.cpp b/src/addrdb.cpp
index fcb0f0719b..23f9600ea5 100644
--- a/src/addrdb.cpp
+++ b/src/addrdb.cpp
@@ -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."),
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)
diff --git a/src/kernel/checks.h b/src/kernel/checks.h
index 8cff4e3be4..216aad7341 100644
--- a/src/kernel/checks.h
+++ b/src/kernel/checks.h
@@ -16,8 +16,7 @@ struct Context;
/**
* 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
diff --git a/src/node/blockmanager_args.h b/src/node/blockmanager_args.h
index 84540b1922..de9fe83a5c 100644
--- a/src/node/blockmanager_args.h
+++ b/src/node/blockmanager_args.h
@@ -12,7 +12,7 @@
class ArgsManager;
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
#endif // BITCOIN_NODE_BLOCKMANAGER_ARGS_H
diff --git a/src/node/chainstatemanager_args.h b/src/node/chainstatemanager_args.h
index 82eb037368..701515953e 100644
--- a/src/node/chainstatemanager_args.h
+++ b/src/node/chainstatemanager_args.h
@@ -11,7 +11,7 @@
class ArgsManager;
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
#endif // BITCOIN_NODE_CHAINSTATEMANAGER_ARGS_H
diff --git a/src/txdb.h b/src/txdb.h
index c92733a22c..c65101618c 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -99,6 +99,6 @@ public:
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
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 7bf7264568..cbd5008366 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1074,7 +1074,7 @@ struct MigrationResult {
};
//! 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
#endif // BITCOIN_WALLET_WALLET_H