Fix register_write service's pair separator

kostorr · kostorr · commit 93c28eae2d05 · 2019-09-09T09:58:08.000+02:00
diff --git a/src/AlfClient.h b/src/AlfClient.h
@@ -68,7 +68,7 @@ class RegisterWriteRpc : DimRpcInfoWrapper
 
   void writeRegister(uint64_t registerAddress, uint32_t registerValue)
   {
-    setString((boost::format("0x%x%s0x%x") % registerAddress % argumentSeparator() % registerValue).str());
+    setString((boost::format("0x%x%s0x%x%s") % registerAddress % pairSeparator() % registerValue).str());
     try {
       getString();
     } catch (const AlfException& e) {
diff --git a/src/AlfServer.cxx b/src/AlfServer.cxx
@@ -44,7 +44,7 @@ std::string AlfServer::registerRead(const std::string& parameter, std::shared_pt
 
 std::string AlfServer::registerWrite(const std::string& parameter, std::shared_ptr<roc::BarInterface> bar2)
 {
-  std::vector<std::string> params = Util::split(parameter, argumentSeparator());
+  std::vector<std::string> params = Util::split(parameter, pairSeparator());
 
   if (params.size() != 2) {
     BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("Wrong number of parameters for RPC write call"));

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class RegisterWriteRpc : DimRpcInfoWrapper`
`68`	`68`
`69`	`69`	`void writeRegister(uint64_t registerAddress, uint32_t registerValue)`
`70`	`70`	`{`
`71`		`- setString((boost::format("0x%x%s0x%x") % registerAddress % argumentSeparator() % registerValue).str());`
	`71`	`+ setString((boost::format("0x%x%s0x%x%s") % registerAddress % pairSeparator() % registerValue).str());`
`72`	`72`	`try {`
`73`	`73`	`getString();`
`74`	`74`	`} catch (const AlfException& e) {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ std::string AlfServer::registerRead(const std::string& parameter, std::shared_pt`
`44`	`44`
`45`	`45`	`std::string AlfServer::registerWrite(const std::string& parameter, std::shared_ptr<roc::BarInterface> bar2)`
`46`	`46`	`{`
`47`		`- std::vector<std::string> params = Util::split(parameter, argumentSeparator());`
	`47`	`+ std::vector<std::string> params = Util::split(parameter, pairSeparator());`
`48`	`48`
`49`	`49`	`if (params.size() != 2) {`
`50`	`50`	`BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("Wrong number of parameters for RPC write call"));`