diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 22:59:06 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-05-08 22:59:06 +0200 |
| commit | a7c8ed90be739a49937a229828c470f1ad01396e (patch) | |
| tree | 4cd43ff357d98a1ce5afb3bb9449afcce5a299d1 /lib/ipmi_ekanalyzer.c | |
| parent | fa5ac2da06fae952fe1295a1e955bdb35e6d86c4 (diff) | |
| parent | 342ebce798fe98ede64939a49bbc3770d8214649 (diff) | |
Merge tag 'upstream/1.8.17'
Upstream version 1.8.17
Diffstat (limited to 'lib/ipmi_ekanalyzer.c')
| -rw-r--r-- | lib/ipmi_ekanalyzer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ipmi_ekanalyzer.c b/lib/ipmi_ekanalyzer.c index afee48b..d6ce4c7 100644 --- a/lib/ipmi_ekanalyzer.c +++ b/lib/ipmi_ekanalyzer.c @@ -458,7 +458,6 @@ ipmi_ekanalyzer_main(struct ipmi_intf *intf, int argc, char **argv) { int rc = ERROR_STATUS; int file_type[MAX_FILE_NUMBER]; - int tmp_ret = 0; char *filename[MAX_FILE_NUMBER]; unsigned int argument_offset = 0; unsigned int type_offset = 0; @@ -508,7 +507,7 @@ ipmi_ekanalyzer_main(struct ipmi_intf *intf, int argc, char **argv) rc = ipmi_ek_display_fru_header (filename[type_offset]); if (rc != ERROR_STATUS) { /* Display FRU header info in detail record */ - tmp_ret = ipmi_ek_display_fru_header_detail(filename[type_offset]); + rc = ipmi_ek_display_fru_header_detail(filename[type_offset]); /* Convert from binary data into multi record structure */ rc = ipmi_ekanalyzer_fru_file2structure (filename[type_offset], &list_head, &list_record, &list_last ); @@ -2425,7 +2424,7 @@ ipmi_ek_display_fru_header_detail(char *filename) return (-1); } /*** Display FRU Internal Use Info ***/ - if (!feof(input_file)) { + if (header.offset.internal != 0) { unsigned char format_version; unsigned long len = 0; @@ -2868,7 +2867,6 @@ ipmi_ek_display_product_info_area(FILE *input_file, long offset) return (-1); } - fread(&data, 1, 1, input_file); printf("Language Code: %d\n", data); len--; /* Product Mfg */ |