commit 4bfc908fe5b6969ca7e5cf5a904f673ca063361b
author Matt Spinler <spinler@us.ibm.com> Tue Mar 24 15:05:54 2020 -0500
committer Matt Spinler <spinler@us.ibm.com> Fri Apr 03 19:58:12 2020 +0000
tree 38c1fd6bbbe7953415d8de73b51c535dfd3b4107
parent 4220a15802c1dc1006aae4124718cf37cdf3b054

PEL: Change variable name in pel.cpp

There will soon be several calls to log traces to the journal with
metadata which means phosphor::logging::entry will be used.  Change an
existing variable named entry to something else so that it doesn't
collide with phosphor::logging::entry.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Iea781046955120e5de2188ea18cc33cb6318c47e

extensions/openpower-pels/pel.cpp

diff --git a/extensions/openpower-pels/pel.cpp b/extensions/openpower-pels/pel.cpp
index 5114761..13e94d0 100644
--- a/extensions/openpower-pels/pel.cpp
+++ b/extensions/openpower-pels/pel.cpp
@@ -36,21 +36,22 @@
 {
 namespace message = openpower::pels::message;
 namespace pv = openpower::pels::pel_values;
+using namespace phosphor::logging;
 
 constexpr auto unknownValue = "Unknown";
 
-PEL::PEL(const message::Entry& entry, uint32_t obmcLogID, uint64_t timestamp,
+PEL::PEL(const message::Entry& regEntry, uint32_t obmcLogID, uint64_t timestamp,
          phosphor::logging::Entry::Level severity,
          const AdditionalData& additionalData,
          const DataInterfaceBase& dataIface)
 {
-    _ph = std::make_unique<PrivateHeader>(entry.componentID, obmcLogID,
+    _ph = std::make_unique<PrivateHeader>(regEntry.componentID, obmcLogID,
                                           timestamp);
-    _uh = std::make_unique<UserHeader>(entry, severity);
+    _uh = std::make_unique<UserHeader>(regEntry, severity);
 
-    auto src = std::make_unique<SRC>(entry, additionalData, dataIface);
+    auto src = std::make_unique<SRC>(regEntry, additionalData, dataIface);
 
-    auto euh = std::make_unique<ExtendedUserHeader>(dataIface, entry, *src);
+    auto euh = std::make_unique<ExtendedUserHeader>(dataIface, regEntry, *src);
 
     _optionalSections.push_back(std::move(src));
     _optionalSections.push_back(std::move(euh));
@@ -143,7 +144,6 @@
 
     if (!valid())
     {
-        using namespace phosphor::logging;
         log<level::WARNING>("Unflattening an invalid PEL");
     }