Browse Source

Util: Small improvements in gArgs usage

- Don't check gArgs.IsArgSet() is greater than 0
- Remove unneeded calls and local variables
pull/1/head
Jorge Timón 5 years ago
parent
commit
78da882edd
No known key found for this signature in database
GPG Key ID: 8866C18EA1C944A2
  1. 2
      src/httprpc.cpp
  2. 8
      src/httpserver.cpp
  3. 16
      src/init.cpp

2
src/httprpc.cpp

@ -93,7 +93,7 @@ static bool multiUserAuthorized(std::string strUserPass) @@ -93,7 +93,7 @@ static bool multiUserAuthorized(std::string strUserPass)
std::string strUser = strUserPass.substr(0, strUserPass.find(":"));
std::string strPass = strUserPass.substr(strUserPass.find(":") + 1);
if (gArgs.IsArgSet("-rpcauth") > 0) {
if (gArgs.IsArgSet("-rpcauth")) {
//Search for multi-user login/pass "rpcauth" from config
BOOST_FOREACH(std::string strRPCAuth, gArgs.GetArgs("-rpcauth"))
{

8
src/httpserver.cpp

@ -197,8 +197,7 @@ static bool InitHTTPAllowList() @@ -197,8 +197,7 @@ static bool InitHTTPAllowList()
rpc_allow_subnets.push_back(CSubNet(localv4, 8)); // always allow IPv4 local subnet
rpc_allow_subnets.push_back(CSubNet(localv6)); // always allow IPv6 localhost
if (gArgs.IsArgSet("-rpcallowip")) {
const std::vector<std::string>& vAllow = gArgs.GetArgs("-rpcallowip");
for (std::string strAllow : vAllow) {
for (const std::string& strAllow : gArgs.GetArgs("-rpcallowip")) {
CSubNet subnet;
LookupSubNet(strAllow.c_str(), subnet);
if (!subnet.IsValid()) {
@ -322,11 +321,10 @@ static bool HTTPBindAddresses(struct evhttp* http) @@ -322,11 +321,10 @@ static bool HTTPBindAddresses(struct evhttp* http)
LogPrintf("WARNING: option -rpcbind was ignored because -rpcallowip was not specified, refusing to allow everyone to connect\n");
}
} else if (gArgs.IsArgSet("-rpcbind")) { // Specific bind address
const std::vector<std::string>& vbind = gArgs.GetArgs("-rpcbind");
for (std::vector<std::string>::const_iterator i = vbind.begin(); i != vbind.end(); ++i) {
for (const std::string& strRPCBind : gArgs.GetArgs("-rpcbind")) {
int port = defaultPort;
std::string host;
SplitHostPort(*i, port, host);
SplitHostPort(strRPCBind, port, host);
endpoints.push_back(std::make_pair(host, port));
}
} else { // No specific bind address specified, bind to any

16
src/init.cpp

@ -741,7 +741,7 @@ void InitParameterInteraction() @@ -741,7 +741,7 @@ void InitParameterInteraction()
LogPrintf("%s: parameter interaction: -whitebind set -> setting -listen=1\n", __func__);
}
if (gArgs.IsArgSet("-connect") && gArgs.GetArgs("-connect").size() > 0) {
if (gArgs.IsArgSet("-connect")) {
// when only connecting to trusted nodes, do not seed via DNS, or listen by default
if (SoftSetBoolArg("-dnsseed", false))
LogPrintf("%s: parameter interaction: -connect set -> setting -dnsseed=0\n", __func__);
@ -911,9 +911,9 @@ bool AppInitParameterInteraction() @@ -911,9 +911,9 @@ bool AppInitParameterInteraction()
InitWarning(strprintf(_("Reducing -maxconnections from %d to %d, because of system limitations."), nUserMaxConnections, nMaxConnections));
// ********************************************************* Step 3: parameter-to-internal-flags
if (gArgs.IsArgSet("-debug") > 0) {
if (gArgs.IsArgSet("-debug")) {
// Special-case: if -debug=0/-nodebug is set, turn off debugging messages
const std::vector<std::string>& categories = gArgs.GetArgs("-debug");
const std::vector<std::string> categories = gArgs.GetArgs("-debug");
if (find(categories.begin(), categories.end(), std::string("0")) == categories.end()) {
for (const auto& cat : categories) {
@ -928,9 +928,8 @@ bool AppInitParameterInteraction() @@ -928,9 +928,8 @@ bool AppInitParameterInteraction()
}
// Now remove the logging categories which were explicitly excluded
if (gArgs.IsArgSet("-debugexclude") > 0) {
const std::vector<std::string>& excludedCategories = gArgs.GetArgs("-debugexclude");
for (const auto& cat : excludedCategories) {
if (gArgs.IsArgSet("-debugexclude")) {
for (const std::string& cat : gArgs.GetArgs("-debugexclude")) {
uint32_t flag = 0;
if (!GetLogCategory(&flag, &cat)) {
InitWarning(strprintf(_("Unsupported logging category %s=%s."), "-debugexclude", cat));
@ -1105,10 +1104,9 @@ bool AppInitParameterInteraction() @@ -1105,10 +1104,9 @@ bool AppInitParameterInteraction()
if (!chainparams.MineBlocksOnDemand()) {
return InitError("BIP9 parameters may only be overridden on regtest.");
}
const std::vector<std::string>& deployments = gArgs.GetArgs("-bip9params");
for (auto i : deployments) {
for (const std::string& strDeployment : gArgs.GetArgs("-bip9params")) {
std::vector<std::string> vDeploymentParams;
boost::split(vDeploymentParams, i, boost::is_any_of(":"));
boost::split(vDeploymentParams, strDeployment, boost::is_any_of(":"));
if (vDeploymentParams.size() != 3) {
return InitError("BIP9 parameters malformed, expecting deployment:start:end");
}

Loading…
Cancel
Save