[Modularization] use pointers when adding or replacing RPC commands

dexX7 · dexX7 · commit 57b252e4c766 · 2015-03-14T12:45:32.000+01:00
Using pointers signals the responsibility of managing object lifetime is in the hand of the caller.
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
@@ -398,10 +398,10 @@ const CRPCCommand *CRPCTable::operator[](string name) const
     return (*it).second;
 }
 
-void CRPCTable::AddOrReplaceCommand(const CRPCCommand command)
+void CRPCTable::AddOrReplaceCommand(const CRPCCommand* pcommand)
 {
     // add new command to the dispatch table
-    mapCommands[command.name] = &command;
+    mapCommands[pcommand->name] = pcommand;
 }
 
 bool HTTPAuthorized(map<string, string>& mapHeaders)
diff --git a/src/rpcserver.h b/src/rpcserver.h
@@ -114,10 +114,10 @@ class CRPCTable
     std::string help(std::string name) const;
 
     /**
-     * add or replace a CRPCCommand to the dispatch table
-     * @param command rpc command to add or replace
-     */ 
-    void AddOrReplaceCommand(const CRPCCommand command);
+     * Add or replace a CRPCCommand to the dispatch table
+     * @param pcommand RPC command to add or replace
+     */
+    void AddOrReplaceCommand(const CRPCCommand* pcommand);
 
     /**
      * Execute a method.
diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp
@@ -166,16 +166,16 @@ BOOST_AUTO_TEST_CASE(rpc_flex_table)
 {
     Value r = CallRPC(string("ping"));
     BOOST_CHECK(r.is_null());
- 
-    const CRPCCommand newCmd = { "network","testcmd",  &ping_overwrite_tests,true,false };
-    tableRPC.AddOrReplaceCommand(newCmd);
-    
+
+    const CRPCCommand newCmd = { "network", "testcmd", &ping_overwrite_tests, true, false };
+    tableRPC.AddOrReplaceCommand(&newCmd);
+
     BOOST_CHECK_NO_THROW(r = CallRPC(string("testcmd")));
     BOOST_CHECK_EQUAL(find_value(r.get_obj(), "Test").get_str(), "123");
-    
-    const CRPCCommand newPingCmd = { "network","ping",  &ping_overwrite_tests,true,false };
-    tableRPC.AddOrReplaceCommand(newPingCmd);
-    
+
+    const CRPCCommand newPingCmd = { "network", "ping", &ping_overwrite_tests, true, false };
+    tableRPC.AddOrReplaceCommand(&newPingCmd);
+
     BOOST_CHECK_NO_THROW(r = CallRPC(string("ping")));
     BOOST_CHECK_EQUAL(find_value(r.get_obj(), "Test").get_str(), "123");
 }

Original file line number	Diff line number	Diff line change
`@@ -398,10 +398,10 @@ const CRPCCommand *CRPCTable::operator[](string name) const`
`398`	`398`	`return (*it).second;`
`399`	`399`	`}`
`400`	`400`
`401`		`-void CRPCTable::AddOrReplaceCommand(const CRPCCommand command)`
	`401`	`+void CRPCTable::AddOrReplaceCommand(const CRPCCommand* pcommand)`
`402`	`402`	`{`
`403`	`403`	`// add new command to the dispatch table`
`404`		`- mapCommands[command.name] = &command;`
	`404`	`+ mapCommands[pcommand->name] = pcommand;`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`bool HTTPAuthorized(map<string, string>& mapHeaders)`