commit e75d10f523ee0d2be94eaf83d6c36b4e037a8e46
author Patrick Williams <patrick@stwcx.xyz> Tue May 30 16:56:32 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue May 30 16:56:43 2017 -0500
tree ad37b8024f8c9aff7c8af09665f1f5da8cb97c98
parent 9ec18ef03dc6c0fd6cba2702384b78ffff6d7bae

use new sdbusplus match constructors

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

item_updater.cpp

diff --git a/item_updater.cpp b/item_updater.cpp
index 9427414..59c07f2 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -16,18 +16,13 @@
 
 using namespace phosphor::logging;
 
-int ItemUpdater::createActivation(sd_bus_message* msg,
-                                  void* userData,
-                                  sd_bus_error* retErr)
+void ItemUpdater::createActivation(sdbusplus::message::message& msg)
 {
-    auto* updater = static_cast<ItemUpdater*>(userData);
-    auto m = sdbusplus::message::message(msg);
-
     sdbusplus::message::object_path objPath;
     std::map<std::string,
-        std::map<std::string,
-        sdbusplus::message::variant<std::string>>> interfaces;
-    m.read(objPath, interfaces);
+             std::map<std::string,
+                      sdbusplus::message::variant<std::string>>> interfaces;
+    msg.read(objPath, interfaces);
     std::string path(std::move(objPath));
 
     for (const auto& intf : interfaces)
@@ -42,13 +37,12 @@
             if (!property.first.compare("Purpose"))
             {
                 // Only process the BMC images
-                std::string value = sdbusplus::message::variant_ns::get <
-                                    std::string > (property.second);
-                if (value.compare(convertForMessage(server::Version::
-                                                    VersionPurpose::
-                                                    BMC).c_str()))
+                auto value = sdbusplus::message::variant_ns::get<std::string>(
+                        property.second);
+                if (value !=
+                    convertForMessage(server::Version::VersionPurpose::BMC))
                 {
-                    return 0;
+                    return;
                 }
             }
         }
@@ -60,25 +54,24 @@
     {
         log<level::ERR>("No version id found in object path",
                         entry("OBJPATH=%s", path));
-        return -1;
+        return;
     }
 
     auto versionId = path.substr(pos + 1);
 
-    if (updater->activations.find(versionId) == updater->activations.end())
+    if (activations.find(versionId) == activations.end())
     {
         // For now set all BMC code versions to active
-        auto activationState = server::Activation::Activations::Active;
+        constexpr auto activationState =
+                server::Activation::Activations::Active;
 
-        updater->activations.insert(std::make_pair(
-                                        versionId,
-                                        std::make_unique<Activation>(
-                                            updater->bus,
-                                            path,
-                                            versionId,
-                                            activationState)));
+        activations.insert(
+                std::make_pair(
+                        versionId,
+                        std::make_unique<Activation>(
+                                bus, path, versionId, activationState)));
     }
-    return 0;
+    return;
 }
 
 } // namespace updater