diff options
| author | Calvin Kim <calvin@kcalvinalvin.info> | 2020-05-18 17:14:10 +0900 |
|---|---|---|
| committer | Calvin Kim <calvin@kcalvinalvin.info> | 2020-05-22 01:40:31 +0900 |
| commit | c57f03ce1741b38af448bec7b22ab9f8ac21f067 (patch) | |
| tree | fc53ee2ad75995ae01f998dca70574754ee91f7b /src/script/standard.cpp | |
| parent | dc5333d31f280e09bb1e8cdacfbe842f4ab9e69b (diff) | |
| download | bitcoin-c57f03ce1741b38af448bec7b22ab9f8ac21f067.tar.xz | |
refactor: Replace const char* to std::string
Some functions should be returning std::string instead of const char*.
This commit changes that.
Diffstat (limited to 'src/script/standard.cpp')
| -rw-r--r-- | src/script/standard.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 7d89a336fb..c90c2c24a0 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -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) |