diff options
| author | Patrick Venture <venture@google.com> | 2018-10-20 19:23:36 -0700 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2018-10-20 19:31:12 -0700 |
| commit | d9af7b4458b042d0100ef964b6f7b5dd4d6f5569 (patch) | |
| tree | 5b447a8db9f0a32e4a0c328dc78609d91033c96b | |
| parent | 7180c61725d90616e19a126a5476e107effb28a9 (diff) | |
| download | ipmi-fru-parser-d9af7b4458b042d0100ef964b6f7b5dd4d6f5569.tar.gz ipmi-fru-parser-d9af7b4458b042d0100ef964b6f7b5dd4d6f5569.zip | |
ipmi_fru: drop unused sd_bus pointer
Drop unused sd_bus pointer from fru_info class.
Change-Id: Id93412c17d15118e8e6f66736c9dc74289392fa4
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | fru-area.hpp | 5 | ||||
| -rw-r--r-- | writefrudata.cpp | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/fru-area.hpp b/fru-area.hpp index 038e237..fce830d 100644 --- a/fru-area.hpp +++ b/fru-area.hpp @@ -51,16 +51,13 @@ class ipmi_fru // fru inventory dbus interface name std::string iv_intf_name; - // sd_bus handle - sd_bus* iv_bus_type = nullptr; - // Default constructor disabled. ipmi_fru(); public: // constructor ipmi_fru(const uint8_t fruid, const ipmi_fru_area_type type, - sd_bus* bus_type, bool bmc_fru = false); + bool bmc_fru = false); // Destructor virtual ~ipmi_fru(); diff --git a/writefrudata.cpp b/writefrudata.cpp index 50d1fb0..41c1402 100644 --- a/writefrudata.cpp +++ b/writefrudata.cpp @@ -278,12 +278,11 @@ int updateInventory(fru_area_vec_t& area_vec, sd_bus* bus_sd) // Constructor //---------------------------------------------------------------- ipmi_fru::ipmi_fru(const uint8_t fruid, const ipmi_fru_area_type type, - sd_bus* bus_type, bool bmc_fru) + bool bmc_fru) { iv_fruid = fruid; iv_type = type; iv_bmc_fru = bmc_fru; - iv_bus_type = bus_type; iv_valid = false; iv_data = NULL; iv_present = false; @@ -602,7 +601,7 @@ int validateFRUArea(const uint8_t fruid, const char* fru_file_name, { // Create an object and push onto a vector. std::unique_ptr<ipmi_fru> fru_area = std::make_unique<ipmi_fru>( - fruid, get_fru_area_type(fru_entry), bus_type, bmc_fru); + fruid, get_fru_area_type(fru_entry), bmc_fru); // Physically being present bool present = access(fru_file_name, F_OK) == 0; |
