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: use bool with ipmi_fru_oemkontron_edit

Browse Source 
Convert ipmi_fru_oemkontron_edit to return a bool
type instead of an int used as a bool.

Signed-off-by: Patrick Venture <venture@google.com>
This commit is contained in:
Patrick Venture 2018-12-28 07:27:33 -08:00 committed by Alexander Amelkin
parent 8991f5a9a0
commit 6b003c3852
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ipmi_fru.c
View File

@ -1733,13 +1733,15 @@ static void ipmi_fru_oemkontron_get(int argc,
} }
} }
static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data, static
bool
ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
int off,int len, int off,int len,
struct fru_multirec_header *h, struct fru_multirec_header *h,
struct fru_multirec_oem_header *oh) struct fru_multirec_oem_header *oh)
{ {
static int badParams=FALSE; static bool badParams=false;
int hasChanged = FALSE; bool hasChanged = false;
int start = off; int start = off;
int offset = start; int offset = start;
int length = len; int length = len;
@ -1752,7 +1754,7 @@ static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
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 edit <id> <oem> <args...>\n"); printf("usage: fru edit <id> <oem> <args...>\n");
badParams = TRUE; badParams = true;
return hasChanged; return hasChanged;
} }
} }
@ -1760,14 +1762,14 @@ static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
printf("usage: oem <iana> <recordid> <format> <args...>\n"); printf("usage: oem <iana> <recordid> <format> <args...>\n");
printf("usage: oem 15000 3 0 <name> <instance> <field1>"\ printf("usage: oem 15000 3 0 <name> <instance> <field1>"\
" <field2> <field3> <crc32>\n"); " <field2> <field3> <crc32>\n");
badParams = TRUE; badParams = true;
return hasChanged; return hasChanged;
} }
if (str2uchar(argv[OEM_KONTRON_RECORDID_ARG_POS], &record_id) != 0) { if (str2uchar(argv[OEM_KONTRON_RECORDID_ARG_POS], &record_id) != 0) {
lprintf(LOG_ERR, lprintf(LOG_ERR,
"Record ID argument '%s' is either invalid or out of range.", "Record ID argument '%s' is either invalid or out of range.",
argv[OEM_KONTRON_RECORDID_ARG_POS]); argv[OEM_KONTRON_RECORDID_ARG_POS]);
badParams = TRUE; badParams = true;
return hasChanged; return hasChanged;
} }
if (record_id == OEM_KONTRON_INFORMATION_RECORD) { if (record_id == OEM_KONTRON_INFORMATION_RECORD) {
@ -1776,7 +1778,7 @@ static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
(strlen(argv[i]) != OEM_KONTRON_VERSION_FIELD_SIZE)) { (strlen(argv[i]) != OEM_KONTRON_VERSION_FIELD_SIZE)) {
printf("error: version fields must have %d characters\n", printf("error: version fields must have %d characters\n",
OEM_KONTRON_FIELD_SIZE); OEM_KONTRON_FIELD_SIZE);
badParams = TRUE; badParams = true;
return hasChanged; return hasChanged;
} }
} }
@ -1793,7 +1795,7 @@ static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
lprintf(LOG_ERR, lprintf(LOG_ERR,
"Format argument '%s' is either invalid or out of range.", "Format argument '%s' is either invalid or out of range.",
argv[OEM_KONTRON_FORMAT_ARG_POS]); argv[OEM_KONTRON_FORMAT_ARG_POS]);
badParams = TRUE; badParams = true;
return hasChanged; return hasChanged;
} }
@ -1811,7 +1813,7 @@ static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
lprintf(LOG_ERR, lprintf(LOG_ERR,
"Instance argument '%s' is either invalid or out of range.", "Instance argument '%s' is either invalid or out of range.",
argv[OEM_KONTRON_INSTANCE_ARG_POS]); argv[OEM_KONTRON_INSTANCE_ARG_POS]);
badParams = TRUE; badParams = true;
return hasChanged; return hasChanged;
} }
@ -1874,7 +1876,7 @@ static int ipmi_fru_oemkontron_edit( int argc, char ** argv,uint8_t * fru_data,
} }
matchInstance++; matchInstance++;
hasChanged = TRUE; hasChanged = true;
} }
else if(!strncmp((char *)argv[OEM_KONTRON_NAME_ARG_POS], else if(!strncmp((char *)argv[OEM_KONTRON_NAME_ARG_POS],
(const char *)(fru_data+offset), nameLen)){ (const char *)(fru_data+offset), nameLen)){