From a2bed54e078039a20affbc8d2652938bffb19b06 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Sun, 21 Oct 2018 13:41:02 -0700 Subject: IPMIFruArea: Drop unused dbus debug Drop unused dbus debug code. There were no calls to set the values and the debug printing them would therefore always print empty strings. Change-Id: I767baf9f3450c9944396930069089a6bbb6e5c6a Signed-off-by: Patrick Venture --- fru_area.cpp | 11 ----------- fru_area.hpp | 30 ------------------------------ writefrudata.cpp | 3 --- 3 files changed, 44 deletions(-) diff --git a/fru_area.cpp b/fru_area.cpp index 389166c..b25bfef 100644 --- a/fru_area.cpp +++ b/fru_area.cpp @@ -52,14 +52,3 @@ void IPMIFruArea::setData(const uint8_t* value, const size_t length) data.reserve(length); // pre-allocate the space. data.insert(data.begin(), value, value + length); } - -//----------------------------------------------------- -// Sets the dbus parameters -//----------------------------------------------------- -void IPMIFruArea::updateDbusPaths(const char* bus, const char* path, - const char* intf) -{ - busName = bus; - objectPath = path; - interfaceName = intf; -} diff --git a/fru_area.hpp b/fru_area.hpp index abfa083..afd983b 100644 --- a/fru_area.hpp +++ b/fru_area.hpp @@ -51,24 +51,6 @@ class IPMIFruArea return name.c_str(); } - // Returns SD bus name - const char* getBusName() const - { - return busName.c_str(); - } - - // Retrns SD bus object path - const char* getObjectPath() const - { - return objectPath.c_str(); - } - - // Returns SD bus interface name - const char* getInterfaceName() const - { - return interfaceName.c_str(); - } - // Returns the data portion inline const uint8_t* getData() const { @@ -78,9 +60,6 @@ class IPMIFruArea // Accepts a pointer to data and sets it in the object. void setData(const uint8_t*, const size_t); - // Sets the dbus parameters - void updateDbusPaths(const char*, const char*, const char*); - private: // Unique way of identifying a FRU uint8_t fruID = 0; @@ -102,15 +81,6 @@ class IPMIFruArea // Actual area data. std::vector data; - - // fru inventory dbus name - std::string busName; - - // fru inventory dbus object path - std::string objectPath; - - // fru inventory dbus interface name - std::string interfaceName; }; #endif diff --git a/writefrudata.cpp b/writefrudata.cpp index 3c4ee20..1340669 100644 --- a/writefrudata.cpp +++ b/writefrudata.cpp @@ -599,9 +599,6 @@ int validateFRUArea(const uint8_t fruid, const char* fruFilename, std::printf("AREA NAME : [%s]\n", iter->getName()); std::printf("TYPE : [%d]\n", iter->getType()); std::printf("LEN : [%d]\n", iter->getLength()); - std::printf("BUS NAME : [%s]\n", iter->getBusName()); - std::printf("OBJ PATH : [%s]\n", iter->getObjectPath()); - std::printf("INTF NAME :[%s]\n", iter->getIntfName()); } #endif -- cgit v1.2.1