diff options
| author | Patrick Venture <venture@google.com> | 2018-10-21 13:18:17 -0700 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2018-10-30 08:28:31 -0700 |
| commit | 9f65a08f8c8774a7c6a7661f46fe4e4a02f5c393 (patch) | |
| tree | 08168cd79bc7c5acec6703310f2923d435e53f63 | |
| parent | 8e19f5bc5c4a7c34775976133f01ec904660e75a (diff) | |
| download | ipmi-fru-parser-9f65a08f8c8774a7c6a7661f46fe4e4a02f5c393.tar.gz ipmi-fru-parser-9f65a08f8c8774a7c6a7661f46fe4e4a02f5c393.zip | |
IPMIFruArea: rename member variables per openbmc style
OpenBMC style dictates member variables be lower camel and not snake
case.
Change-Id: I3e217b51f910612c3e5ecf1480340a27ef29d774
Signed-off-by: Patrick Venture <venture@google.com>
| -rw-r--r-- | fru_area.cpp | 14 | ||||
| -rw-r--r-- | fru_area.hpp | 22 |
2 files changed, 18 insertions, 18 deletions
diff --git a/fru_area.cpp b/fru_area.cpp index b983b53..b5d8960 100644 --- a/fru_area.cpp +++ b/fru_area.cpp @@ -11,10 +11,10 @@ using namespace phosphor::logging; //---------------------------------------------------------------- // Constructor //---------------------------------------------------------------- -IPMIFruArea::IPMIFruArea(const uint8_t fruid, const ipmi_fru_area_type type, - bool bmc_fru) : - fruid(fruid), - type(type), bmc_fru(bmc_fru) +IPMIFruArea::IPMIFruArea(const uint8_t fruID, const ipmi_fru_area_type type, + bool bmcOnlyFru) : + fruID(fruID), + type(type), bmcOnlyFru(bmcOnlyFru) { if (type == IPMI_FRU_AREA_INTERNAL_USE) { @@ -60,9 +60,9 @@ void IPMIFruArea::setData(const uint8_t* value, const size_t length) void IPMIFruArea::updateDbusPaths(const char* bus, const char* path, const char* intf) { - bus_name = bus; - obj_path = path; - intf_name = intf; + busName = bus; + objectPath = path; + interfaceName = intf; } //------------------- diff --git a/fru_area.hpp b/fru_area.hpp index 2605294..28d50be 100644 --- a/fru_area.hpp +++ b/fru_area.hpp @@ -17,8 +17,8 @@ class IPMIFruArea IPMIFruArea() = delete; // constructor - IPMIFruArea(const uint8_t fruid, const ipmi_fru_area_type type, - bool bmc_fru = false); + IPMIFruArea(const uint8_t fruID, const ipmi_fru_area_type type, + bool bmcOnlyFru = false); // Destructor virtual ~IPMIFruArea(); @@ -32,7 +32,7 @@ class IPMIFruArea // returns fru id; uint8_t getFruID() const { - return fruid; + return fruID; } // Returns the length. @@ -56,19 +56,19 @@ class IPMIFruArea // Returns SD bus name const char* getBusName() const { - return bus_name.c_str(); + return busName.c_str(); } // Retrns SD bus object path const char* getObjectPath() const { - return obj_path.c_str(); + return objectPath.c_str(); } // Returns SD bus interface name const char* getInterfaceName() const { - return intf_name.c_str(); + return interfaceName.c_str(); } // Returns the data portion @@ -85,7 +85,7 @@ class IPMIFruArea private: // Unique way of identifying a FRU - uint8_t fruid = 0; + uint8_t fruID = 0; // Type of the fru matching offsets in common header ipmi_fru_area_type type = IPMI_FRU_AREA_INTERNAL_USE; @@ -97,7 +97,7 @@ class IPMIFruArea size_t len = 0; // Special bit for BMC readable eeprom only. - bool bmc_fru = false; + bool bmcOnlyFru = false; // If a FRU is physically present. bool isPresent = false; @@ -109,13 +109,13 @@ class IPMIFruArea uint8_t* data = nullptr; // fru inventory dbus name - std::string bus_name; + std::string busName; // fru inventory dbus object path - std::string obj_path; + std::string objectPath; // fru inventory dbus interface name - std::string intf_name; + std::string interfaceName; }; #endif |

