commit fd995def4dce8b0234fa3560049fe6c1a2d74a84
author Ed Tanous <edtanous@google.com> Fri Mar 17 12:58:55 2023 -0700
committer Patrick Williams <patrick@stwcx.xyz> Mon Mar 20 17:53:02 2023 +0000
tree ff763e651d3cb905b37fb91483813b96db85ca69
parent 1d3a0390650f162b30d360d1ab50e04fd65ceb29

Break out lambdas into helpers

While these are pretty simple lambdas, keeping them inline removes the
possibility for deduplication, and makes debugging harder.

Change-Id: Ia6f3398023a89216776a8be4e04406aa69c5e84b
Signed-off-by: Ed Tanous <edtanous@google.com>

include/sdbusplus/asio/object_server.hpp

diff --git a/include/sdbusplus/asio/object_server.hpp b/include/sdbusplus/asio/object_server.hpp
index a8493c5..46c4191 100644
--- a/include/sdbusplus/asio/object_server.hpp
+++ b/include/sdbusplus/asio/object_server.hpp
@@ -102,6 +102,20 @@
         }
     }
 };
+
+template <typename PropertyType>
+PropertyType nop_get_value(const PropertyType& value)
+{
+    return value;
+}
+
+template <typename PropertyType>
+int nop_set_value(const PropertyType& req, PropertyType& old)
+{
+    old = req;
+    return 1;
+}
+
 } // namespace details
 
 template <typename InputArgs, typename Callback>
@@ -318,6 +332,7 @@
     readOnly,
     readWrite
 };
+
 class dbus_interface
 {
   public:
@@ -362,10 +377,7 @@
         callbacksSet_[name] = std::make_unique<callback_set_instance<
             PropertyType,
             std::function<int(const PropertyType&, PropertyType&)>>>(
-            propertyPtr, [](const PropertyType& req, PropertyType& old) {
-                old = req;
-                return 1;
-            });
+            propertyPtr, details::nop_set_value<PropertyType>);
 
         vtable_.emplace_back(vtable::property(nameItr->c_str(), type.data(),
                                               get_handler, flags));
@@ -438,19 +450,16 @@
     {
         if (access == PropertyPermission::readOnly)
         {
-            return register_property_r(
-                name, property, vtable::property_::emits_change,
-                [](const PropertyType& value) { return value; });
+            return register_property_r(name, property,
+                                       vtable::property_::emits_change,
+                                       details::nop_get_value<PropertyType>);
         }
         else
         {
-            return register_property_rw(
-                name, property, vtable::property_::emits_change,
-                [](const PropertyType& req, PropertyType& old) {
-                    old = req;
-                    return true;
-                },
-                [](const PropertyType& value) { return value; });
+            return register_property_rw(name, property,
+                                        vtable::property_::emits_change,
+                                        details::nop_set_value<PropertyType>,
+                                        details::nop_get_value<PropertyType>);
         }
     }
 
@@ -460,10 +469,10 @@
                            const PropertyType& property,
                            CallbackTypeSet&& setFunction)
     {
-        return register_property_rw(
-            name, property, vtable::property_::emits_change,
-            std::forward<CallbackTypeSet>(setFunction),
-            [](const PropertyType& value) { return value; });
+        return register_property_rw(name, property,
+                                    vtable::property_::emits_change,
+                                    std::forward<CallbackTypeSet>(setFunction),
+                                    details::nop_get_value<PropertyType>);
     }
 
     // custom getter and setter, gets take an input of void and respond with a