Browse Source

Do not shadow global RPC table variable (tableRPC)

0.14
Pavel Janík 9 years ago
parent
commit
de1bbe3b78
  1. 4
      src/rpc/blockchain.cpp
  2. 4
      src/rpc/mining.cpp
  3. 4
      src/rpc/misc.cpp
  4. 4
      src/rpc/net.cpp
  5. 4
      src/rpc/rawtransaction.cpp
  6. 12
      src/rpc/register.h
  7. 4
      src/wallet/rpcwallet.cpp
  8. 2
      src/wallet/rpcwallet.h

4
src/rpc/blockchain.cpp

@ -1205,8 +1205,8 @@ static const CRPCCommand commands[] = @@ -1205,8 +1205,8 @@ static const CRPCCommand commands[] =
{ "hidden", "reconsiderblock", &reconsiderblock, true },
};
void RegisterBlockchainRPCCommands(CRPCTable &tableRPC)
void RegisterBlockchainRPCCommands(CRPCTable &t)
{
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

@ -918,8 +918,8 @@ static const CRPCCommand commands[] = @@ -918,8 +918,8 @@ static const CRPCCommand commands[] =
{ "util", "estimatesmartpriority", &estimatesmartpriority, true },
};
void RegisterMiningRPCCommands(CRPCTable &tableRPC)
void RegisterMiningRPCCommands(CRPCTable &t)
{
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

@ -498,8 +498,8 @@ static const CRPCCommand commands[] = @@ -498,8 +498,8 @@ static const CRPCCommand commands[] =
{ "hidden", "setmocktime", &setmocktime, true },
};
void RegisterMiscRPCCommands(CRPCTable &tableRPC)
void RegisterMiscRPCCommands(CRPCTable &t)
{
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

@ -590,8 +590,8 @@ static const CRPCCommand commands[] = @@ -590,8 +590,8 @@ static const CRPCCommand commands[] =
{ "network", "clearbanned", &clearbanned, true },
};
void RegisterNetRPCCommands(CRPCTable &tableRPC)
void RegisterNetRPCCommands(CRPCTable &t)
{
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

@ -910,8 +910,8 @@ static const CRPCCommand commands[] = @@ -910,8 +910,8 @@ static const CRPCCommand commands[] =
{ "blockchain", "verifytxoutproof", &verifytxoutproof, true },
};
void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC)
void RegisterRawTransactionRPCCommands(CRPCTable &t)
{
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

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

4
src/wallet/rpcwallet.cpp

@ -2617,8 +2617,8 @@ static const CRPCCommand commands[] = @@ -2617,8 +2617,8 @@ static const CRPCCommand commands[] =
{ "wallet", "removeprunedfunds", &removeprunedfunds, true },
};
void RegisterWalletRPCCommands(CRPCTable &tableRPC)
void RegisterWalletRPCCommands(CRPCTable &t)
{
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

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

Loading…
Cancel
Save