commit 3accb3221efd3cfc7d409438bee5a1801c2561dc
author Patrick Williams <patrick@stwcx.xyz> Tue May 30 16:29:52 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue May 30 16:30:14 2017 -0500
tree 50174ff31f89d085e91956963998f71418ed46da
parent 2fdb9310ae999bac265131264409d6a294dac91f

use new sdbusplus match constructors

Change-Id: I774a8f9e7ce62e4a3663d12b3d561e5850f37a37
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

item_updater.hpp

diff --git a/item_updater.hpp b/item_updater.hpp
index 0e8558a..216b1d7 100755
--- a/item_updater.hpp
+++ b/item_updater.hpp
@@ -13,6 +13,7 @@
 
 using ItemUpdaterInherit = sdbusplus::server::object::object<
     sdbusplus::xyz::openbmc_project::Common::server::FactoryReset>;
+namespace MatchRules = sdbusplus::bus::match::rules;
 
 /** @class ItemUpdater
  *  @brief Manages the activation of the version items.
@@ -30,12 +31,12 @@
                     busItem(bus),
                     versionMatch(
                             bus,
-                           "type='signal',"
-                           "member='InterfacesAdded',"
-                           "path='/xyz/openbmc_project/software',"
-                           "interface='org.freedesktop.DBus.ObjectManager'",
-                            createActivation,
-                            this)
+                            MatchRules::interfacesAdded() +
+                            MatchRules::path("/xyz/openbmc_project/software"),
+                            std::bind(
+                                    std::mem_fn(&ItemUpdater::createActivation),
+                                    this,
+                                    std::placeholders::_1))
         {
         }
 
@@ -44,12 +45,8 @@
          *  @details Creates an Activation dbus object.
          *
          * @param[in]  msg       - Data associated with subscribed signal
-         * @param[in]  userData  - Pointer to this object instance
-         * @param[out] retError  - Required param
          */
-        static int createActivation(sd_bus_message* msg,
-                                    void* userData,
-                                    sd_bus_error* retError);
+        void createActivation(sdbusplus::message::message& msg);
 
         /**
          * @brief Get the extended version from the specified file.
@@ -77,7 +74,7 @@
         std::map<std::string, std::unique_ptr<Activation>> activations;
 
         /** @brief sdbusplus signal match for Software.Version */
-        sdbusplus::server::match::match versionMatch;
+        sdbusplus::bus::match_t versionMatch;
 
         /** @brief Host factory reset - clears PNOR partitions for each
           * Activation dbus object */