PEL: Use contains() for JSON
The contains() function is the same as:
if (json.find("key") != json.end())
but is a little more succinct.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Iec378cdd522bf22de1bad573ca363d651eb13508
diff --git a/extensions/openpower-pels/registry.cpp b/extensions/openpower-pels/registry.cpp
index 830a013..a02bebb 100644
--- a/extensions/openpower-pels/registry.cpp
+++ b/extensions/openpower-pels/registry.cpp
@@ -236,7 +236,7 @@
// If the ComponentID field is there, use that. Otherwise, if it's a
// 0xBD BMC error SRC, use the reasoncode.
- if (pelEntry.find("ComponentID") != pelEntry.end())
+ if (pelEntry.contains("ComponentID"))
{
std::string componentID = pelEntry["ComponentID"];
id = strtoul(componentID.c_str(), nullptr, 16);
@@ -560,33 +560,33 @@
entry.name = (*e)["Name"];
entry.subsystem = helper::getSubsystem((*e)["Subsystem"]);
- if (e->find("ActionFlags") != e->end())
+ if (e->contains("ActionFlags"))
{
entry.actionFlags = helper::getActionFlags((*e)["ActionFlags"]);
}
- if (e->find("MfgActionFlags") != e->end())
+ if (e->contains("MfgActionFlags"))
{
entry.mfgActionFlags =
helper::getActionFlags((*e)["MfgActionFlags"]);
}
- if (e->find("Severity") != e->end())
+ if (e->contains("Severity"))
{
entry.severity = helper::getSeverity((*e)["Severity"]);
}
- if (e->find("MfgSeverity") != e->end())
+ if (e->contains("MfgSeverity"))
{
entry.mfgSeverity = helper::getSeverity((*e)["MfgSeverity"]);
}
- if (e->find("EventType") != e->end())
+ if (e->contains("EventType"))
{
entry.eventType = helper::getEventType((*e)["EventType"]);
}
- if (e->find("EventScope") != e->end())
+ if (e->contains("EventScope"))
{
entry.eventScope = helper::getEventScope((*e)["EventScope"]);
}
@@ -594,7 +594,7 @@
auto& src = (*e)["SRC"];
entry.src.reasonCode = helper::getSRCReasonCode(src, name);
- if (src.find("Type") != src.end())
+ if (src.contains("Type"))
{
entry.src.type = helper::getSRCType(src, name);
}
@@ -608,18 +608,18 @@
entry.componentID = helper::getComponentID(
entry.src.type, entry.src.reasonCode, *e, name);
- if (src.find("Words6To9") != src.end())
+ if (src.contains("Words6To9"))
{
entry.src.hexwordADFields =
helper::getSRCHexwordFields(src, name);
}
- if (src.find("SymptomIDFields") != src.end())
+ if (src.contains("SymptomIDFields"))
{
entry.src.symptomID = helper::getSRCSymptomIDFields(src, name);
}
- if (src.find("PowerFault") != src.end())
+ if (src.contains("PowerFault"))
{
entry.src.powerFault = src["PowerFault"];
}
@@ -627,7 +627,7 @@
auto& doc = (*e)["Documentation"];
entry.doc.message = doc["Message"];
entry.doc.description = doc["Description"];
- if (doc.find("MessageArgSources") != doc.end())
+ if (doc.contains("MessageArgSources"))
{
entry.doc.messageArgSources = doc["MessageArgSources"];
}