RDKEMW-2031: Fix Coverity issues within iarmmgr

hgfell683 · hgfell683 · commit 234eb4389759 · 2025-03-20T16:00:25.000-04:00
Reason for change: Fix coverity issues within iarmmgr
Test Procedure:
Risks: low
Priority: P1

Signed-off-by:Hayden Gfeller &lt;Hayden_Gfeller@comcast.com&gt;
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.cpp b/HdmiCecSource/HdmiCecSourceImplementation.cpp
@@ -654,23 +654,23 @@ namespace WPEFramework
             return Core::ERROR_NONE;
 		}
 
-        uint32_t HdmiCecSourceImplementation::SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, bool &success)
+        uint32_t HdmiCecSourceImplementation::SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, HdmiCecSourceSucces &success)
 		{
 			SendKeyInfo keyInfo;
 			try {
                keyInfo.logicalAddr = logicalAddress;
                keyInfo.keyCode     = keyCode;
             } catch (const std::invalid_argument& e) {
                std::cerr << "Invalid input: " << e.what() << std::endl;
-               success = false;
+               success.success = false;
                return Core::ERROR_GENERAL;
             }
 			std::unique_lock<std::mutex> lk(m_sendKeyEventMutex);
 			m_SendKeyQueue.push(keyInfo);
             m_sendKeyEventThreadRun = true;
 			m_sendKeyCV.notify_one();
 			LOGINFO("Post send key press event to queue size:%d \n",(int)m_SendKeyQueue.size());
-            success = true;
+            success.success = true;
 			return Core::ERROR_NONE;
 		}
 
@@ -685,7 +685,7 @@ namespace WPEFramework
 
          }
 
-       uint32_t HdmiCecSourceImplementation::SendStandbyMessage(bool &success)
+       uint32_t HdmiCecSourceImplementation::SendStandbyMessage(HdmiCecSourceSucces &success)
        {
             bool ret = false;
 
@@ -711,11 +711,11 @@ namespace WPEFramework
 
             if(ret)
             {
-                success = true;
+                success.success = true;
                 return Core::ERROR_NONE;
             }
             else{
-                success = false;
+                success.success = false;
                 return Core::ERROR_GENERAL;
             }
        }
@@ -944,7 +944,7 @@ namespace WPEFramework
             return cecSettingEnabled;
         }
 
-        uint32_t HdmiCecSourceImplementation::SetEnabled(const bool &enabled, bool &success)
+        uint32_t HdmiCecSourceImplementation::SetEnabled(const bool &enabled, HdmiCecSourceSucces &success)
         {
            LOGINFO("Entered SetEnabled ");
 
@@ -961,19 +961,19 @@ namespace WPEFramework
            {
                CECDisable();
            }
-           success = true;
+           success.success = true;
            return Core::ERROR_NONE;
         }
 
-        uint32_t HdmiCecSourceImplementation::SetOTPEnabled(const bool &enabled, bool &success)
+        uint32_t HdmiCecSourceImplementation::SetOTPEnabled(const bool &enabled, HdmiCecSourceSucces &success)
         {
            if (cecOTPSettingEnabled != enabled)
            {
                LOGINFO("persist SetOTPEnabled ");
                Utils::persistJsonSettings (CEC_SETTING_ENABLED_FILE, CEC_SETTING_OTP_ENABLED, JsonValue(enabled));
                cecOTPSettingEnabled = enabled;
            }
-           success = true;
+           success.success = true;
            return Core::ERROR_NONE;
         }
 
@@ -1211,18 +1211,18 @@ namespace WPEFramework
 
         uint32_t HdmiCecSourceImplementation::GetOSDName(std::string &name, bool &success)
         {
-            osdName = name.c_str();
+            name = osdName.toString();
             LOGINFO("GetOSDName :%s ",name.c_str());
             success = true;
             return Core::ERROR_NONE;
         }
 
-        uint32_t HdmiCecSourceImplementation::SetOSDName(const std::string &name, bool &success)
+        uint32_t HdmiCecSourceImplementation::SetOSDName(const std::string &name, HdmiCecSourceSucces &success)
         {
             LOGINFO("SetOSDName :%s ",name.c_str());
             osdName = name.c_str();
             Utils::persistJsonSettings (CEC_SETTING_ENABLED_FILE, CEC_SETTING_OSD_NAME, JsonValue(name.c_str()));
-            success = true;
+            success.success = true;
             return Core::ERROR_NONE;
         }
 
