refactor: Use C++11 range based for loops to simplify rpc code

MarcoFalke · MarcoFalke · commit fa89ca9b5bd3 · 2020-08-02T21:32:36.000+02:00
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -2407,7 +2407,7 @@ static const CRPCCommand commands[] =
     { "hidden",             "dumptxoutset",           &dumptxoutset,           {"path"} },
 };
 // clang-format on
-
-    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
+    for (const auto& c : commands) {
+        t.appendCommand(c.name, &c);
+    }
 }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -1200,7 +1200,7 @@ static const CRPCCommand commands[] =
     { "hidden",             "estimaterawfee",         &estimaterawfee,         {"conf_target", "threshold"} },
 };
 // clang-format on
-
-    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
+    for (const auto& c : commands) {
+        t.appendCommand(c.name, &c);
+    }
 }
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -619,7 +619,7 @@ static const CRPCCommand commands[] =
     { "hidden",             "echojson",               &echo,                   {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
 };
 // clang-format on
-
-    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
+    for (const auto& c : commands) {
+        t.appendCommand(c.name, &c);
+    }
 }
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -796,7 +796,7 @@ static const CRPCCommand commands[] =
     { "network",            "getnodeaddresses",       &getnodeaddresses,       {"count"} },
 };
 // clang-format on
-
-    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
+    for (const auto& c : commands) {
+        t.appendCommand(c.name, &c);
+    }
 }
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -1821,7 +1821,7 @@ static const CRPCCommand commands[] =
     { "blockchain",         "verifytxoutproof",             &verifytxoutproof,          {"proof"} },
 };
 // clang-format on
-
-    for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
-        t.appendCommand(commands[vcidx].name, &commands[vcidx]);
+    for (const auto& c : commands) {
+        t.appendCommand(c.name, &c);
+    }
 }
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
@@ -256,13 +256,8 @@ static const CRPCCommand vRPCCommands[] =
 
 CRPCTable::CRPCTable()
 {
-    unsigned int vcidx;
-    for (vcidx = 0; vcidx < (sizeof(vRPCCommands) / sizeof(vRPCCommands[0])); vcidx++)
-    {
-        const CRPCCommand *pcmd;
-
-        pcmd = &vRPCCommands[vcidx];
-        mapCommands[pcmd->name].push_back(pcmd);
+    for (const auto& c : vRPCCommands) {
+        appendCommand(c.name, &c);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -256,13 +256,8 @@ static const CRPCCommand vRPCCommands[] =`
`256`	`256`
`257`	`257`	`CRPCTable::CRPCTable()`
`258`	`258`	`{`
`259`		`- unsigned int vcidx;`
`260`		`- for (vcidx = 0; vcidx < (sizeof(vRPCCommands) / sizeof(vRPCCommands[0])); vcidx++)`
`261`		`- {`
`262`		`- const CRPCCommand *pcmd;`
`263`		`-`
`264`		`- pcmd = &vRPCCommands[vcidx];`
`265`		`- mapCommands[pcmd->name].push_back(pcmd);`
	`259`	`+ for (const auto& c : vRPCCommands) {`
	`260`	`+ appendCommand(c.name, &c);`
`266`	`261`	`}`
`267`	`262`	`}`
`268`	`263`