BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #8163: Do not shadow global RPC table variable (tableRPC) 

de1bbe3 Do not shadow global RPC table variable (tableRPC) (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2016-08-31 16:04:22 +02:00
parent f25684300a de1bbe3b78
commit 0c8875d23b
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc/blockchain.cpp
View File

@ -1205,8 +1205,8 @@ static const CRPCCommand commands[] =
{ "hidden", "reconsiderblock", &reconsiderblock, true }, { "hidden", "reconsiderblock", &reconsiderblock, true },
}; };
void RegisterBlockchainRPCCommands(CRPCTable &tableRPC) void RegisterBlockchainRPCCommands(CRPCTable &t)
{ {
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); t.appendCommand(commands[vcidx].name, &commands[vcidx]);
} }

4
src/rpc/mining.cpp
View File

@ -919,8 +919,8 @@ static const CRPCCommand commands[] =
{ "util", "estimatesmartpriority", &estimatesmartpriority, true }, { "util", "estimatesmartpriority", &estimatesmartpriority, true },
}; };
void RegisterMiningRPCCommands(CRPCTable &tableRPC) void RegisterMiningRPCCommands(CRPCTable &t)
{ {
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); t.appendCommand(commands[vcidx].name, &commands[vcidx]);
} }

4
src/rpc/misc.cpp
View File

@ -498,8 +498,8 @@ static const CRPCCommand commands[] =
{ "hidden", "setmocktime", &setmocktime, true }, { "hidden", "setmocktime", &setmocktime, true },
}; };
void RegisterMiscRPCCommands(CRPCTable &tableRPC) void RegisterMiscRPCCommands(CRPCTable &t)
{ {
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); t.appendCommand(commands[vcidx].name, &commands[vcidx]);
} }

4
src/rpc/net.cpp
View File

@ -590,8 +590,8 @@ static const CRPCCommand commands[] =
{ "network", "clearbanned", &clearbanned, true }, { "network", "clearbanned", &clearbanned, true },
}; };
void RegisterNetRPCCommands(CRPCTable &tableRPC) void RegisterNetRPCCommands(CRPCTable &t)
{ {
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); t.appendCommand(commands[vcidx].name, &commands[vcidx]);
} }

4
src/rpc/rawtransaction.cpp
View File

@ -910,8 +910,8 @@ static const CRPCCommand commands[] =
{ "blockchain", "verifytxoutproof", &verifytxoutproof, true }, { "blockchain", "verifytxoutproof", &verifytxoutproof, true },
}; };
void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC) void RegisterRawTransactionRPCCommands(CRPCTable &t)
{ {
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); t.appendCommand(commands[vcidx].name, &commands[vcidx]);
} }

12
src/rpc/register.h
View File

@ -20,13 +20,13 @@ void RegisterMiningRPCCommands(CRPCTable &tableRPC);
/** Register raw transaction RPC commands */ /** Register raw transaction RPC commands */
void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC); void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
static inline void RegisterAllCoreRPCCommands(CRPCTable &tableRPC) static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
{ {
RegisterBlockchainRPCCommands(tableRPC); RegisterBlockchainRPCCommands(t);
RegisterNetRPCCommands(tableRPC); RegisterNetRPCCommands(t);
RegisterMiscRPCCommands(tableRPC); RegisterMiscRPCCommands(t);
RegisterMiningRPCCommands(tableRPC); RegisterMiningRPCCommands(t);
RegisterRawTransactionRPCCommands(tableRPC); RegisterRawTransactionRPCCommands(t);
} }
#endif #endif

4
src/wallet/rpcwallet.cpp
View File

@ -2617,8 +2617,8 @@ static const CRPCCommand commands[] =
{ "wallet", "removeprunedfunds", &removeprunedfunds, true }, { "wallet", "removeprunedfunds", &removeprunedfunds, true },
}; };
void RegisterWalletRPCCommands(CRPCTable &tableRPC) void RegisterWalletRPCCommands(CRPCTable &t)
{ {
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); t.appendCommand(commands[vcidx].name, &commands[vcidx]);
} }

2
src/wallet/rpcwallet.h
View File

@ -7,6 +7,6 @@
class CRPCTable; class CRPCTable;
void RegisterWalletRPCCommands(CRPCTable &tableRPC); void RegisterWalletRPCCommands(CRPCTable &t);
#endif //BITCOIN_WALLET_RPCWALLET_H #endif //BITCOIN_WALLET_RPCWALLET_H