@@ -1234,7 +1234,7 @@ namespace WPEFramework
             return Core::ERROR_NONE;
         }
 
-        uint32_t HdmiCecSourceImplementation::SetVendorId(const string &vendorid, bool &success)
+        uint32_t HdmiCecSourceImplementation::SetVendorId(const string &vendorid, HdmiCecSourceSucces &success)
         {
             LOGINFO("SetVendorId :%s ",vendorid.c_str());
             unsigned int vendorIdInt = 0;
@@ -1250,11 +1250,11 @@ namespace WPEFramework
             appVendorId = {(uint8_t)(vendorIdInt >> 16 & 0xff),(uint8_t)(vendorIdInt >> 8 & 0xff),(uint8_t) (vendorIdInt & 0xff)};
             Utils::persistJsonSettings (CEC_SETTING_ENABLED_FILE, CEC_SETTING_VENDOR_ID, JsonValue(vendorIdInt));
             LOGINFO("SetVendorId :%s ",appVendorId.toString().c_str());
-            success = true;
+            success.success = true;
             return Core::ERROR_NONE;
         }
 
-        uint32_t HdmiCecSourceImplementation::PerformOTPAction(bool &success)
+        uint32_t HdmiCecSourceImplementation::PerformOTPAction(HdmiCecSourceSucces &success)
         {
             LOGINFO("PerformOTPAction ");
             bool ret = false; 
@@ -1288,10 +1288,10 @@ namespace WPEFramework
                 LOGWARN("cecEnableStatus=false");
 
             if (ret){
-                success = true;
+                success.success = true;
                 return Core::ERROR_NONE;
             } else {
-                success = false;
+                success.success = false;
                 return Core::ERROR_GENERAL;
             }
         }
diff --git a/HdmiCecSource/HdmiCecSourceImplementation.h b/HdmiCecSource/HdmiCecSourceImplementation.h
@@ -317,17 +317,17 @@ namespace WPEFramework {
                 std::list<Exchange::IHdmiCecSource::INotification*> _hdmiCecSourceNotifications;
 
         public:
-            uint32_t SetEnabled(const bool &enabled, bool &success) override;
+            uint32_t SetEnabled(const bool &enabled, HdmiCecSourceSucces &success) override;
             uint32_t GetEnabled(bool &enabled, bool &success) override;
-            uint32_t SetOTPEnabled(const bool &enabled, bool &success) override;
+            uint32_t SetOTPEnabled(const bool &enabled, HdmiCecSourceSucces &success) override;
             uint32_t GetOTPEnabled(bool &enabled, bool &success) override;
-            uint32_t SetOSDName(const string &name, bool &success) override;
+            uint32_t SetOSDName(const string &name, HdmiCecSourceSucces &success) override;
             uint32_t GetOSDName(string &name, bool &success) override;
-            uint32_t SetVendorId(const string &vendorid, bool &success) override;
+            uint32_t SetVendorId(const string &vendorid, HdmiCecSourceSucces &success) override;
             uint32_t GetVendorId(string &vendorid, bool &success) override;
-            uint32_t PerformOTPAction(bool &success) override;
-            uint32_t SendStandbyMessage(bool &success) override;
-            uint32_t SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, bool &success) override;
+            uint32_t PerformOTPAction(HdmiCecSourceSucces &success) override;
+            uint32_t SendStandbyMessage(HdmiCecSourceSucces &success) override;
+            uint32_t SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, HdmiCecSourceSucces &success) override;
             uint32_t GetActiveSourceStatus(bool &isActiveSource, bool &success) override;
             uint32_t GetDeviceList(uint32_t &numberofdevices, IHdmiCecSourceDeviceListIterator*& deviceList, bool &success) override;
             uint32_t Configure(PluginHost::IShell* service) override;

