diff options
| author | Alexander Amelkin <alexander@amelkin.msk.ru> | 2018-07-20 14:09:56 +0300 |
|---|---|---|
| committer | Alexander Amelkin <alexander@amelkin.msk.ru> | 2018-07-20 14:23:33 +0300 |
| commit | 928716244dfc3289ff4d33632d08451497366f64 (patch) | |
| tree | c51976185ffa2a42961abf94c55ccc0ab03f5996 /lib/ipmi_sdr.c | |
| parent | 2de8a5e1a9441ad1300aa485b00f37b1c06f56ac (diff) | |
| download | ipmitool-928716244dfc3289ff4d33632d08451497366f64.tar.gz | |
sdr: Refactor/optimize code. No functional changes.
Diffstat (limited to 'lib/ipmi_sdr.c')
| -rw-r--r-- | lib/ipmi_sdr.c | 61 |
1 files changed, 18 insertions, 43 deletions
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c index 167c252..b4eac1d 100644 --- a/lib/ipmi_sdr.c +++ b/lib/ipmi_sdr.c @@ -4274,50 +4274,25 @@ ipmi_sdr_print_info(struct ipmi_intf *intf) break; } - if(sdr_repository_info.delete_sdr_supported && sdr_repository_info.partial_add_sdr_supported) + printf("Most recent Addition : "); + if (sdr_repository_info.partial_add_sdr_supported) { - timestamp = - (sdr_repository_info.most_recent_addition_timestamp[3] << 24) | - (sdr_repository_info.most_recent_addition_timestamp[2] << 16) | - (sdr_repository_info.most_recent_addition_timestamp[1] << 8) | - sdr_repository_info.most_recent_addition_timestamp[0]; - printf("Most recent Addition : %s\n", - ipmi_sdr_timestamp(timestamp)); - - timestamp = - (sdr_repository_info.most_recent_erase_timestamp[3] << 24) | - (sdr_repository_info.most_recent_erase_timestamp[2] << 16) | - (sdr_repository_info.most_recent_erase_timestamp[1] << 8) | - sdr_repository_info.most_recent_erase_timestamp[0]; - printf("Most recent Erase : %s\n", - ipmi_sdr_timestamp(timestamp)); - } - else if (sdr_repository_info.partial_add_sdr_supported) - { - timestamp = - (sdr_repository_info.most_recent_addition_timestamp[3] << 24) | - (sdr_repository_info.most_recent_addition_timestamp[2] << 16) | - (sdr_repository_info.most_recent_addition_timestamp[1] << 8) | - sdr_repository_info.most_recent_addition_timestamp[0]; - printf("Most recent Addition : %s\n", - ipmi_sdr_timestamp(timestamp)); - printf("Most recent Erase : NA\n"); - } - else if(sdr_repository_info.delete_sdr_supported) - { - printf("Most recent Addition : NA\n"); - timestamp = - (sdr_repository_info.most_recent_erase_timestamp[3] << 24) | - (sdr_repository_info.most_recent_erase_timestamp[2] << 16) | - (sdr_repository_info.most_recent_erase_timestamp[1] << 8) | - sdr_repository_info.most_recent_erase_timestamp[0]; - printf("Most recent Erase : %s\n", - ipmi_sdr_timestamp(timestamp)); + timestamp = ipmi32toh(sdr_repository_info + .most_recent_addition_timestamp); + printf("%s\n", ipmi_sdr_timestamp(timestamp)); } - else - { - printf("Most recent Addition : NA\n"); - printf("Most recent Erase : NA\n"); + else { + printf("NA\n"); + } + + printf("Most recent Erase : "); + if(sdr_repository_info.delete_sdr_supported) { + timestamp = ipmi32toh(sdr_repository_info + .most_recent_erase_timestamp); + printf("%s\n", ipmi_sdr_timestamp(timestamp)); + } + else { + printf("NA\n"); } printf("SDR overflow : %s\n", @@ -4351,7 +4326,7 @@ ipmi_sdr_print_info(struct ipmi_intf *intf) reserve_sdr_repository_supported ? "yes" : "no"); printf("SDR Repository Alloc info supported : %s\n", sdr_repository_info. - get_sdr_repository_allo_info_supported ? "yes" : "no"); + get_sdr_repository_allo_info_supported ? "yes" : "no"); return 0; } |