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

fru: cleanup ipmi_fru_oemkontron_get

Browse Source 
Cleanup style in method ipmi_fru_oemkontron_get as well as add inverted
logic checks to reduce indentation.

Signed-off-by: Patrick Venture <venture@google.com>
This commit is contained in:
Patrick Venture 2018-11-29 15:03:59 -08:00 committed by Alexander Amelkin
parent 6d515dd06b
commit 92ee477cde
1 changed files with 77 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
lib/ipmi_fru.c
View File

@ -40,6 +40,7 @@
#include <ipmitool/ipmi_strings.h> /* IANA id strings */ #include <ipmitool/ipmi_strings.h> /* IANA id strings */
#include <ipmitool/ipmi_time.h> #include <ipmitool/ipmi_time.h>
#include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -1616,7 +1617,7 @@ static void ipmi_fru_oemkontron_get(int argc,
int off, int off,
struct fru_multirec_oem_header *oh) struct fru_multirec_oem_header *oh)
{ {
static int badParams=FALSE; static bool badParams = false;
int start = off; int start = off;
int offset = start; int offset = start;
offset += sizeof(struct fru_multirec_oem_header); offset += sizeof(struct fru_multirec_oem_header);
@ -1626,104 +1627,102 @@ static void ipmi_fru_oemkontron_get(int argc,
if( argc > OEM_KONTRON_SUBCOMMAND_ARG_POS ){ if( argc > OEM_KONTRON_SUBCOMMAND_ARG_POS ){
if(strncmp("oem", argv[OEM_KONTRON_SUBCOMMAND_ARG_POS],3)){ if(strncmp("oem", argv[OEM_KONTRON_SUBCOMMAND_ARG_POS],3)){
printf("usage: fru get <id> <oem>\n"); printf("usage: fru get <id> <oem>\n");
badParams = TRUE; badParams = true;
return; return;
} }
} }
if( argc<GET_OEM_KONTRON_COMPLETE_ARG_COUNT ){ if( argc<GET_OEM_KONTRON_COMPLETE_ARG_COUNT ){
printf("usage: oem <iana> <recordid>\n"); printf("usage: oem <iana> <recordid>\n");
printf("usage: oem 15000 3\n"); printf("usage: oem 15000 3\n");
badParams = TRUE; badParams = true;
return; return;
} }
} }
if(!badParams){ if (badParams) {
return;
}
if(oh->record_id == OEM_KONTRON_INFORMATION_RECORD ) { if (oh->record_id != OEM_KONTRON_INFORMATION_RECORD) {
return;
}
uint8_t version; uint8_t version;
printf("Kontron OEM Information Record\n"); printf("Kontron OEM Information Record\n");
version = oh->record_version; version = oh->record_version;
uint8_t blockCount; uint8_t blockCount;
uint8_t blockIndex=0; uint8_t blockIndex = 0;
unsigned int matchInstance = 0; unsigned int matchInstance = 0;
uint8_t instance = 0; uint8_t instance = 0;
if (str2uchar(argv[OEM_KONTRON_INSTANCE_ARG_POS], &instance) != 0) {
lprintf(LOG_ERR,
"Instance argument '%s' is either invalid or out of range.",
argv[OEM_KONTRON_INSTANCE_ARG_POS]);
badParams = TRUE;
return;
}
blockCount = fru_data[offset++]; if (str2uchar(argv[OEM_KONTRON_INSTANCE_ARG_POS], &instance) != 0) {
lprintf(LOG_ERR,
"Instance argument '%s' is either invalid or out of range.",
argv[OEM_KONTRON_INSTANCE_ARG_POS]);
badParams = true;
return;
}
for(blockIndex=0;blockIndex<blockCount;blockIndex++){ blockCount = fru_data[offset++];
void * pRecordData;
uint8_t nameLen;
nameLen = ( fru_data[offset++] &= 0x3F ); for (blockIndex = 0; blockIndex < blockCount; blockIndex++) {
printf(" Name: %*.*s\n",nameLen, nameLen, (const char *)(fru_data+offset)); void *pRecordData;
uint8_t nameLen;
offset+=nameLen; nameLen = (fru_data[offset++] &= 0x3F);
printf(" Name: %*.*s\n", nameLen, nameLen,
(const char *)(fru_data + offset));
pRecordData = &fru_data[offset]; offset += nameLen;
printf(" Record Version: %d\n", version); pRecordData = &fru_data[offset];
if( version == 0 )
{ printf(" Record Version: %d\n", version);
printf(" Version: %*.*s\n", if (version == 0) {
OEM_KONTRON_FIELD_SIZE, printf(" Version: %*.*s\n",
OEM_KONTRON_FIELD_SIZE, OEM_KONTRON_FIELD_SIZE,
((tOemKontronInformationRecordV0 *) pRecordData)->field1); OEM_KONTRON_FIELD_SIZE,
printf(" Build Date: %*.*s\n", ((tOemKontronInformationRecordV0 *)pRecordData)->field1);
OEM_KONTRON_FIELD_SIZE, printf(" Build Date: %*.*s\n",
OEM_KONTRON_FIELD_SIZE, OEM_KONTRON_FIELD_SIZE,
((tOemKontronInformationRecordV0 *) pRecordData)->field2); OEM_KONTRON_FIELD_SIZE,
printf(" Update Date: %*.*s\n", ((tOemKontronInformationRecordV0 *)pRecordData)->field2);
OEM_KONTRON_FIELD_SIZE, printf(" Update Date: %*.*s\n",
OEM_KONTRON_FIELD_SIZE, OEM_KONTRON_FIELD_SIZE,
((tOemKontronInformationRecordV0 *) pRecordData)->field3); OEM_KONTRON_FIELD_SIZE,
printf(" Checksum: %*.*s\n\n", ((tOemKontronInformationRecordV0 *)pRecordData)->field3);
OEM_KONTRON_FIELD_SIZE, printf(" Checksum: %*.*s\n\n",
OEM_KONTRON_FIELD_SIZE, OEM_KONTRON_FIELD_SIZE,
((tOemKontronInformationRecordV0 *) pRecordData)->crc32); OEM_KONTRON_FIELD_SIZE,
matchInstance++; ((tOemKontronInformationRecordV0 *)pRecordData)->crc32);
offset+= sizeof(tOemKontronInformationRecordV0); matchInstance++;
offset++; offset += sizeof(tOemKontronInformationRecordV0);
} offset++;
else if ( version == 1 ) } else if (version == 1) {
{ printf(" Version: %*.*s\n",
printf(" Version: %*.*s\n", OEM_KONTRON_VERSION_FIELD_SIZE,
OEM_KONTRON_VERSION_FIELD_SIZE, OEM_KONTRON_VERSION_FIELD_SIZE,
OEM_KONTRON_VERSION_FIELD_SIZE, ((tOemKontronInformationRecordV1 *)pRecordData)->field1);
((tOemKontronInformationRecordV1 *) pRecordData)->field1); printf(" Build Date: %*.*s\n",
printf(" Build Date: %*.*s\n", OEM_KONTRON_FIELD_SIZE,
OEM_KONTRON_FIELD_SIZE, OEM_KONTRON_FIELD_SIZE,
OEM_KONTRON_FIELD_SIZE, ((tOemKontronInformationRecordV1 *)pRecordData)->field2);
((tOemKontronInformationRecordV1 *) pRecordData)->field2); printf(" Update Date: %*.*s\n",
printf(" Update Date: %*.*s\n", OEM_KONTRON_FIELD_SIZE,
OEM_KONTRON_FIELD_SIZE, OEM_KONTRON_FIELD_SIZE,
OEM_KONTRON_FIELD_SIZE, ((tOemKontronInformationRecordV1 *)pRecordData)->field3);
((tOemKontronInformationRecordV1 *) pRecordData)->field3); printf(" Checksum: %*.*s\n\n",
printf(" Checksum: %*.*s\n\n", OEM_KONTRON_FIELD_SIZE,
OEM_KONTRON_FIELD_SIZE, OEM_KONTRON_FIELD_SIZE,
OEM_KONTRON_FIELD_SIZE, ((tOemKontronInformationRecordV1 *)pRecordData)->crc32);
((tOemKontronInformationRecordV1 *) pRecordData)->crc32); matchInstance++;
matchInstance++; offset += sizeof(tOemKontronInformationRecordV1);
offset+= sizeof(tOemKontronInformationRecordV1); offset++;
offset++; } else {
} printf(" Unsupported version %d\n", version);
else
{
printf (" Unsupported version %d\n",version);
}
}
} }
} }
} }