Original file line number	Diff line number	Diff line change
`@@ -654,23 +654,23 @@ namespace WPEFramework`
`654`	`654`	`return Core::ERROR_NONE;`
`655`	`655`	`}`
`656`	`656`
`657`		`- uint32_t HdmiCecSourceImplementation::SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, bool &success)`
	`657`	`+ uint32_t HdmiCecSourceImplementation::SendKeyPressEvent(const uint32_t &logicalAddress,const uint32_t &keyCode, HdmiCecSourceSucces &success)`
`658`	`658`	`{`
`659`	`659`	`SendKeyInfo keyInfo;`
`660`	`660`	`try {`
`661`	`661`	`keyInfo.logicalAddr = logicalAddress;`
`662`	`662`	`keyInfo.keyCode = keyCode;`
`663`	`663`	`} catch (const std::invalid_argument& e) {`
`664`	`664`	`std::cerr << "Invalid input: " << e.what() << std::endl;`
`665`		`- success = false;`
	`665`	`+ success.success = false;`
`666`	`666`	`return Core::ERROR_GENERAL;`
`667`	`667`	`}`
`668`	`668`	`std::unique_lock<std::mutex> lk(m_sendKeyEventMutex);`
`669`	`669`	`m_SendKeyQueue.push(keyInfo);`
`670`	`670`	`m_sendKeyEventThreadRun = true;`
`671`	`671`	`m_sendKeyCV.notify_one();`
`672`	`672`	`LOGINFO("Post send key press event to queue size:%d \n",(int)m_SendKeyQueue.size());`
`673`		`- success = true;`
	`673`	`+ success.success = true;`
`674`	`674`	`return Core::ERROR_NONE;`
`675`	`675`	`}`
`676`	`676`
`@@ -685,7 +685,7 @@ namespace WPEFramework`
`685`	`685`
`686`	`686`	`}`
`687`	`687`
`688`		`- uint32_t HdmiCecSourceImplementation::SendStandbyMessage(bool &success)`
	`688`	`+ uint32_t HdmiCecSourceImplementation::SendStandbyMessage(HdmiCecSourceSucces &success)`
`689`	`689`	`{`
`690`	`690`	`bool ret = false;`
`691`	`691`
`@@ -711,11 +711,11 @@ namespace WPEFramework`
`711`	`711`
`712`	`712`	`if(ret)`
`713`	`713`	`{`
`714`		`- success = true;`
	`714`	`+ success.success = true;`
`715`	`715`	`return Core::ERROR_NONE;`
`716`	`716`	`}`
`717`	`717`	`else{`
`718`		`- success = false;`
	`718`	`+ success.success = false;`
`719`	`719`	`return Core::ERROR_GENERAL;`
`720`	`720`	`}`
`721`	`721`	`}`
`@@ -944,7 +944,7 @@ namespace WPEFramework`
`944`	`944`	`return cecSettingEnabled;`
`945`	`945`	`}`
`946`	`946`
`947`		`- uint32_t HdmiCecSourceImplementation::SetEnabled(const bool &enabled, bool &success)`
	`947`	`+ uint32_t HdmiCecSourceImplementation::SetEnabled(const bool &enabled, HdmiCecSourceSucces &success)`
`948`	`948`	`{`
`949`	`949`	`LOGINFO("Entered SetEnabled ");`
`950`	`950`
`@@ -961,19 +961,19 @@ namespace WPEFramework`
`961`	`961`	`{`
`962`	`962`	`CECDisable();`
`963`	`963`	`}`
`964`		`- success = true;`
	`964`	`+ success.success = true;`
`965`	`965`	`return Core::ERROR_NONE;`
`966`	`966`	`}`
`967`	`967`
`968`		`- uint32_t HdmiCecSourceImplementation::SetOTPEnabled(const bool &enabled, bool &success)`
	`968`	`+ uint32_t HdmiCecSourceImplementation::SetOTPEnabled(const bool &enabled, HdmiCecSourceSucces &success)`
`969`	`969`	`{`
`970`	`970`	`if (cecOTPSettingEnabled != enabled)`
`971`	`971`	`{`
`972`	`972`	`LOGINFO("persist SetOTPEnabled ");`
`973`	`973`	`Utils::persistJsonSettings (CEC_SETTING_ENABLED_FILE, CEC_SETTING_OTP_ENABLED, JsonValue(enabled));`
`974`	`974`	`cecOTPSettingEnabled = enabled;`
`975`	`975`	`}`
`976`		`- success = true;`
	`976`	`+ success.success = true;`
