deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-10 10:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ID: 65 - Fixes for configure.in for cross compilation

Browse Source 
Commit is a small re-work of ipmi_ek_display_chassis_info_area() (not limited)
to get rid off warnings.
This commit is contained in:
Zdenek Styblik 2013-07-24 05:32:42 +00:00
parent 4aea72e46f
commit dd377108ee
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ipmitool/lib/ipmi_ekanalyzer.c
View File

@ -277,7 +277,7 @@ static int ipmi_ek_display_fru_header( char * filename );
static int ipmi_ek_display_fru_header_detail(char * filename); static int ipmi_ek_display_fru_header_detail(char * filename);
static void ipmi_ek_display_chassis_info_area( FILE * input_file, long offset ); static int ipmi_ek_display_chassis_info_area(FILE * input_file, long offset);
static size_t ipmi_ek_display_board_info_area( FILE * input_file, static size_t ipmi_ek_display_board_info_area( FILE * input_file,
char * board_type, unsigned int * board_length ); char * board_type, unsigned int * board_length );
@ -2496,7 +2496,7 @@ ipmi_ek_display_fru_header_detail(char * filename)
if (header.offset.chassis != 0) { if (header.offset.chassis != 0) {
long offset = 0; long offset = 0;
offset = header.offset.chassis * FACTOR_OFFSET; offset = header.offset.chassis * FACTOR_OFFSET;
ipmi_ek_display_chassis_info_area(input_file, offset); ret = ipmi_ek_display_chassis_info_area(input_file, offset);
} }
/*** Display FRU Board Info Area ***/ /*** Display FRU Board Info Area ***/
while (1) { while (1) {
@ -2621,60 +2621,66 @@ ipmi_ek_display_fru_header_detail(char * filename)
* Return: None * Return: None
* *
***************************************************************************/ ***************************************************************************/
static void static int
ipmi_ek_display_chassis_info_area(FILE * input_file, long offset) ipmi_ek_display_chassis_info_area(FILE * input_file, long offset)
{ {
size_t file_offset;
int ret = 0;
unsigned char data = 0; unsigned char data = 0;
unsigned char ch_len = 0; unsigned char ch_len = 0;
unsigned char ch_type = 0; unsigned char ch_type = 0;
unsigned int len; unsigned int len;
size_t file_offset;
if (input_file == NULL) { if (input_file == NULL) {
return; lprintf(LOG_ERR, "No file stream to read.");
return (-1);
} }
printf("%s\n", EQUAL_LINE_LIMITER); printf("%s\n", EQUAL_LINE_LIMITER);
printf("Chassis Info Area\n"); printf("Chassis Info Area\n");
printf("%s\n", EQUAL_LINE_LIMITER); printf("%s\n", EQUAL_LINE_LIMITER);
ret = fseek(input_file, offset, SEEK_SET);
fseek(input_file, offset, SEEK_SET);
if (feof(input_file)) { if (feof(input_file)) {
lprintf(LOG_ERR, "Invalid Chassis Info Area!"); lprintf(LOG_ERR, "Invalid Chassis Info Area!");
return; return (-1);
}
ret = fread(&data, 1, 1, input_file);
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid Version Number!");
return (-1);
} }
fread(&data, 1, 1, input_file);
printf("Format Version Number: %d\n", (data & 0x0f)); printf("Format Version Number: %d\n", (data & 0x0f));
if (feof(input_file)) { ret = fread(&ch_len, 1, 1, input_file);
return; if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid length!");
return (-1);
} }
/* Have to read this into a char or else
* it ends up byte swapped on big endian machines
*/
fread(&ch_len, 1, 1, input_file);
/* len is in factor of 8 bytes */ /* len is in factor of 8 bytes */
len = ch_len * 8; len = ch_len * 8;
printf("Area Length: %d\n", len); printf("Area Length: %d\n", len);
len -= 2; len -= 2;
if (feof(input_file)) { if (feof(input_file)) {
return; return (-1);
} }
/* Chassis Type*/ /* Chassis Type*/
fread(&ch_type, 1, 1, input_file); ret = fread(&ch_type, 1, 1, input_file);
if ((ret != 1) || ferror(input_file)) {
lprintf(LOG_ERR, "Invalid Chassis Type!");
return (-1);
}
printf("Chassis Type: %d\n", ch_type); printf("Chassis Type: %d\n", ch_type);
len--; len--;
/* Chassis Part Number*/ /* Chassis Part Number*/
file_offset = ipmi_ek_display_board_info_area(input_file, file_offset = ipmi_ek_display_board_info_area(input_file,
"Chassis Part Number", &len); "Chassis Part Number", &len);
fseek(input_file, file_offset, SEEK_SET); ret = fseek(input_file, file_offset, SEEK_SET);
/* Chassis Serial */ /* Chassis Serial */
file_offset = ipmi_ek_display_board_info_area(input_file, file_offset = ipmi_ek_display_board_info_area(input_file,
"Chassis Serial Number", &len); "Chassis Serial Number", &len);
fseek(input_file, file_offset, SEEK_SET); ret = fseek(input_file, file_offset, SEEK_SET);
/* Custom product info area */ /* Custom product info area */
file_offset = ipmi_ek_display_board_info_area(input_file, file_offset = ipmi_ek_display_board_info_area(input_file,
"Custom", &len); "Custom", &len);
return 0;
} }
/************************************************************************** /**************************************************************************