summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Joseph <tomjoseph@in.ibm.com>2017-07-10 19:30:54 +0530
committerPatrick Williams <patrick@stwcx.xyz>2017-07-19 19:54:42 +0000
commit306878b1b7b46f58e43e00f304060190b6bb2412 (patch)
tree0a83571e9a5577037e55c8333a366ba95296c9b6
parent232f5298dbc62f178b2c23aa474479ea2386b5d9 (diff)
downloadphosphor-host-ipmid-306878b1b7b46f58e43e00f304060190b6bb2412.zip
phosphor-host-ipmid-306878b1b7b46f58e43e00f304060190b6bb2412.tar.gz
Add typedef for Property name
Change-Id: I5bb95bc63d33144360bc0bd147cb772622a87cda Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>
-rw-r--r--selutility.cpp4
-rw-r--r--selutility.hpp10
2 files changed, 10 insertions, 4 deletions
diff --git a/selutility.cpp b/selutility.cpp
index f52d51e..b4675d1 100644
--- a/selutility.cpp
+++ b/selutility.cpp
@@ -27,7 +27,7 @@ GetSELEntryResponse prepareSELEntry(
const std::string& objPath,
ipmi::sensor::InvObjectIDMap::const_iterator iter)
{
- ipmi::sel::GetSELEntryResponse record {};
+ GetSELEntryResponse record {};
sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
auto service = ipmi::getService(bus, logEntryIntf, objPath);
@@ -46,7 +46,7 @@ GetSELEntryResponse prepareSELEntry(
elog<InternalFailure>();
}
- std::map<std::string, PropertyType> entryData;
+ std::map<PropertyName, PropertyType> entryData;
reply.read(entryData);
// Read Id from the log entry.
diff --git a/selutility.hpp b/selutility.hpp
index 164ebe6..57ed24f 100644
--- a/selutility.hpp
+++ b/selutility.hpp
@@ -21,8 +21,14 @@ static constexpr auto logDeleteIntf = "xyz.openbmc_project.Object.Delete";
static constexpr auto propIntf = "org.freedesktop.DBus.Properties";
using ObjectPaths = std::vector<std::string>;
-using PropertyType = sdbusplus::message::variant<bool, uint32_t, uint64_t,
- std::string, std::vector<std::string>>;
+using PropertyName = std::string;
+using Resolved = bool;
+using Id = uint32_t;
+using Timestamp = uint64_t;
+using Message = std::string;
+using AdditionalData = std::vector<std::string>;
+using PropertyType = sdbusplus::message::variant<Resolved, Id, Timestamp,
+ Message, AdditionalData>;
static constexpr auto selVersion = 0x51;
static constexpr auto invalidTimeStamp = 0xFFFFFFFF;
OpenPOWER on IntegriCloud