Logging.Entry: use AdditionalData property again
Change I7cc9591895f219471ac098387f72a35c18e6c750 finished the
migration in phosphor-logging so that AdditionalData is now
a dictionary (as is AdditionalData2). Use AdditionalData so
that phosphor-logging is free to delete AdditionalData2.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ibfa1af5b27a3da9bacc6f795a22b4eb98d25a013
diff --git a/selutility.cpp b/selutility.cpp
index 6c7b086..ef1b638 100644
--- a/selutility.cpp
+++ b/selutility.cpp
@@ -31,7 +31,7 @@
constexpr auto oemCDDataSize = 9;
constexpr auto oemEFDataSize = 13;
-constexpr auto propAdditionalData = "AdditionalData2";
+constexpr auto propAdditionalData = "AdditionalData";
constexpr auto propResolved = "Resolved";
constexpr auto strEventDir = "EVENT_DIR";
@@ -216,7 +216,7 @@
{
// Check if it's a SEL from phosphor-sel-logger which shall contain
// the record ID, etc
- const auto& addData = std::get<AdditionalData2>(iterId->second);
+ const auto& addData = std::get<AdditionalData>(iterId->second);
auto recordTypeIter = addData.find(strRecordType);
if (recordTypeIter != addData.end())
{
diff --git a/selutility.hpp b/selutility.hpp
index 8c51c54..27c2ca1 100644
--- a/selutility.hpp
+++ b/selutility.hpp
@@ -36,10 +36,9 @@
using Id = uint32_t;
using Timestamp = uint64_t;
using Message = std::string;
-using AdditionalData = std::vector<std::string>;
-using AdditionalData2 = std::map<std::string, std::string>;
-using PropertyType = std::variant<Resolved, Id, Timestamp, Message,
- AdditionalData, AdditionalData2>;
+using AdditionalData = std::map<std::string, std::string>;
+using PropertyType =
+ std::variant<Resolved, Id, Timestamp, Message, AdditionalData>;
static constexpr auto selVersion = 0x51;
static constexpr auto invalidTimeStamp = 0xFFFFFFFF;