Skip to content

Commit 4a26705

Browse files
committed
Merge bitcoin#21902: refactor: Remove useless extern keyword
fa4bbd3 refactor: Remove useless extern keyword (MarcoFalke) Pull request description: It is redundant, confusing and useless. https://en.cppreference.com/w/cpp/language/storage_duration#external_linkage ACKs for top commit: practicalswift: cr ACK fa4bbd3: patch looks correct Talkless: utACK fa4bbd3, built successfully on Debian Sid, looks OK. jonatack: Light code review ACK fa4bbd3 hebasto: ACK fa4bbd3, I've verified that all of the remained `extern` keywords specify either (a) a variable with external linkage, or (b) a symbol with "C" language linkage. promag: Code review ACK fa4bbd3. Tree-SHA512: 1d77d661132defa52ccb2046f7a287deb3669b68835e40ab75a0d9d08fe6efeaf3bea7c0e76c754fd18bfe45972c253a39462014080d014cc5d810498784e3e4
2 parents 4bc3b16 + fa4bbd3 commit 4a26705

6 files changed

+14
-15
lines changed

src/rpc/util.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ void RPCTypeCheckObj(const UniValue& o,
7272
* Utilities: convert hex-encoded Values
7373
* (throws error if not hex).
7474
*/
75-
extern uint256 ParseHashV(const UniValue& v, std::string strName);
76-
extern uint256 ParseHashO(const UniValue& o, std::string strKey);
77-
extern std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName);
78-
extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey);
75+
uint256 ParseHashV(const UniValue& v, std::string strName);
76+
uint256 ParseHashO(const UniValue& o, std::string strKey);
77+
std::vector<unsigned char> ParseHexV(const UniValue& v, std::string strName);
78+
std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKey);
7979

8080
/**
8181
* Validate and return a CAmount from a UniValue number or string.
@@ -84,13 +84,13 @@ extern std::vector<unsigned char> ParseHexO(const UniValue& o, std::string strKe
8484
* @param[in] decimals Number of significant digits (default: 8).
8585
* @returns a CAmount if the various checks pass.
8686
*/
87-
extern CAmount AmountFromValue(const UniValue& value, int decimals = 8);
87+
CAmount AmountFromValue(const UniValue& value, int decimals = 8);
8888

8989
using RPCArgList = std::vector<std::pair<std::string, UniValue>>;
90-
extern std::string HelpExampleCli(const std::string& methodname, const std::string& args);
91-
extern std::string HelpExampleCliNamed(const std::string& methodname, const RPCArgList& args);
92-
extern std::string HelpExampleRpc(const std::string& methodname, const std::string& args);
93-
extern std::string HelpExampleRpcNamed(const std::string& methodname, const RPCArgList& args);
90+
std::string HelpExampleCli(const std::string& methodname, const std::string& args);
91+
std::string HelpExampleCliNamed(const std::string& methodname, const RPCArgList& args);
92+
std::string HelpExampleRpc(const std::string& methodname, const std::string& args);
93+
std::string HelpExampleRpcNamed(const std::string& methodname, const RPCArgList& args);
9494

9595
CPubKey HexToPubKey(const std::string& hex_in);
9696
CPubKey AddrToPubKey(const FillableSigningProvider& keystore, const std::string& addr_in);

src/test/base58_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
using namespace std::literals;
1818

19-
extern UniValue read_json(const std::string& jsondata);
19+
UniValue read_json(const std::string& jsondata);
2020

2121
BOOST_FIXTURE_TEST_SUITE(base58_tests, BasicTestingSetup)
2222

src/test/key_io_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include <univalue.h>
1717

18-
extern UniValue read_json(const std::string& jsondata);
18+
UniValue read_json(const std::string& jsondata);
1919

2020
BOOST_FIXTURE_TEST_SUITE(key_io_tests, BasicTestingSetup)
2121

src/test/script_tests.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ static const unsigned int gFlags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC;
3939
unsigned int ParseScriptFlags(std::string strFlags);
4040
std::string FormatScriptFlags(unsigned int flags);
4141

42-
UniValue
43-
read_json(const std::string& jsondata)
42+
UniValue read_json(const std::string& jsondata)
4443
{
4544
UniValue v;
4645

src/test/sighash_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <univalue.h>
2323

24-
extern UniValue read_json(const std::string& jsondata);
24+
UniValue read_json(const std::string& jsondata);
2525

2626
// Old script.cpp SignatureHash function
2727
uint256 static SignatureHashOld(CScript scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType)

src/test/transaction_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
typedef std::vector<unsigned char> valtype;
4040

4141
// In script_tests.cpp
42-
extern UniValue read_json(const std::string& jsondata);
42+
UniValue read_json(const std::string& jsondata);
4343

4444
static std::map<std::string, unsigned int> mapFlagNames = {
4545
{std::string("P2SH"), (unsigned int)SCRIPT_VERIFY_P2SH},

0 commit comments

Comments
 (0)