mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-01-18 22:35:39 +01:00
Merge #19004: refactor: Replace const char* to std::string
c57f03ce17refactor: Replace const char* to std::string (Calvin Kim) Pull request description: Rationale: Addresses #19000 Some functions should be returning std::string instead of const char*. This commit changes that. Main benefits/reasoning: 1. The functions never return nullptr, so returning a string makes code at call sites easier to review (reviewers don't have to read the source code to verify that a nullptr is never returned) 2. All call sites convert to string anyway ACKs for top commit: MarcoFalke: re-ACKc57f03ce17(no changes since previous review) 🚃 Empact: Fair enough, Code Review ACKc57f03ce17practicalswift: ACKc57f03ce17-- patch looks correct hebasto: re-ACKc57f03ce17Tree-SHA512: 9ce99bb38fe399b54844315048204cafce0f27fd8f24cae357fa7ac6f5d8094d57bbf5f5c1f5878a65f2d35e4a3f95d527eb17f49250b690c591c0df86ca84fd
This commit is contained in:
@@ -7,7 +7,9 @@
|
||||
|
||||
#include <util/strencodings.h>
|
||||
|
||||
const char* GetOpName(opcodetype opcode)
|
||||
#include <string>
|
||||
|
||||
std::string GetOpName(opcodetype opcode)
|
||||
{
|
||||
switch (opcode)
|
||||
{
|
||||
|
||||
@@ -193,7 +193,7 @@ enum opcodetype
|
||||
// Maximum value that an opcode can be
|
||||
static const unsigned int MAX_OPCODE = OP_NOP10;
|
||||
|
||||
const char* GetOpName(opcodetype opcode);
|
||||
std::string GetOpName(opcodetype opcode);
|
||||
|
||||
class scriptnum_error : public std::runtime_error
|
||||
{
|
||||
|
||||
@@ -5,7 +5,9 @@
|
||||
|
||||
#include <script/script_error.h>
|
||||
|
||||
const char* ScriptErrorString(const ScriptError serror)
|
||||
#include <string>
|
||||
|
||||
std::string ScriptErrorString(const ScriptError serror)
|
||||
{
|
||||
switch (serror)
|
||||
{
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
#ifndef BITCOIN_SCRIPT_SCRIPT_ERROR_H
|
||||
#define BITCOIN_SCRIPT_SCRIPT_ERROR_H
|
||||
|
||||
#include <string>
|
||||
|
||||
typedef enum ScriptError_t
|
||||
{
|
||||
SCRIPT_ERR_OK = 0,
|
||||
@@ -73,6 +75,6 @@ typedef enum ScriptError_t
|
||||
|
||||
#define SCRIPT_ERR_LAST SCRIPT_ERR_ERROR_COUNT
|
||||
|
||||
const char* ScriptErrorString(const ScriptError error);
|
||||
std::string ScriptErrorString(const ScriptError error);
|
||||
|
||||
#endif // BITCOIN_SCRIPT_SCRIPT_ERROR_H
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
#include <pubkey.h>
|
||||
#include <script/script.h>
|
||||
|
||||
#include <string>
|
||||
|
||||
typedef std::vector<unsigned char> valtype;
|
||||
|
||||
bool fAcceptDatacarrier = DEFAULT_ACCEPT_DATACARRIER;
|
||||
@@ -25,7 +27,7 @@ WitnessV0ScriptHash::WitnessV0ScriptHash(const CScript& in)
|
||||
CSHA256().Write(in.data(), in.size()).Finalize(begin());
|
||||
}
|
||||
|
||||
const char* GetTxnOutputType(txnouttype t)
|
||||
std::string GetTxnOutputType(txnouttype t)
|
||||
{
|
||||
switch (t)
|
||||
{
|
||||
@@ -39,7 +41,7 @@ const char* GetTxnOutputType(txnouttype t)
|
||||
case TX_WITNESS_V0_SCRIPTHASH: return "witness_v0_scripthash";
|
||||
case TX_WITNESS_UNKNOWN: return "witness_unknown";
|
||||
}
|
||||
return nullptr;
|
||||
assert(false);
|
||||
}
|
||||
|
||||
static bool MatchPayToPubkey(const CScript& script, valtype& pubkey)
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
|
||||
#include <boost/variant.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
|
||||
static const bool DEFAULT_ACCEPT_DATACARRIER = true;
|
||||
|
||||
@@ -145,7 +147,7 @@ typedef boost::variant<CNoDestination, PKHash, ScriptHash, WitnessV0ScriptHash,
|
||||
bool IsValidDestination(const CTxDestination& dest);
|
||||
|
||||
/** Get the name of a txnouttype as a C string, or nullptr if unknown. */
|
||||
const char* GetTxnOutputType(txnouttype t);
|
||||
std::string GetTxnOutputType(txnouttype t);
|
||||
|
||||
/**
|
||||
* Parse a scriptPubKey and identify script type for standard scripts. If
|
||||
|
||||
Reference in New Issue
Block a user