`977`	`977`	`return Core::ERROR_NONE;`
`978`	`978`	`}`
`979`	`979`
`@@ -1211,18 +1211,18 @@ namespace WPEFramework`
`1211`	`1211`
`1212`	`1212`	`uint32_t HdmiCecSourceImplementation::GetOSDName(std::string &name, bool &success)`
`1213`	`1213`	`{`
`1214`		`- osdName = name.c_str();`
	`1214`	`+ name = osdName.toString();`
`1215`	`1215`	`LOGINFO("GetOSDName :%s ",name.c_str());`
`1216`	`1216`	`success = true;`
`1217`	`1217`	`return Core::ERROR_NONE;`
`1218`	`1218`	`}`
`1219`	`1219`
`1220`		`- uint32_t HdmiCecSourceImplementation::SetOSDName(const std::string &name, bool &success)`
	`1220`	`+ uint32_t HdmiCecSourceImplementation::SetOSDName(const std::string &name, HdmiCecSourceSucces &success)`
`1221`	`1221`	`{`
`1222`	`1222`	`LOGINFO("SetOSDName :%s ",name.c_str());`
`1223`	`1223`	`osdName = name.c_str();`
`1224`	`1224`	`Utils::persistJsonSettings (CEC_SETTING_ENABLED_FILE, CEC_SETTING_OSD_NAME, JsonValue(name.c_str()));`
`1225`		`- success = true;`
	`1225`	`+ success.success = true;`
`1226`	`1226`	`return Core::ERROR_NONE;`
`1227`	`1227`	`}`
`1228`	`1228`
`@@ -1234,7 +1234,7 @@ namespace WPEFramework`
`1234`	`1234`	`return Core::ERROR_NONE;`
`1235`	`1235`	`}`
`1236`	`1236`
`1237`		`- uint32_t HdmiCecSourceImplementation::SetVendorId(const string &vendorid, bool &success)`
	`1237`	`+ uint32_t HdmiCecSourceImplementation::SetVendorId(const string &vendorid, HdmiCecSourceSucces &success)`
`1238`	`1238`	`{`
`1239`	`1239`	`LOGINFO("SetVendorId :%s ",vendorid.c_str());`
`1240`	`1240`	`unsigned int vendorIdInt = 0;`
`@@ -1250,11 +1250,11 @@ namespace WPEFramework`
`1250`	`1250`	`appVendorId = {(uint8_t)(vendorIdInt >> 16 & 0xff),(uint8_t)(vendorIdInt >> 8 & 0xff),(uint8_t) (vendorIdInt & 0xff)};`
`1251`	`1251`	`Utils::persistJsonSettings (CEC_SETTING_ENABLED_FILE, CEC_SETTING_VENDOR_ID, JsonValue(vendorIdInt));`
`1252`	`1252`	`LOGINFO("SetVendorId :%s ",appVendorId.toString().c_str());`
`1253`		`- success = true;`
	`1253`	`+ success.success = true;`
`1254`	`1254`	`return Core::ERROR_NONE;`
`1255`	`1255`	`}`
`1256`	`1256`
`1257`		`- uint32_t HdmiCecSourceImplementation::PerformOTPAction(bool &success)`
	`1257`	`+ uint32_t HdmiCecSourceImplementation::PerformOTPAction(HdmiCecSourceSucces &success)`
`1258`	`1258`	`{`
`1259`	`1259`	`LOGINFO("PerformOTPAction ");`
`1260`	`1260`	`bool ret = false;`
`@@ -1288,10 +1288,10 @@ namespace WPEFramework`
`1288`	`1288`	`LOGWARN("cecEnableStatus=false");`
`1289`	`1289`
`1290`	`1290`	`if (ret){`
`1291`		`- success = true;`
	`1291`	`+ success.success = true;`
`1292`	`1292`	`return Core::ERROR_NONE;`
`1293`	`1293`	`} else {`
`1294`		`- success = false;`
	`1294`	`+ success.success = false;`
`1295`	`1295`	`return Core::ERROR_GENERAL;`
`1296`	`1296`	`}`
`1297`	`1297`	`}`