commit ab8dac5102fdacec33076055854cb5b3047d9c72
author Naveen Moses <naveen.mosess@hcl.com> Fri Jul 15 19:32:27 2022 +0530
committer Matt Spinler <spinler@us.ibm.com> Tue Jul 26 13:14:00 2022 +0000
tree c9d99e3cbc666d9a51adb0428686bd998674a6cd
parent 8d281f1b73cd102c619c857a700f7352580d55f5

Rename handler methods to match dbus signal type

The button handler process has multiple handlers which monitors
for "Released" dbus signal but has handlers named "pressed".
Such handlers has been renamed to match the signal type.

Signed-off-by: Naveen Moses <naveen.mosess@hcl.com>
Change-Id: Iff77569259df620dba2b04ed64ffc029fd9dee46

src/button_handler.cpp

diff --git a/src/button_handler.cpp b/src/button_handler.cpp
index b1c7ef9..3751df5 100644
--- a/src/button_handler.cpp
+++ b/src/button_handler.cpp
@@ -44,18 +44,16 @@
                 sdbusRule::type::signal() + sdbusRule::member("Released") +
                     sdbusRule::path(POWER_DBUS_OBJECT_NAME) +
                     sdbusRule::interface(powerButtonIface),
-                std::bind(std::mem_fn(&Handler::powerPressed), this,
+                std::bind(std::mem_fn(&Handler::powerReleased), this,
                           std::placeholders::_1));
 
-            powerButtonLongPressReleased =
-                std::make_unique<sdbusplus::bus::match_t>(
-                    bus,
-                    sdbusRule::type::signal() +
-                        sdbusRule::member("PressedLong") +
-                        sdbusRule::path(POWER_DBUS_OBJECT_NAME) +
-                        sdbusRule::interface(powerButtonIface),
-                    std::bind(std::mem_fn(&Handler::longPowerPressed), this,
-                              std::placeholders::_1));
+            powerButtonLongPressed = std::make_unique<sdbusplus::bus::match_t>(
+                bus,
+                sdbusRule::type::signal() + sdbusRule::member("PressedLong") +
+                    sdbusRule::path(POWER_DBUS_OBJECT_NAME) +
+                    sdbusRule::interface(powerButtonIface),
+                std::bind(std::mem_fn(&Handler::longPowerPressed), this,
+                          std::placeholders::_1));
         }
     }
     catch (const sdbusplus::exception::exception& e)
@@ -73,7 +71,7 @@
                 sdbusRule::type::signal() + sdbusRule::member("Released") +
                     sdbusRule::path(ID_DBUS_OBJECT_NAME) +
                     sdbusRule::interface(idButtonIface),
-                std::bind(std::mem_fn(&Handler::idPressed), this,
+                std::bind(std::mem_fn(&Handler::idReleased), this,
                           std::placeholders::_1));
         }
     }
@@ -92,7 +90,7 @@
                 sdbusRule::type::signal() + sdbusRule::member("Released") +
                     sdbusRule::path(RESET_DBUS_OBJECT_NAME) +
                     sdbusRule::interface(resetButtonIface),
-                std::bind(std::mem_fn(&Handler::resetPressed), this,
+                std::bind(std::mem_fn(&Handler::resetReleased), this,
                           std::placeholders::_1));
         }
     }
@@ -194,7 +192,7 @@
 
     switch (powerEventType)
     {
-        case PowerEvent::powerPressed:
+        case PowerEvent::powerReleased:
         {
             objPathName = HOST_STATE_OBJECT_NAME + hostNumStr;
             dbusIfaceName = hostIface;
@@ -242,7 +240,7 @@
             break;
         }
 
-        case PowerEvent::resetPressed:
+        case PowerEvent::resetReleased:
         {
             objPathName = HOST_STATE_OBJECT_NAME + hostNumStr;
             dbusIfaceName = hostIface;
@@ -273,11 +271,11 @@
     method.append(dbusIfaceName, transitionName, transition);
     bus.call(method);
 }
-void Handler::powerPressed(sdbusplus::message::message& /* msg */)
+void Handler::powerReleased(sdbusplus::message::message& /* msg */)
 {
     try
     {
-        handlePowerEvent(PowerEvent::powerPressed);
+        handlePowerEvent(PowerEvent::powerReleased);
     }
     catch (const sdbusplus::exception::exception& e)
     {
@@ -298,11 +296,11 @@
     }
 }
 
-void Handler::resetPressed(sdbusplus::message::message& /* msg */)
+void Handler::resetReleased(sdbusplus::message::message& /* msg */)
 {
     try
     {
-        handlePowerEvent(PowerEvent::resetPressed);
+        handlePowerEvent(PowerEvent::resetReleased);
     }
     catch (const sdbusplus::exception::exception& e)
     {
@@ -311,7 +309,7 @@
     }
 }
 
-void Handler::idPressed(sdbusplus::message::message& /* msg */)
+void Handler::idReleased(sdbusplus::message::message& /* msg */)
 {
     std::string groupPath{ledGroupBasePath};
     groupPath += ID_LED_GROUP;