diff options
| -rw-r--r-- | readeeprom.cpp | 3 | ||||
| -rw-r--r-- | strgfnhandler.cpp | 2 | ||||
| -rw-r--r-- | writefrudata.cpp | 4 | ||||
| -rw-r--r-- | writefrudata.hpp | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/readeeprom.cpp b/readeeprom.cpp index 96a8cc1..a9dd91d 100644 --- a/readeeprom.cpp +++ b/readeeprom.cpp @@ -69,8 +69,7 @@ int main(int argc, char** argv) // Now that we have the file that contains the eeprom data, go read it // and update the Inventory DB. bool bmc_fru = true; - rc = ipmi_validate_fru_area(fruid, eeprom_file.c_str(), bus_type, - bmc_fru); + rc = validateFRUArea(fruid, eeprom_file.c_str(), bus_type, bmc_fru); } // Cleanup diff --git a/strgfnhandler.cpp b/strgfnhandler.cpp index a7c4b42..a00fc73 100644 --- a/strgfnhandler.cpp +++ b/strgfnhandler.cpp @@ -101,7 +101,7 @@ ipmi_ret_t ipmi_storage_write_fru_data(ipmi_netfn_t netfn, ipmi_cmd_t cmd, // We received some bytes. It may be full or partial. Send a valid // FRU file to the inventory controller on DBus for the correct number bool bmc_fru = false; - ipmi_validate_fru_area(reqptr->frunum, fru_file_name, bus_type, bmc_fru); + validateFRUArea(reqptr->frunum, fru_file_name, bus_type, bmc_fru); return rc; } diff --git a/writefrudata.cpp b/writefrudata.cpp index 704df12..84d7527 100644 --- a/writefrudata.cpp +++ b/writefrudata.cpp @@ -581,8 +581,8 @@ int cleanup_error(FILE* fru_fp, fru_area_vec_t& fru_area_vec) ///----------------------------------------------------- // Accepts the filename and validates per IPMI FRU spec //---------------------------------------------------- -int ipmi_validate_fru_area(const uint8_t fruid, const char* fru_file_name, - sd_bus* bus_type, const bool bmc_fru) +int validateFRUArea(const uint8_t fruid, const char* fru_file_name, + sd_bus* bus_type, const bool bmc_fru) { size_t data_len = 0; size_t bytes_read = 0; diff --git a/writefrudata.hpp b/writefrudata.hpp index 1f3e49f..e713bd5 100644 --- a/writefrudata.hpp +++ b/writefrudata.hpp @@ -49,7 +49,7 @@ struct common_header * @param[in] bus_type - a systemd bus for publishing the information. * @param[in] bmc_fru - If a particular area accessible only by BMC. */ -int ipmi_validate_fru_area(const uint8_t fruid, const char* fru_file_name, - sd_bus* bus_type, const bool bmc_fru); +int validateFRUArea(const uint8_t fruid, const char* fru_file_name, + sd_bus* bus_type, const bool bmc_fru); #endif |
