Merge #8981: Wshadow: Do not shadow argument with a local variable

ff6639b Do not shadow local variable (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2016-11-07 13:43:15 +01:00 committed by Alexander Block
parent a3325fc068
commit 293333481e

View File

@ -1002,8 +1002,8 @@ UniValue processImport(const UniValue& data) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey must be a hex string"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey must be a hex string");
} }
std::vector<unsigned char> data(ParseHex(strPubKey)); std::vector<unsigned char> vData(ParseHex(strPubKey));
CPubKey pubKey(data.begin(), data.end()); CPubKey pubKey(vData.begin(), vData.end());
if (!pubKey.IsFullyValid()) { if (!pubKey.IsFullyValid()) {
throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey is not a valid public key"); throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Pubkey is not a valid public key");