Refactor the initialization of the channel data from the JSON
Copy the data retrieved from the JSON data files only after the
contents of the two JSON configuration files have been read
successfully.
The code has also been changed to eliminate excess indentation in
order to improve its readability and maintainability.
Change-Id: I2def95b854bef39a9e7b196ef340c3a06965653a
Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>
diff --git a/user_channel/channel_mgmt.hpp b/user_channel/channel_mgmt.hpp
index 993b3d1..44aaed6 100644
--- a/user_channel/channel_mgmt.hpp
+++ b/user_channel/channel_mgmt.hpp
@@ -49,12 +49,12 @@
ChannelAccess chVolatileData;
};
-/** @struct ChannelData
+/** @struct ChannelProperties
*
* Structure for channel information - base structure to get all information
* about the channel.(refer spec sec 22.22 to 22.24)
*/
-struct ChannelData
+struct ChannelProperties
{
std::string chName;
uint8_t chID;
@@ -238,7 +238,7 @@
nullptr};
private:
- std::array<ChannelData, maxIpmiChannels> channelData;
+ std::array<ChannelProperties, maxIpmiChannels> channelData;
std::time_t nvFileLastUpdatedTime;
std::time_t voltFileLastUpdatedTime;
std::time_t getUpdatedFileTime(const std::string& fileName);