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

Finalize refactoring of string comparisons

Browse Source 
Unify the comparison idioms use.
Always use `if(!strcmp())` for "if string equals"
and `if(strcmp())` for "if string is not equal".
Never use `== 0` and `!= 0` with `strcmp()`.

Minor reformatting of the code immediately surrounding the
refactored lines.

Resolves ipmitool/ipmitool#104

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2020-06-10 02:18:46 +03:00 committed by Alexander Amelkin
parent e3fc775d26
commit 956ae2b372
33 changed files with 518 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/ipmi_channel.c
View File

@ -488,7 +488,7 @@ ipmi_get_channel_cipher_suites(struct ipmi_intf *intf,
req.msg.data_len = sizeof(rqdata);
rqdata[0] = channel;
rqdata[1] = ((strcmp(payload_type, "ipmi") == 0)? 0: 1);
rqdata[1] = strcmp(payload_type, "ipmi") ? 1 : 0;
do {
/* Always ask for cipher suite format */
@ -823,7 +823,7 @@ ipmi_set_user_access(struct ipmi_intf *intf, int argc, char **argv)
, IPMI_SESSION_PRIV_NOACCESS },
};
if (argc > 0 && strcmp(argv[0], "help") == 0) {
if (argc > 0 && !strcmp(argv[0], "help")) {
printf_channel_usage();
return 0;
} else if (argc < 3) {
@ -860,8 +860,7 @@ ipmi_set_user_access(struct ipmi_intf *intf, int argc, char **argv)
*options[j].val = boolval;
if (!strcmp(optval, "off")
|| !strcmp(optval, "disable")
|| !strcmp(optval, "no")
)
|| !strcmp(optval, "no"))
{
boolval = !boolval;
}
@ -912,10 +911,10 @@ ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
lprintf(LOG_ERR, "Not enough parameters given.");
printf_channel_usage();
return (-1);
} else if (strcmp(argv[0], "help") == 0) {
} else if (!strcmp(argv[0], "help")) {
printf_channel_usage();
return 0;
} else if (strcmp(argv[0], "authcap") == 0) {
} else if (!strcmp(argv[0], "authcap")) {
if (argc != 3) {
printf_channel_usage();
return (-1);
@ -925,7 +924,7 @@ ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
return (-1);
}
retval = ipmi_get_channel_auth_cap(intf, channel, priv);
} else if (strcmp(argv[0], "getaccess") == 0) {
} else if (!strcmp(argv[0], "getaccess")) {
uint8_t user_id = 0;
if ((argc < 2) || (argc > 3)) {
lprintf(LOG_ERR, "Not enough parameters given.");
@ -941,9 +940,9 @@ ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
}
}
retval = ipmi_get_user_access(intf, channel, user_id);
} else if (strcmp(argv[0], "setaccess") == 0) {
} else if (!strcmp(argv[0], "setaccess")) {
return ipmi_set_user_access(intf, (argc - 1), &(argv[1]));
} else if (strcmp(argv[0], "info") == 0) {
} else if (!strcmp(argv[0], "info")) {
channel = 0xE;
if (argc > 2) {
printf_channel_usage();
@ -955,7 +954,7 @@ ipmi_channel_main(struct ipmi_intf *intf, int argc, char **argv)
}
}
retval = ipmi_get_channel_info(intf, channel);
} else if (strcmp(argv[0], "getciphers") == 0) {
} else if (!strcmp(argv[0], "getciphers")) {
/* channel getciphers <ipmi|sol> [channel] */
channel = 0xE;
if ((argc < 2) || (argc > 3) ||

20
lib/ipmi_chassis.c
View File

@ -1071,23 +1071,23 @@ get_bootparam_options(char *optstring,
{NULL} /* End marker */
}, *op;
if (strcmp(optstring, "options=") != 0) {
if (strcmp(optstring, "options=")) {
lprintf(LOG_ERR, "No options= keyword found \"%s\"", optstring);
return -1;
}
token = strtok_r(optstring + 8, ",", &saveptr);
while (token) {
int setbit = 0;
if (strcmp(token, "help") == 0) {
if (!strcmp(token, "help")) {
optionError = 1;
break;
}
if (strcmp(token, "no-") == 0) {
if (!strcmp(token, "no-")) {
setbit = 1;
token += 3;
}
for (op = options; op->name; ++op) {
if (strcmp(token, op->name) == 0) {
if (!strcmp(token, op->name)) {
if (setbit) {
*set_flag |= op->value;
} else {
@ -1897,12 +1897,12 @@ bootdev_parse_options(char *optstring, uint8_t flags[])
memset(&flags[0], 0, BF_BYTE_COUNT);
token = strtok_r(optstring, ",", &saveptr);
while (token) {
if (strcmp(token, "help") == 0) {
if (!strcmp(token, "help")) {
optionError = 1;
break;
}
for (op = options; op->name; ++op) {
if (strcmp(token, op->name) == 0) {
if (!strcmp(token, op->name)) {
flags[op->offset] &= ~(op->mask);
flags[op->offset] |= op->value;
break;
@ -2044,9 +2044,11 @@ ipmi_chassis_main(struct ipmi_intf * intf, int argc, char ** argv)
else if (!strcmp(argv[1], "set")) {
unsigned char set_flag=0;
unsigned char clr_flag=0;
if (!strcmp(argv[2], "help") ||
argc < 4 || (argc >= 4 &&
strcmp(argv[2], "bootflag") != 0)) {
if (!strcmp(argv[2], "help")
|| argc < 4
|| (argc >= 4
&& strcmp(argv[2], "bootflag")))
{
ipmi_chassis_set_bootflag_help();
} else {
if (argc == 5) {

10
lib/ipmi_dcmi.c
View File

@ -3690,7 +3690,7 @@ ipmi_dcmi_main(struct ipmi_intf * intf, int argc, char **argv)
int i;
struct ipmi_rs *rsp;
if ((argc == 0) || (strcmp(argv[0], "help") == 0)) {
if (!argc || !strcmp(argv[0], "help")) {
print_strs(dcmi_cmd_vals,
"Data Center Management Interface commands",
LOG_ERR, 0);
@ -3804,7 +3804,7 @@ ipmi_dcmi_main(struct ipmi_intf * intf, int argc, char **argv)
{
switch (argc) {
case 2:
if (strcmp(argv[1], "activate_dhcp") != 0) {
if (strcmp(argv[1], "activate_dhcp")) {
print_strs( dcmi_conf_param_vals,
"DCMI Configuration Parameters",
LOG_ERR, 0);
@ -3812,14 +3812,14 @@ ipmi_dcmi_main(struct ipmi_intf * intf, int argc, char **argv)
}
break;
default:
if (argc != 3 || strcmp(argv[1], "help") == 0) {
if (argc != 3 || !strcmp(argv[1], "help")) {
print_strs(dcmi_conf_param_vals,
"DCMI Configuration Parameters",
LOG_ERR, 0);
return -1;
}
}
if (strcmp(argv[1], "activate_dhcp") == 0) {
if (!strcmp(argv[1], "activate_dhcp")) {
rsp = ipmi_dcmi_setconfparam(intf, 1, 1);
} else {
uint16_t tmp_val = 0;
@ -3873,7 +3873,7 @@ ipmi_nm_main(struct ipmi_intf * intf, int argc, char **argv)
{
struct nm_discover disc;
if ((argc == 0) || (strcmp(argv[0], "help") == 0)) {
if (!argc || !strcmp(argv[0], "help")) {
print_strs(nm_cmd_vals,
"Node Manager Interface commands",
LOG_ERR, 0);

204
lib/ipmi_delloem.c
View File

@ -269,25 +269,25 @@ ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv)
{
int rc = 0;
current_arg = 0;
if (argc == 0 || strcmp(argv[0], "help") == 0) {
if (!argc || !strcmp(argv[0], "help")) {
usage();
return 0;
}
if (0 ==strcmp(argv[current_arg], "lcd")) {
rc = ipmi_delloem_lcd_main(intf,argc,argv);
} else if (strcmp(argv[current_arg], "mac") == 0) {
} else if (!strcmp(argv[current_arg], "mac")) {
/* mac address*/
rc = ipmi_delloem_mac_main(intf,argc,argv);
} else if (strcmp(argv[current_arg], "lan") == 0) {
} else if (!strcmp(argv[current_arg], "lan")) {
/* lan address*/
rc = ipmi_delloem_lan_main(intf,argc,argv);
} else if (strcmp(argv[current_arg], "setled") == 0) {
} else if (!strcmp(argv[current_arg], "setled")) {
/* SetLED support */
rc = ipmi_delloem_setled_main(intf,argc,argv);
} else if (strcmp(argv[current_arg], "powermonitor") == 0) {
} else if (!strcmp(argv[current_arg], "powermonitor")) {
/*Powermanagement report processing*/
rc = ipmi_delloem_powermonitor_main(intf,argc,argv);
} else if (strcmp(argv[current_arg], "vFlash") == 0) {
} else if (!strcmp(argv[current_arg], "vFlash")) {
/* vFlash Support */
rc = ipmi_delloem_vFlash_main(intf,argc,argv);
} else {
@ -359,7 +359,7 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
return -1;
}
/* ipmitool delloem lcd info*/
if (argc == 1 || strcmp(argv[current_arg], "help") == 0) {
if (argc == 1 || !strcmp(argv[current_arg], "help")) {
ipmi_lcd_usage();
return 0;
}
@ -368,15 +368,15 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
if (!IsLCDSupported()) {
lprintf(LOG_ERR, "lcd is not supported on this system.");
return -1;
} else if (strcmp(argv[current_arg], "info") == 0) {
} else if (!strcmp(argv[current_arg], "info")) {
if (iDRAC_FLAG_ALL) {
rc = ipmi_lcd_get_info_wh(intf);
} else {
rc = ipmi_lcd_get_info(intf);
}
} else if (strcmp(argv[current_arg], "status") == 0) {
} else if (!strcmp(argv[current_arg], "status")) {
rc = ipmi_lcd_get_status(intf);
} else if (strcmp(argv[current_arg], "set") == 0) {
} else if (!strcmp(argv[current_arg], "set")) {
/* ipmitool delloem lcd set*/
uint8_t line_number = 0;
current_arg++;
@ -384,7 +384,7 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_lcd_usage();
return -1;
}
if (strcmp(argv[current_arg], "line") == 0) {
if (!strcmp(argv[current_arg], "line")) {
current_arg++;
if (argc <= current_arg) {
usage();
@ -402,8 +402,9 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
return -1;
}
}
if ((strcmp(argv[current_arg], "mode") == 0)
&& (iDRAC_FLAG_ALL)) {
if (!strcmp(argv[current_arg], "mode")
&& iDRAC_FLAG_ALL)
{
current_arg++;
if (argc <= current_arg) {
ipmi_lcd_usage();
@ -413,13 +414,13 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_lcd_usage();
return -1;
}
if (strcmp(argv[current_arg], "none") == 0) {
if (!strcmp(argv[current_arg], "none")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_CONFIG_NONE, 0xFF,
0XFF, NULL);
} else if (strcmp(argv[current_arg], "modelname") == 0) {
} else if (!strcmp(argv[current_arg], "modelname")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_CONFIG_DEFAULT, 0xFF,
0XFF, NULL);
} else if (strcmp(argv[current_arg], "userdefined") == 0) {
} else if (!strcmp(argv[current_arg], "userdefined")) {
current_arg++;
if (argc <= current_arg) {
ipmi_lcd_usage();
@ -427,39 +428,40 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
}
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_CONFIG_USER_DEFINED,
0xFF, 0XFF, argv[current_arg]);
} else if (strcmp(argv[current_arg], "ipv4address") == 0) {
} else if (!strcmp(argv[current_arg], "ipv4address")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_iDRAC_IPV4ADRESS,
0xFF, 0XFF, NULL);
} else if (strcmp(argv[current_arg], "macaddress") == 0) {
} else if (!strcmp(argv[current_arg], "macaddress")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_IDRAC_MAC_ADDRESS,
0xFF, 0XFF, NULL);
} else if (strcmp(argv[current_arg], "systemname") == 0) {
} else if (!strcmp(argv[current_arg], "systemname")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_OS_SYSTEM_NAME, 0xFF,
0XFF, NULL);
} else if (strcmp(argv[current_arg], "servicetag") == 0) {
} else if (!strcmp(argv[current_arg], "servicetag")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_SERVICE_TAG, 0xFF,
0XFF, NULL);
} else if (strcmp(argv[current_arg], "ipv6address") == 0) {
} else if (!strcmp(argv[current_arg], "ipv6address")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_iDRAC_IPV6ADRESS,
0xFF, 0XFF, NULL);
} else if (strcmp(argv[current_arg], "ambienttemp") == 0) {
} else if (!strcmp(argv[current_arg], "ambienttemp")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_AMBEINT_TEMP, 0xFF,
0XFF, NULL);
} else if (strcmp(argv[current_arg], "systemwatt") == 0) {
} else if (!strcmp(argv[current_arg], "systemwatt")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_SYSTEM_WATTS, 0xFF,
0XFF, NULL);
} else if (strcmp(argv[current_arg], "assettag") == 0) {
} else if (!strcmp(argv[current_arg], "assettag")) {
rc = ipmi_lcd_configure_wh(intf, IPMI_DELL_LCD_ASSET_TAG, 0xFF,
0XFF, NULL);
} else if (strcmp(argv[current_arg], "help") == 0) {
} else if (!strcmp(argv[current_arg], "help")) {
ipmi_lcd_usage();
} else {
lprintf(LOG_ERR, "Invalid DellOEM command: %s",
argv[current_arg]);
ipmi_lcd_usage();
}
} else if ((strcmp(argv[current_arg], "lcdqualifier") == 0)
&& (iDRAC_FLAG_ALL)) {
} else if (!strcmp(argv[current_arg], "lcdqualifier")
&& iDRAC_FLAG_ALL)
{
current_arg++;
if (argc <= current_arg) {
ipmi_lcd_usage();
@ -469,23 +471,24 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_lcd_usage();
return -1;
}
if (strcmp(argv[current_arg], "watt") == 0) {
if (!strcmp(argv[current_arg], "watt")) {
rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x00, 0XFF, NULL);
} else if (strcmp(argv[current_arg], "btuphr") == 0) {
} else if (!strcmp(argv[current_arg], "btuphr")) {
rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x01, 0XFF, NULL);
} else if (strcmp(argv[current_arg], "celsius") == 0) {
} else if (!strcmp(argv[current_arg], "celsius")) {
rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x02, 0xFF, NULL);
} else if (strcmp(argv[current_arg], "fahrenheit") == 0) {
} else if (!strcmp(argv[current_arg], "fahrenheit")) {
rc = ipmi_lcd_configure_wh(intf, 0xFF, 0x03, 0xFF, NULL);
} else if (strcmp(argv[current_arg], "help") == 0) {
} else if (!strcmp(argv[current_arg], "help")) {
ipmi_lcd_usage();
} else {
lprintf(LOG_ERR, "Invalid DellOEM command: %s",
argv[current_arg]);
ipmi_lcd_usage();
}
} else if ((strcmp(argv[current_arg], "errordisplay") == 0)
&& (iDRAC_FLAG_ALL)) {
} else if (!strcmp(argv[current_arg], "errordisplay")
&& iDRAC_FLAG_ALL)
{
current_arg++;
if (argc <= current_arg) {
ipmi_lcd_usage();
@ -495,27 +498,30 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_lcd_usage();
return -1;
}
if (strcmp(argv[current_arg], "sel") == 0) {
if (!strcmp(argv[current_arg], "sel")) {
rc = ipmi_lcd_configure_wh(intf, 0xFF, 0xFF,
IPMI_DELL_LCD_ERROR_DISP_SEL, NULL);
} else if (strcmp(argv[current_arg], "simple") == 0) {
} else if (!strcmp(argv[current_arg], "simple")) {
rc = ipmi_lcd_configure_wh(intf, 0xFF, 0xFF,
IPMI_DELL_LCD_ERROR_DISP_VERBOSE, NULL);
} else if (strcmp(argv[current_arg], "help") == 0) {
} else if (!strcmp(argv[current_arg], "help")) {
ipmi_lcd_usage();
} else {
lprintf(LOG_ERR, "Invalid DellOEM command: %s",
argv[current_arg]);
ipmi_lcd_usage();
}
} else if ((strcmp(argv[current_arg], "none") == 0)
&& (iDRAC_FLAG==0)) {
} else if (!strcmp(argv[current_arg], "none")
&& iDRAC_FLAG==0)
{
rc = ipmi_lcd_configure(intf, IPMI_DELL_LCD_CONFIG_NONE, NULL);
} else if ((strcmp(argv[current_arg], "default") == 0)
&& (iDRAC_FLAG==0)) {
} else if (!strcmp(argv[current_arg], "default")
&& iDRAC_FLAG==0)
{
rc = ipmi_lcd_configure(intf, IPMI_DELL_LCD_CONFIG_DEFAULT, NULL);
} else if ((strcmp(argv[current_arg], "custom") == 0)
&& (iDRAC_FLAG==0)) {
} else if (!strcmp(argv[current_arg], "custom")
&& iDRAC_FLAG==0)
{
current_arg++;
if (argc <= current_arg) {
ipmi_lcd_usage();
@ -523,43 +529,43 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv)
}
rc = ipmi_lcd_configure(intf, IPMI_DELL_LCD_CONFIG_USER_DEFINED,
argv[current_arg]);
} else if (strcmp(argv[current_arg], "vkvm") == 0) {
} else if (!strcmp(argv[current_arg], "vkvm")) {
current_arg++;
if (argc <= current_arg) {
ipmi_lcd_usage();
return -1;
}
if (strcmp(argv[current_arg], "active") == 0) {
if (!strcmp(argv[current_arg], "active")) {
rc = ipmi_lcd_set_kvm(intf, 1);
} else if (strcmp(argv[current_arg], "inactive") == 0) {
} else if (!strcmp(argv[current_arg], "inactive")) {
rc = ipmi_lcd_set_kvm(intf, 0);
} else if (strcmp(argv[current_arg], "help") == 0) {
} else if (!strcmp(argv[current_arg], "help")) {
ipmi_lcd_usage();
} else {
lprintf(LOG_ERR, "Invalid DellOEM command: %s",
argv[current_arg]);
ipmi_lcd_usage();
}
} else if (strcmp(argv[current_arg], "frontpanelaccess") == 0) {
} else if (!strcmp(argv[current_arg], "frontpanelaccess")) {
current_arg++;
if (argc <= current_arg) {
ipmi_lcd_usage();
return -1;
}
if (strcmp(argv[current_arg], "viewandmodify") == 0) {
if (!strcmp(argv[current_arg], "viewandmodify")) {
rc = ipmi_lcd_set_lock(intf, 0);
} else if (strcmp(argv[current_arg], "viewonly")==0) {
rc = ipmi_lcd_set_lock(intf, 1);
} else if (strcmp(argv[current_arg], "disabled")==0) {
rc = ipmi_lcd_set_lock(intf, 2);
} else if (strcmp(argv[current_arg], "help") == 0) {
} else if (!strcmp(argv[current_arg], "help")) {
ipmi_lcd_usage();
} else {
lprintf(LOG_ERR, "Invalid DellOEM command: %s",
argv[current_arg]);
ipmi_lcd_usage();
}
} else if( (strcmp(argv[current_arg], "help") == 0)
} else if( (!strcmp(argv[current_arg], "help"))
&& (iDRAC_FLAG==0)) {
ipmi_lcd_usage();
} else {
@ -1509,16 +1515,16 @@ ipmi_delloem_mac_main(struct ipmi_intf * intf, int argc, char ** argv)
int rc = 0;
int currIdInt = -1;
current_arg++;
if (argc > 1 && strcmp(argv[current_arg], "help") == 0) {
if (argc > 1 && !strcmp(argv[current_arg], "help")) {
ipmi_mac_usage();
return 0;
}
ipmi_idracvalidator_command(intf);
if (argc == 1) {
rc = ipmi_macinfo(intf, 0xff);
} else if (strcmp(argv[current_arg], "list") == 0) {
} else if (!strcmp(argv[current_arg], "list")) {
rc = ipmi_macinfo(intf, 0xff);
} else if (strcmp(argv[current_arg], "get") == 0) {
} else if (!strcmp(argv[current_arg], "get")) {
current_arg++;
if (!argv[current_arg]) {
ipmi_mac_usage();
@ -1956,7 +1962,7 @@ ipmi_delloem_lan_main(struct ipmi_intf * intf, int __UNUSED__(argc), char ** arg
int nic_selection = 0;
char nic_set[2] = {0};
current_arg++;
if (!argv[current_arg] || strcmp(argv[current_arg], "help") == 0) {
if (!argv[current_arg] || !strcmp(argv[current_arg], "help")) {
ipmi_lan_usage();
return 0;
}
@ -1964,7 +1970,7 @@ ipmi_delloem_lan_main(struct ipmi_intf * intf, int __UNUSED__(argc), char ** arg
if (!IsLANSupported()) {
lprintf(LOG_ERR, "lan is not supported on this system.");
return -1;
} else if (strcmp(argv[current_arg], "set") == 0) {
} else if (!strcmp(argv[current_arg], "set")) {
current_arg++;
if (!argv[current_arg]) {
ipmi_lan_usage();
@ -2000,12 +2006,12 @@ ipmi_delloem_lan_main(struct ipmi_intf * intf, int __UNUSED__(argc), char ** arg
rc = ipmi_lan_set_nic_selection(intf,nic_selection);
}
return 0;
} else if (strcmp(argv[current_arg], "get") == 0) {
} else if (!strcmp(argv[current_arg], "get")) {
current_arg++;
if (!argv[current_arg]) {
rc = ipmi_lan_get_nic_selection(intf);
return rc;
} else if (strcmp(argv[current_arg], "active") == 0) {
} else if (!strcmp(argv[current_arg], "active")) {
rc = ipmi_lan_get_active_nic(intf);
return rc;
} else {
@ -2056,13 +2062,13 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
nic_set[0] = rsp->data[0];
nic_set[1] = rsp->data[1];
if (argv[current_arg]
&& strcmp(argv[current_arg], "dedicated") == 0) {
&& !strcmp(argv[current_arg], "dedicated")) {
nic_set[0] = 1;
nic_set[1] = 0;
return 0;
}
if (argv[current_arg]
&& strcmp(argv[current_arg], "shared") == 0) {
&& !strcmp(argv[current_arg], "shared")) {
/* placeholder */
} else {
return INVALID;
@ -2070,7 +2076,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
current_arg++;
if (argv[current_arg]
&& strcmp(argv[current_arg], "with") == 0) {
&& !strcmp(argv[current_arg], "with")) {
/* placeholder */
} else {
return INVALID;
@ -2078,14 +2084,14 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
current_arg++;
if (argv[current_arg]
&& strcmp(argv[current_arg], "failover") == 0) {
&& !strcmp(argv[current_arg], "failover")) {
failover = 1;
}
if (failover) {
current_arg++;
}
if (argv[current_arg]
&& strcmp(argv[current_arg], "lom1") == 0) {
&& !strcmp(argv[current_arg], "lom1")) {
if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
return INVAILD_SHARED_MODE;
}
@ -2104,7 +2110,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
}
return 0;
} else if (argv[current_arg]
&& strcmp(argv[current_arg], "lom2") == 0) {
&& !strcmp(argv[current_arg], "lom2")) {
if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
return INVAILD_SHARED_MODE;
}
@ -2123,7 +2129,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
}
return 0;
} else if (argv[current_arg]
&& strcmp(argv[current_arg], "lom3") == 0) {
&& !strcmp(argv[current_arg], "lom3")) {
if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
return INVAILD_SHARED_MODE;
}
@ -2142,7 +2148,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
}
return 0;
} else if (argv[current_arg]
&& strcmp(argv[current_arg], "lom4") == 0) {
&& !strcmp(argv[current_arg], "lom4")) {
if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
return INVAILD_SHARED_MODE;
}
@ -2161,7 +2167,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
}
return 0;
} else if (failover && argv[current_arg]
&& strcmp(argv[current_arg], "none") == 0) {
&& !strcmp(argv[current_arg], "none")) {
if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type) ) {
return INVAILD_SHARED_MODE;
}
@ -2173,7 +2179,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
}
return 0;
} else if (failover && argv[current_arg]
&& strcmp(argv[current_arg], "all") == 0) {
&& !strcmp(argv[current_arg], "all")) {
/* placeholder */
} else {
return INVALID;
@ -2181,7 +2187,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg,
current_arg++;
if (failover && argv[current_arg]
&& strcmp(argv[current_arg], "loms") == 0) {
&& !strcmp(argv[current_arg], "loms")) {
if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
return INVAILD_SHARED_MODE;
}
@ -2198,11 +2204,11 @@ static int
get_nic_selection_mode(int current_arg, char ** argv)
{
if (argv[current_arg]
&& strcmp(argv[current_arg], "dedicated") == 0) {
&& !strcmp(argv[current_arg], "dedicated")) {
return DEDICATED;
}
if (argv[current_arg]
&& strcmp(argv[current_arg], "shared") == 0) {
&& !strcmp(argv[current_arg], "shared")) {
if (!argv[current_arg+1]) {
return SHARED;
}
@ -2210,7 +2216,7 @@ get_nic_selection_mode(int current_arg, char ** argv)
current_arg++;
if (argv[current_arg]
&& strcmp(argv[current_arg], "with") == 0) {
&& !strcmp(argv[current_arg], "with")) {
/* place holder */
} else {
return INVALID;
@ -2218,7 +2224,7 @@ get_nic_selection_mode(int current_arg, char ** argv)
current_arg++;
if (argv[current_arg]
&& strcmp(argv[current_arg], "failover\0") == 0) {
&& !strcmp(argv[current_arg], "failover")) {
/* place holder */
} else {
return INVALID;
@ -2226,10 +2232,10 @@ get_nic_selection_mode(int current_arg, char ** argv)
current_arg++;
if (argv[current_arg]
&& strcmp(argv[current_arg], "lom2") == 0) {
&& !strcmp(argv[current_arg], "lom2")) {
return SHARED_WITH_FAILOVER_LOM2;
} else if (argv[current_arg]
&& strcmp(argv[current_arg], "all") == 0) {
&& !strcmp(argv[current_arg], "all")) {
/* place holder */
} else {
return INVALID;
@ -2237,7 +2243,7 @@ get_nic_selection_mode(int current_arg, char ** argv)
current_arg++;
if (argv[current_arg]
&& strcmp(argv[current_arg], "loms") == 0) {
&& !strcmp(argv[current_arg], "loms")) {
return SHARED_WITH_FAILOVER_ALL_LOMS;
}
return INVALID;
@ -2497,65 +2503,65 @@ ipmi_delloem_powermonitor_main(struct ipmi_intf * intf, int argc, char ** argv)
{
int rc = 0;
current_arg++;
if (argc > 1 && strcmp(argv[current_arg], "help") == 0) {
if (argc > 1 && !strcmp(argv[current_arg], "help")) {
ipmi_powermonitor_usage();
return 0;
}
ipmi_idracvalidator_command(intf);
if (argc == 1) {
rc = ipmi_powermgmt(intf);
} else if (strcmp(argv[current_arg], "status") == 0) {
} else if (!strcmp(argv[current_arg], "status")) {
rc = ipmi_powermgmt(intf);
} else if (strcmp(argv[current_arg], "clear") == 0) {
} else if (!strcmp(argv[current_arg], "clear")) {
current_arg++;
if (!argv[current_arg]) {
ipmi_powermonitor_usage();
return -1;
} else if (strcmp(argv[current_arg], "peakpower") == 0) {
} else if (!strcmp(argv[current_arg], "peakpower")) {
rc = ipmi_powermgmt_clear(intf, 1);
} else if (strcmp(argv[current_arg], "cumulativepower") == 0) {
} else if (!strcmp(argv[current_arg], "cumulativepower")) {
rc = ipmi_powermgmt_clear(intf, 0);
} else {
ipmi_powermonitor_usage();
return -1;
}
} else if (strcmp(argv[current_arg], "powerconsumption") == 0) {
} else if (!strcmp(argv[current_arg], "powerconsumption")) {
current_arg++;
if (!argv[current_arg]) {
rc = ipmi_print_get_power_consmpt_data(intf,watt);
} else if (strcmp(argv[current_arg], "watt") == 0) {
} else if (!strcmp(argv[current_arg], "watt")) {
rc = ipmi_print_get_power_consmpt_data(intf, watt);
} else if (strcmp(argv[current_arg], "btuphr") == 0) {
} else if (!strcmp(argv[current_arg], "btuphr")) {
rc = ipmi_print_get_power_consmpt_data(intf, btuphr);
} else {
ipmi_powermonitor_usage();
return -1;
}
} else if (strcmp(argv[current_arg], "powerconsumptionhistory") == 0) {
} else if (!strcmp(argv[current_arg], "powerconsumptionhistory")) {
current_arg++;
if (!argv[current_arg]) {
rc = ipmi_print_power_consmpt_history(intf,watt);
} else if (strcmp(argv[current_arg], "watt") == 0) {
} else if (!strcmp(argv[current_arg], "watt")) {
rc = ipmi_print_power_consmpt_history(intf, watt);
} else if (strcmp(argv[current_arg], "btuphr") == 0) {
} else if (!strcmp(argv[current_arg], "btuphr")) {
rc = ipmi_print_power_consmpt_history(intf, btuphr);
} else {
ipmi_powermonitor_usage();
return -1;
}
} else if (strcmp(argv[current_arg], "getpowerbudget") == 0) {
} else if (!strcmp(argv[current_arg], "getpowerbudget")) {
current_arg++;
if (!argv[current_arg]) {
rc=ipmi_print_power_cap(intf,watt);
} else if (strcmp(argv[current_arg], "watt") == 0) {
} else if (!strcmp(argv[current_arg], "watt")) {
rc = ipmi_print_power_cap(intf, watt);
} else if (strcmp(argv[current_arg], "btuphr") == 0) {
} else if (!strcmp(argv[current_arg], "btuphr")) {
rc = ipmi_print_power_cap(intf, btuphr);
} else {
ipmi_powermonitor_usage();
return -1;
}
} else if (strcmp(argv[current_arg], "setpowerbudget") == 0) {
} else if (!strcmp(argv[current_arg], "setpowerbudget")) {
int val;
current_arg++;
if (!argv[current_arg]) {
@ -2575,19 +2581,19 @@ ipmi_delloem_powermonitor_main(struct ipmi_intf * intf, int argc, char ** argv)
current_arg++;
if (!argv[current_arg]) {
ipmi_powermonitor_usage();
} else if (strcmp(argv[current_arg], "watt") == 0) {
} else if (!strcmp(argv[current_arg], "watt")) {
rc = ipmi_set_power_cap(intf,watt,val);
} else if (strcmp(argv[current_arg], "btuphr") == 0) {
} else if (!strcmp(argv[current_arg], "btuphr")) {
rc = ipmi_set_power_cap(intf, btuphr,val);
} else if (strcmp(argv[current_arg], "percent") == 0) {
} else if (!strcmp(argv[current_arg], "percent")) {
rc = ipmi_set_power_cap(intf,percent,val);
} else {
ipmi_powermonitor_usage();
return -1;
}
} else if (strcmp(argv[current_arg], "enablepowercap") == 0) {
} else if (!strcmp(argv[current_arg], "enablepowercap")) {
ipmi_set_power_capstatus_command(intf,1);
} else if (strcmp(argv[current_arg], "disablepowercap") == 0) {
} else if (!strcmp(argv[current_arg], "disablepowercap")) {
ipmi_set_power_capstatus_command(intf,0);
} else {
ipmi_powermonitor_usage();
@ -3869,7 +3875,7 @@ ipmi_delloem_vFlash_process(struct ipmi_intf * intf, int current_arg, char ** ar
return -1;
}
if (!argv[current_arg] || strcmp(argv[current_arg], "help") == 0) {
if (!argv[current_arg] || !strcmp(argv[current_arg], "help")) {
ipmi_vFlash_usage();
return 0;
}
@ -3879,7 +3885,7 @@ ipmi_delloem_vFlash_process(struct ipmi_intf * intf, int current_arg, char ** ar
if (!argv[current_arg]) {
ipmi_vFlash_usage();
return -1;
} else if (strcmp(argv[current_arg], "Card") == 0) {
} else if (!strcmp(argv[current_arg], "Card")) {
current_arg++;
if (argv[current_arg]) {
ipmi_vFlash_usage();
@ -4144,7 +4150,7 @@ ipmi_delloem_setled_main(struct ipmi_intf * intf, int argc, char ** argv)
return -1;
}
/* ipmitool delloem setled info*/
if (argc == 1 || strcmp(argv[current_arg], "help") == 0) {
if (argc == 1 || !strcmp(argv[current_arg], "help")) {
ipmi_setled_usage();
return 0;
}

74
lib/ipmi_ekanalyzer.c
View File

@ -476,11 +476,12 @@ ipmi_ekanalyzer_main(struct ipmi_intf *__UNUSED__(intf), int argc, char **argv)
return (-1);
}
if (strcmp(argv[argument_offset], "help") == 0) {
if (!strcmp(argv[argument_offset], "help")) {
ipmi_ekanalyzer_usage();
return 0;
} else if ((strcmp(argv[argument_offset], "frushow") == 0)
&& (argc > (MIN_ARGUMENT-1))) {
} else if (!strcmp(argv[argument_offset], "frushow")
&& (argc > (MIN_ARGUMENT-1)))
{
for (type_offset = 0; type_offset < (argc-1); type_offset++ ) {
argument_offset++;
file_type[type_offset] = ipmi_ek_get_file_type(argv[argument_offset]);
@ -525,8 +526,9 @@ ipmi_ekanalyzer_main(struct ipmi_intf *__UNUSED__(intf), int argc, char **argv)
free(filename[type_offset]);
filename[type_offset] = NULL;
}
} else if ((strcmp(argv[argument_offset], "print") == 0)
|| (strcmp(argv[argument_offset], "summary") == 0)) {
} else if (!strcmp(argv[argument_offset], "print")
|| !strcmp(argv[argument_offset], "summary"))
{
/* Display help text for corresponding command
* if not enough parameters were given.
*/
@ -538,7 +540,7 @@ ipmi_ekanalyzer_main(struct ipmi_intf *__UNUSED__(intf), int argc, char **argv)
int filename_size=0;
if (argc < MIN_ARGUMENT) {
lprintf(LOG_ERR, "Not enough parameters given.");
if (strcmp(argv[argument_offset], "print") == 0) {
if (!strcmp(argv[argument_offset], "print")) {
lprintf(LOG_ERR,
" ekanalyzer print [carrier/power/all]"
" <xx=frufile> <xx=frufile> [xx=frufile]");
@ -550,18 +552,20 @@ ipmi_ekanalyzer_main(struct ipmi_intf *__UNUSED__(intf), int argc, char **argv)
return ERROR_STATUS;
}
argument_offset++;
if ((strcmp(argv[argument_offset], "carrier") == 0)
|| (strcmp(argv[argument_offset], "power") == 0)
|| (strcmp(argv[argument_offset], "all") == 0)) {
if (!strcmp(argv[argument_offset], "carrier")
|| !strcmp(argv[argument_offset], "power")
|| !strcmp(argv[argument_offset], "all"))
{
option = argv[argument_offset];
index ++;
argc--;
} else if ((strcmp(argv[argument_offset], "match") == 0)
|| ( strcmp(argv[argument_offset], "unmatch") == 0)) {
} else if (!strcmp(argv[argument_offset], "match")
|| !strcmp(argv[argument_offset], "unmatch"))
{
option = argv[argument_offset];
index ++;
argc--;
} else if ( strcmp(&argv[argument_offset][2], "=") == 0) {
} else if ('=' == argv[argument_offset][2]) {
/* since the command line must receive xx=filename,
* so the position of "=" sign is 2
*/
@ -574,7 +578,7 @@ ipmi_ekanalyzer_main(struct ipmi_intf *__UNUSED__(intf), int argc, char **argv)
option = "invalid";
printf("Invalid option '%s'\n", argv[argument_offset]);
argument_offset--;
if (strcmp(argv[0], "print") == 0) {
if (!strcmp(argv[0], "print")) {
lprintf (LOG_ERR,
" ekanalyzer print [carrier/power/all]"
" <xx=frufile> <xx=frufile> [xx=frufile]");
@ -585,7 +589,7 @@ ipmi_ekanalyzer_main(struct ipmi_intf *__UNUSED__(intf), int argc, char **argv)
}
rc = ERROR_STATUS;
}
if (strcmp(option, "invalid") != 0) {
if (strcmp(option, "invalid")) {
int i=0;
for (i = 0; i < (argc-1); i++) {
file_type[i] = ipmi_ek_get_file_type (argv[index]);
@ -624,7 +628,7 @@ ipmi_ekanalyzer_main(struct ipmi_intf *__UNUSED__(intf), int argc, char **argv)
printf("file name: %s\n", filename[i]);
}
}
if (strcmp(argv[0], "print") == 0) {
if (!strcmp(argv[0], "print")) {
rc = ipmi_ekanalyzer_print((argc-1),
option, filename, file_type);
} else {
@ -675,7 +679,7 @@ ipmi_ekanalyzer_print(int argc, char *opt, char **filename, int *file_type)
{
int return_value = OK_STATUS;
/* Display carrier topology */
if ((strcmp(opt, "carrier") == 0) || (strcmp(opt, "default") == 0)) {
if (!strcmp(opt, "carrier") || !strcmp(opt, "default")) {
tboolean found_flag = FALSE;
int index = 0;
int index_name[argc];
@ -751,10 +755,10 @@ ipmi_ekanalyzer_print(int argc, char *opt, char **filename, int *file_type)
}
}
}
} else if (strcmp(opt, "power") == 0) {
} else if (!strcmp(opt, "power")) {
printf("Print power information\n");
return_value = ipmi_ek_display_power(argc, opt, filename, file_type);
} else if (strcmp(opt, "all") == 0) {
} else if (!strcmp(opt, "all")) {
printf("Print all information\n");
return_value = ipmi_ek_display_power(argc, opt, filename, file_type);
} else {
@ -922,9 +926,9 @@ ipmi_ek_display_power( int argc, char * opt, char ** filename, int * file_type )
list_record[num_file];
list_record[num_file] = list_record[num_file]->next)
{
if ( ( strcmp(opt, "all") == 0 )
&& ( file_type[num_file] == ON_CARRIER_FRU_FILE )
){
if (!strcmp(opt, "all")
&& file_type[num_file] == ON_CARRIER_FRU_FILE)
{
if ( list_record[num_file]->data[PICMG_ID_OFFSET]
==
FRU_AMC_CARRIER_P2P
@ -1083,7 +1087,7 @@ ipmi_ekanalyzer_ekeying_match( int argc, char * opt,
{
tboolean return_value = FALSE;
if ( (strcmp(opt, "carrier") == 0 ) || (strcmp(opt, "power") == 0) ){
if (!strcmp(opt, "carrier") || !strcmp(opt, "power")) {
lprintf(LOG_ERR, " ekanalyzer summary [match/ unmatch/ all]"\
" <xx=frufile> <xx=frufile> [xx=frufile]");
return_value = ERROR_STATUS;
@ -1450,7 +1454,7 @@ ipmi_ek_check_physical_connectivity(
(filetype1 ==(port_desc[j].remote_resource_id &0x0f))
)
){
if ( ! (strcmp(option, "unmatch") == 0) ){
if (strcmp(option, "unmatch")){
printf("%s port %d ==> %s port %d\n",
val2str(filetype2, ipmi_ekanalyzer_module_type),
record1.ch_desc[index1].lane0port,
@ -1473,7 +1477,7 @@ ipmi_ek_check_physical_connectivity(
&&
(filetype2 == (port_desc[j].remote_resource_id & 0x0f))
){
if ( ! (strcmp(option, "unmatch") == 0) ){
if (strcmp(option, "unmatch")){
printf("%s port %d ==> %s port %d\n",
val2str(filetype2, ipmi_ekanalyzer_module_type),
record1.ch_desc[index1].lane0port,
@ -1487,7 +1491,7 @@ ipmi_ek_check_physical_connectivity(
&&
(record2.rsc_id == (port_desc[j].remote_resource_id))
){
if ( ! (strcmp(option, "unmatch") == 0) ){
if (strcmp(option, "unmatch")){
printf("%s port %d ==> %s %x port %d\n",
val2str(filetype2, ipmi_ekanalyzer_module_type),
record1.ch_desc[index1].lane0port,
@ -1603,10 +1607,10 @@ ipmi_ek_compare_link( struct ipmi_ek_multi_header * physic_record,
physic_record, file_type1, file_type2, opt );
if ( result == OK_STATUS ){
/*Display the result if option = match or all*/
if ( (strcmp( opt, "match" ) == 0)
|| (strcmp( opt, "all" ) == 0)
|| (strcmp( opt, "default" ) == 0)
){
if (!strcmp(opt, "match")
|| !strcmp(opt, "all")
|| !strcmp(opt, "default"))
{
tboolean isOEMtype = FALSE;
printf(" Matching Result\n");
isOEMtype = ipmi_ek_display_link_descriptor( file_type1,
@ -1663,10 +1667,10 @@ ipmi_ek_compare_link( struct ipmi_ek_multi_header * physic_record,
record1, index_ch_desc1, record2, index_ch_desc2,
physic_record, file_type1, file_type2, opt );
if ( result == OK_STATUS ){
if ( (strcmp( opt, "match" ) == 0)
|| (strcmp( opt, "all" ) == 0)
|| (strcmp( opt, "default" ) == 0)
){
if (!strcmp( opt, "match" )
|| !strcmp(opt, "all")
|| !strcmp(opt, "default"))
{
tboolean isOEMtype = FALSE;
printf(" Matching Result\n");
isOEMtype = ipmi_ek_display_link_descriptor( file_type1,
@ -1694,7 +1698,7 @@ ipmi_ek_compare_link( struct ipmi_ek_multi_header * physic_record,
}
}
if ( (strcmp(opt, "unmatch") == 0) || (strcmp(opt, "all") == 0) ){
if (!strcmp(opt, "unmatch") || !strcmp(opt, "all")) {
int isOEMtype = FALSE;
printf(" Unmatching result\n");
for (index1 = 0; index1 < record1.link_desc_count; index1++){
@ -2729,7 +2733,7 @@ ipmi_ek_display_board_info_area(FILE *input_file, char *board_type,
printf("%s: None\n", board_type);
goto out;
}
if (strcmp(board_type, "Custom") != 0) {
if (strcmp(board_type, "Custom")) {
unsigned char *data, *str;
unsigned int i = 0;
data = malloc(size_board + 1); /* Make room for type/length field */

10
lib/ipmi_event.c
View File

@ -270,9 +270,9 @@ ipmi_event_fromsensor(struct ipmi_intf * intf, char * id, char * state, char * e
if (!evdir)
emsg.event_dir = EVENT_DIR_ASSERT;
else if (strcmp(evdir, "assert") == 0)
else if (!strcmp(evdir, "assert"))
emsg.event_dir = EVENT_DIR_ASSERT;
else if (strcmp(evdir, "deassert") == 0)
else if (!strcmp(evdir, "deassert"))
emsg.event_dir = EVENT_DIR_DEASSERT;
else {
lprintf(LOG_ERR, "Invalid event direction %s. Must be 'assert' or 'deassert'", evdir);
@ -318,7 +318,7 @@ ipmi_event_fromsensor(struct ipmi_intf * intf, char * id, char * state, char * e
int hilo = 0;
off = 1;
if (!state || strcmp(state, "list") == 0) {
if (!state || !strcmp(state, "list")) {
printf("Sensor States:\n");
printf(" lnr : Lower Non-Recoverable \n");
printf(" lcr : Lower Critical\n");
@ -596,11 +596,11 @@ ipmi_event_main(struct ipmi_intf * intf, int argc, char ** argv)
{
int rc = 0;
if (argc == 0 || strcmp(argv[0], "help") == 0) {
if (argc == 0 || !strcmp(argv[0], "help")) {
ipmi_event_usage();
return 0;
}
if (strcmp(argv[0], "file") == 0) {
if (!strcmp(argv[0], "file")) {
if (argc < 2) {
ipmi_event_usage();
return 0;

28
lib/ipmi_firewall.c
View File

@ -128,7 +128,7 @@ ipmi_firewall_parse_args(int argc, char ** argv, struct ipmi_function_params * p
return -1;
}
for (i=0; i<argc; i++) {
if (strcmp(argv[i], "channel") == 0 && (++i < argc)) {
if (!strcmp(argv[i], "channel") && (++i < argc)) {
uint8_t channel_tmp = 0;
if (is_ipmi_channel_num(argv[i], &channel_tmp) != 0) {
conv_err = 1;
@ -137,31 +137,31 @@ ipmi_firewall_parse_args(int argc, char ** argv, struct ipmi_function_params * p
p->channel = channel_tmp;
}
}
else if (strcmp(argv[i], "lun") == 0 && (++i < argc)) {
else if (!strcmp(argv[i], "lun") && (++i < argc)) {
if (str2int(argv[i], &(p->lun)) != 0) {
lprintf(LOG_ERR, "Given lun '%s' is invalid.", argv[i]);
conv_err = 1;
break;
}
}
else if (strcmp(argv[i], "force") == 0) {
else if (!strcmp(argv[i], "force")) {
p->force = 1;
}
else if (strcmp(argv[i], "netfn") == 0 && (++i < argc)) {
else if (!strcmp(argv[i], "netfn") && (++i < argc)) {
if (str2int(argv[i], &(p->netfn)) != 0) {
lprintf(LOG_ERR, "Given netfn '%s' is invalid.", argv[i]);
conv_err = 1;
break;
}
}
else if (strcmp(argv[i], "command") == 0 && (++i < argc)) {
else if (!strcmp(argv[i], "command") && (++i < argc)) {
if (str2int(argv[i], &(p->command)) != 0) {
lprintf(LOG_ERR, "Given command '%s' is invalid.", argv[i]);
conv_err = 1;
break;
}
}
else if (strcmp(argv[i], "subfn") == 0 && (++i < argc)) {
else if (!strcmp(argv[i], "subfn") && (++i < argc)) {
if (str2int(argv[i], &(p->subfn)) != 0) {
lprintf(LOG_ERR, "Given subfn '%s' is invalid.", argv[i]);
conv_err = 1;
@ -903,7 +903,7 @@ ipmi_firewall_info(struct ipmi_intf * intf, int argc, char ** argv)
struct bmc_fn_support * bmc_fn_support;
unsigned int l, n, c;
if ((argc > 0 && strcmp(argv[0], "help") == 0) || ipmi_firewall_parse_args(argc, argv, &p) < 0)
if ((argc > 0 && !strcmp(argv[0], "help")) || ipmi_firewall_parse_args(argc, argv, &p) < 0)
{
printf_firewall_info_usage();
return 0;
@ -1018,7 +1018,7 @@ ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char
unsigned int l, n, c;
unsigned char enables[MAX_COMMAND_BYTES];
if (argc < 1 || strcmp(argv[0], "help") == 0) {
if (argc < 1 || !strcmp(argv[0], "help")) {
char * s1 = enable?"en":"dis";
char * s2 = enable?"":" [force]";
printf("%sable [channel H] lun L netfn N%s\n", s1, s2);
@ -1113,7 +1113,7 @@ ipmi_firewall_reset(struct ipmi_intf * intf, int argc, char ** argv)
lprintf(LOG_ERR, "Not enough parameters given.");
printf_firewall_usage();
return (-1);
} else if (argc > 0 && strcmp(argv[0], "help") == 0) {
} else if (argc > 0 && !strcmp(argv[0], "help")) {
printf_firewall_usage();
return 0;
}
@ -1171,19 +1171,19 @@ ipmi_firewall_main(struct ipmi_intf * intf, int argc, char ** argv)
{
int rc = 0;
if (argc < 1 || strcmp(argv[0], "help") == 0) {
if (argc < 1 || !strcmp(argv[0], "help")) {
printf_firewall_usage();
}
else if (strcmp(argv[0], "info") == 0) {
else if (!strcmp(argv[0], "info")) {
rc = ipmi_firewall_info(intf, argc-1, &(argv[1]));
}
else if (strcmp(argv[0], "enable") == 0) {
else if (!strcmp(argv[0], "enable")) {
rc = ipmi_firewall_enable_disable(intf, 1, argc-1, &(argv[1]));
}
else if (strcmp(argv[0], "disable") == 0) {
else if (!strcmp(argv[0], "disable")) {
rc = ipmi_firewall_enable_disable(intf, 0, argc-1, &(argv[1]));
}
else if (strcmp(argv[0], "reset") == 0) {
else if (!strcmp(argv[0], "reset")) {
rc = ipmi_firewall_reset(intf, argc-1, &(argv[1]));
}
else {

21
lib/ipmi_fru.c
View File

@ -4424,14 +4424,15 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
if (argc < 1) {
rc = ipmi_fru_print_all(intf);
}
else if (strcmp(argv[0], "help") == 0) {
else if (!strcmp(argv[0], "help")) {
ipmi_fru_help();
return 0;
}
else if (strcmp(argv[0], "print") == 0 ||
strcmp(argv[0], "list") == 0) {
else if (!strcmp(argv[0], "print")
|| !strcmp(argv[0], "list"))
{
if (argc > 1) {
if (strcmp(argv[1], "help") == 0) {
if (!strcmp(argv[1], "help")) {
lprintf(LOG_NOTICE, "fru print [fru id] - print information about FRU(s)");
return 0;
}
@ -4445,7 +4446,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
}
}
else if (!strcmp(argv[0], "read")) {
if (argc > 1 && strcmp(argv[1], "help") == 0) {
if (argc > 1 && !strcmp(argv[1], "help")) {
ipmi_fru_read_help();
return 0;
} else if (argc < 3) {
@ -4469,7 +4470,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_fru_read_to_bin(intf, argv[2], fru_id);
}
else if (!strcmp(argv[0], "write")) {
if (argc > 1 && strcmp(argv[1], "help") == 0) {
if (argc > 1 && !strcmp(argv[1], "help")) {
ipmi_fru_write_help();
return 0;
} else if (argc < 3) {
@ -4493,7 +4494,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_fru_write_from_bin(intf, argv[2], fru_id);
}
else if (!strcmp(argv[0], "upgEkey")) {
if (argc > 1 && strcmp(argv[1], "help") == 0) {
if (argc > 1 && !strcmp(argv[1], "help")) {
ipmi_fru_upgekey_help();
return 0;
} else if (argc < 3) {
@ -4512,7 +4513,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
rc = ipmi_fru_upg_ekeying(intf, argv[2], fru_id);
}
else if (!strcmp(argv[0], "internaluse")) {
if (argc > 1 && strcmp(argv[1], "help") == 0) {
if (argc > 1 && !strcmp(argv[1], "help")) {
ipmi_fru_internaluse_help();
return 0;
}
@ -4566,7 +4567,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
}
}
else if (!strcmp(argv[0], "edit")) {
if (argc > 1 && strcmp(argv[1], "help") == 0) {
if (argc > 1 && !strcmp(argv[1], "help")) {
ipmi_fru_edit_help();
return 0;
} else if (argc < 2) {
@ -4607,7 +4608,7 @@ ipmi_fru_main(struct ipmi_intf * intf, int argc, char ** argv)
}
}
else if (!strcmp(argv[0], "get")) {
if (argc > 1 && (strcmp(argv[1], "help") == 0)) {
if (argc > 1 && (!strcmp(argv[1], "help"))) {
ipmi_fru_get_help();
return 0;
} else if (argc < 2) {

14
lib/ipmi_fwum.c
View File

@ -151,16 +151,16 @@ ipmi_fwum_main(struct ipmi_intf *intf, int argc, char **argv)
printf_kfwum_help();
return (-1);
}
if (strcmp(argv[0], "help") == 0) {
if (!strcmp(argv[0], "help")) {
printf_kfwum_help();
rc = 0;
} else if (strcmp(argv[0], "info") == 0) {
} else if (!strcmp(argv[0], "info")) {
rc = ipmi_fwum_info(intf);
} else if (strcmp(argv[0], "status") == 0) {
} else if (!strcmp(argv[0], "status")) {
rc = ipmi_fwum_status(intf);
} else if (strcmp(argv[0], "rollback") == 0) {
} else if (!strcmp(argv[0], "rollback")) {
rc = KfwumManualRollback(intf);
} else if (strcmp(argv[0], "download") == 0) {
} else if (!strcmp(argv[0], "download")) {
if ((argc < 2) || (strlen(argv[1]) < 1)) {
lprintf(LOG_ERR,
"Path and file name must be specified.");
@ -168,14 +168,14 @@ ipmi_fwum_main(struct ipmi_intf *intf, int argc, char **argv)
}
printf("Firmware File Name : %s\n", argv[1]);
rc = ipmi_fwum_fwupgrade(intf, argv[1], 0);
} else if (strcmp(argv[0], "upgrade") == 0) {
} else if (!strcmp(argv[0], "upgrade")) {
if ((argc >= 2) && (strlen(argv[1]) > 0)) {
printf("Upgrading using file name %s\n", argv[1]);
rc = ipmi_fwum_fwupgrade(intf, argv[1], 1);
} else {
rc = KfwumStartFirmwareUpgrade(intf);
}
} else if (strcmp(argv[0], "tracelog") == 0) {
} else if (!strcmp(argv[0], "tracelog")) {
rc = KfwumGetTraceLog(intf);
} else {
lprintf(LOG_ERR, "Invalid KFWUM command: %s", argv[0]);

9
lib/ipmi_gendev.c
View File

@ -541,8 +541,7 @@ ipmi_gendev_main(struct ipmi_intf *intf, int argc, char **argv)
lprintf(LOG_ERR, "Rx gendev command: %s", argv[0]);
if (!argc
|| strcmp(argv[0], "help") == 0)
if (!argc || !strcmp(argv[0], "help"))
{
lprintf(LOG_ERR,
"SDR Commands: list read write");
@ -552,9 +551,9 @@ ipmi_gendev_main(struct ipmi_intf *intf, int argc, char **argv)
" read <sdr name> <file> Read to file eeprom specify by Generic Device Locators");
lprintf(LOG_ERR,
" write <sdr name> <file> Write from file eeprom specify by Generic Device Locators");
} else if (strcmp(argv[0], "list") == 0) {
} else if (!strcmp(argv[0], "list")) {
rc = ipmi_sdr_print_sdr(intf, SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
} else if (strcmp(argv[0], "read") == 0) {
} else if (!strcmp(argv[0], "read")) {
if (argc < 3)
lprintf(LOG_ERR, "usage: gendev read <gendev> <filename>");
else {
@ -580,7 +579,7 @@ ipmi_gendev_main(struct ipmi_intf *intf, int argc, char **argv)
ipmi_gendev_read_file(intf, sdr->record.genloc, argv[2]);
}
} else if (strcmp(argv[0], "write") == 0) {
} else if (!strcmp(argv[0], "write")) {
if (argc < 3)
lprintf(LOG_ERR, "usage: gendev write <gendev> <filename>");
else {

38
lib/ipmi_hpmfwupg.c
View File

@ -2458,10 +2458,10 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
HpmfwupgPrintUsage();
return HPMFWUPG_ERROR;
}
if (strcmp(argv[0], "help") == 0) {
if (!strcmp(argv[0], "help")) {
HpmfwupgPrintUsage();
return HPMFWUPG_SUCCESS;
} else if ((strcmp(argv[0], "check") == 0)) {
} else if (!strcmp(argv[0], "check")) {
/* hpm check */
if (!argv[1]) {
rc = HpmfwupgTargetCheck(intf,VIEW_MODE);
@ -2473,18 +2473,18 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
0, VIEW_MODE);
}
}
} else if (strcmp(argv[0], "upgrade") == 0) {
} else if (!strcmp(argv[0], "upgrade")) {
int i =0;
for (i=1; i< argc ; i++) {
if (strcmp(argv[i],"activate") == 0) {
if (!strcmp(argv[i],"activate")) {
activateFlag = 1;
}
/* hpm upgrade <filename> force */
if (strcmp(argv[i],"force") == 0) {
if (!strcmp(argv[i],"force")) {
option |= FORCE_MODE;
}
/* hpm upgrade <filename> component <comp Id> */
if (strcmp(argv[i],"component") == 0) {
if (!strcmp(argv[i],"component")) {
if (i+1 < argc) {
/* Error Checking */
if (str2int(argv[i+1], &componentId) != 0
@ -2513,7 +2513,7 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
return HPMFWUPG_ERROR;
}
}
if (strcmp(argv[i],"debug") == 0) {
if (!strcmp(argv[i],"debug")) {
option |= DEBUG_MODE;
}
}
@ -2523,11 +2523,11 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
rc = HpmfwupgUpgrade(intf, argv[1], activateFlag,
componentMask, option);
}
} else if (strcmp(argv[0], "compare") == 0) {
} else if (!strcmp(argv[0], "compare")) {
int i = 0;
for (i=1; i< argc; i++) {
/* hpm compare <file> [component x...] */
if (strcmp(argv[i],"component") == 0) {
if (!strcmp(argv[i],"component")) {
if (i+1 < argc) {
/* Error Checking */
if (str2int(argv[i+1], &componentId) != 0
@ -2556,7 +2556,7 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
"No component Id provided\n");
return HPMFWUPG_ERROR;
}
} else if (strcmp(argv[i],"debug") == 0) {
} else if (!strcmp(argv[i],"debug")) {
option|= DEBUG_MODE;
}
}
@ -2566,19 +2566,19 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
rc = HpmfwupgUpgrade(intf, argv[1], 0,
componentMask, option);
}
} else if ((argc >= 1) && (strcmp(argv[0], "activate") == 0)) {
} else if (argc >= 1 && !strcmp(argv[0], "activate")) {
struct HpmfwupgActivateFirmwareCtx cmdCtx;
if ((argc == 2) && (strcmp(argv[1], "norollback") == 0)) {
if (argc == 2 && !strcmp(argv[1], "norollback")) {
cmdCtx.req.rollback_override = 1;
} else {
cmdCtx.req.rollback_override = 0;
}
rc = HpmfwupgActivateFirmware(intf, &cmdCtx, NULL);
} else if ((argc == 1) && (strcmp(argv[0], "targetcap") == 0)) {
} else if (argc == 1 && !strcmp(argv[0], "targetcap")) {
struct HpmfwupgGetTargetUpgCapabilitiesCtx cmdCtx;
verbose++;
rc = HpmfwupgGetTargetUpgCapabilities(intf, &cmdCtx);
} else if ((argc == 3) && (strcmp(argv[0], "compprop") == 0)) {
} else if (argc == 3 && !strcmp(argv[0], "compprop")) {
struct HpmfwupgGetComponentPropertiesCtx cmdCtx;
if (str2uchar(argv[1], &(cmdCtx.req.componentId)) != 0
|| cmdCtx.req.componentId > 7) {
@ -2600,23 +2600,23 @@ ipmi_hpmfwupg_main(struct ipmi_intf *intf, int argc, char **argv)
}
verbose++;
rc = HpmfwupgGetComponentProperties(intf, &cmdCtx);
} else if ((argc == 1) && (strcmp(argv[0], "abort") == 0)) {
} else if (argc == 1 && !strcmp(argv[0], "abort")) {
struct HpmfwupgAbortUpgradeCtx cmdCtx;
verbose++;
rc = HpmfwupgAbortUpgrade(intf, &cmdCtx);
} else if ((argc == 1) && (strcmp(argv[0], "upgstatus") == 0)) {
} else if (argc == 1 && !strcmp(argv[0], "upgstatus")) {
struct HpmfwupgGetUpgradeStatusCtx cmdCtx;
verbose++;
rc = HpmfwupgGetUpgradeStatus(intf, &cmdCtx, NULL, 0);
} else if ((argc == 1) && (strcmp(argv[0], "rollback") == 0)) {
} else if (argc == 1 && !strcmp(argv[0], "rollback")) {
struct HpmfwupgManualFirmwareRollbackCtx cmdCtx;
verbose++;
rc = HpmfwupgManualFirmwareRollback(intf, &cmdCtx);
} else if ((argc == 1) && (strcmp(argv[0], "rollbackstatus") == 0)) {
} else if (argc == 1 && !strcmp(argv[0], "rollbackstatus")) {
struct HpmfwupgQueryRollbackStatusCtx cmdCtx;
verbose++;
rc = HpmfwupgQueryRollbackStatus(intf, &cmdCtx, NULL);
} else if ((argc == 1) && (strcmp(argv[0], "selftestresult") == 0)) {
} else if (argc == 1 && !strcmp(argv[0], "selftestresult")) {
struct HpmfwupgQuerySelftestResultCtx cmdCtx;
verbose++;
rc = HpmfwupgQuerySelftestResult(intf, &cmdCtx, NULL);

12
lib/ipmi_ime.c
View File

@ -988,16 +988,13 @@ int ipmi_ime_main(struct ipmi_intf * intf, int argc, char ** argv)
lprintf(LOG_DEBUG,"ipmi_ime_main()");
if ( (argc == 0) || (strcmp(argv[0], "help") == 0) )
{
if (!argc || !strcmp(argv[0], "help")) {
ImePrintUsage();
}
else if ( (argc == 0) || (strcmp(argv[0], "info") == 0) )
{
else if (!strcmp(argv[0], "info")) {
rc = ImeGetInfo(intf);
}
else if ( strcmp(argv[0], "update") == 0)
{
else if (!strcmp(argv[0], "update")) {
if(argc == 2)
{
lprintf(LOG_NOTICE,"Update using file: %s", argv[1]);
@ -1009,8 +1006,7 @@ int ipmi_ime_main(struct ipmi_intf * intf, int argc, char ** argv)
rc = IME_ERROR;
}
}
else if ( (argc == 0) || (strcmp(argv[0], "rollback") == 0) )
{
else if (!strcmp(argv[0], "rollback")) {
rc = ImeManualRollback(intf);
}
else

20
lib/ipmi_isol.c
View File

@ -192,12 +192,12 @@ static int ipmi_isol_set_param(struct ipmi_intf * intf,
/*
* enabled
*/
if (strcmp(param, "enabled") == 0)
if (!strcmp(param, "enabled"))
{
data[1] = ISOL_ENABLE_PARAM;
if (strcmp(value, "true") == 0)
if (!strcmp(value, "true"))
data[2] = 0x01;
else if (strcmp(value, "false") == 0)
else if (!strcmp(value, "false"))
data[2] = 0x00;
else {
lprintf(LOG_ERR, "Invalid value %s for parameter %s",
@ -210,7 +210,7 @@ static int ipmi_isol_set_param(struct ipmi_intf * intf,
/*
* privilege-level
*/
else if (strcmp(param, "privilege-level") == 0)
else if (!strcmp(param, "privilege-level"))
{
data[1] = ISOL_AUTHENTICATION_PARAM;
if (! strcmp(value, "user"))
@ -235,22 +235,22 @@ static int ipmi_isol_set_param(struct ipmi_intf * intf,
/*
* bit-rate
*/
else if (strcmp(param, "bit-rate") == 0)
else if (!strcmp(param, "bit-rate"))
{
data[1] = ISOL_BAUD_RATE_PARAM;
if (strcmp(value, "9.6") == 0) {
if (!strcmp(value, "9.6")) {
data[2] = 0x06;
}
else if (strcmp(value, "19.2") == 0) {
else if (!strcmp(value, "19.2")) {
data[2] = 0x07;
}
else if (strcmp(value, "38.4") == 0) {
else if (!strcmp(value, "38.4")) {
data[2] = 0x08;
}
else if (strcmp(value, "57.6") == 0) {
else if (!strcmp(value, "57.6")) {
data[2] = 0x09;
}
else if (strcmp(value, "115.2") == 0) {
else if (!strcmp(value, "115.2")) {
data[2] = 0x0A;
}
else {

4
lib/ipmi_kontronoem.c
View File

@ -75,7 +75,7 @@ ipmi_kontronoem_main(struct ipmi_intf *intf, int argc, char **argv)
ipmi_kontron_help();
return (-1);
}
if (strcmp(argv[0], "help") == 0) {
if (!strcmp(argv[0], "help")) {
ipmi_kontron_help();
rc = 0;
} else if (!strcmp(argv[0], "setsn")) {
@ -671,7 +671,7 @@ ipmi_kontron_nextboot_set(struct ipmi_intf *intf, char **argv)
msg_data[5] = 0xFF;
msg_data[6] = 0xFF; /* any */
for (i = 0; bootdev[i] != 0; i++) {
if (strcmp(argv[0], bootdev[i]) == 0) {
if (!strcmp(argv[0], bootdev[i])) {
msg_data[5] = i;
break;
}

139
lib/ipmi_lanp.c
View File

@ -1384,8 +1384,9 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
return (-1);
}
if (strcmp(argv[0], "help") == 0 ||
strcmp(argv[1], "help") == 0) {
if (!strcmp(argv[0], "help")
|| !strcmp(argv[1], "help"))
{
print_lan_set_usage();
return 0;
}
@ -1405,23 +1406,23 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
memset(&data, 0, sizeof(data));
/* set user access */
if (strcmp(argv[1], "user") == 0) {
if (!strcmp(argv[1], "user")) {
rc = ipmi_set_user_access(intf, chan, 1);
}
/* set channel access mode */
else if (strcmp(argv[1], "access") == 0) {
else if (!strcmp(argv[1], "access")) {
if (argc < 3) {
print_lan_set_access_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_access_usage();
return 0;
}
else if (strcmp(argv[2], "on") == 0) {
else if (!strcmp(argv[2], "on")) {
rc = ipmi_set_channel_access(intf, chan, 1);
}
else if (strcmp(argv[2], "off") == 0) {
else if (!strcmp(argv[2], "off")) {
rc = ipmi_set_channel_access(intf, chan, 0);
}
else {
@ -1430,15 +1431,15 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* set ARP control */
else if (strcmp(argv[1], "arp") == 0) {
else if (!strcmp(argv[1], "arp")) {
if (argc < 3) {
print_lan_set_arp_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_arp_usage();
}
else if (strcmp(argv[2], "interval") == 0) {
else if (!strcmp(argv[2], "interval")) {
uint8_t interval = 0;
if (str2uchar(argv[3], &interval) != 0) {
lprintf(LOG_ERR, "Given ARP interval '%s' is invalid.", argv[3]);
@ -1446,28 +1447,28 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
rc = lan_set_arp_interval(intf, chan, interval);
}
else if (strcmp(argv[2], "generate") == 0) {
else if (!strcmp(argv[2], "generate")) {
if (argc < 4) {
print_lan_set_arp_usage();
return (-1);
}
else if (strcmp(argv[3], "on") == 0)
else if (!strcmp(argv[3], "on"))
rc = lan_set_arp_generate(intf, chan, 1);
else if (strcmp(argv[3], "off") == 0)
else if (!strcmp(argv[3], "off"))
rc = lan_set_arp_generate(intf, chan, 0);
else {
print_lan_set_arp_usage();
return (-1);
}
}
else if (strcmp(argv[2], "respond") == 0) {
else if (!strcmp(argv[2], "respond")) {
if (argc < 4) {
print_lan_set_arp_usage();
return (-1);
}
else if (strcmp(argv[3], "on") == 0)
else if (!strcmp(argv[3], "on"))
rc = lan_set_arp_respond(intf, chan, 1);
else if (strcmp(argv[3], "off") == 0)
else if (!strcmp(argv[3], "off"))
rc = lan_set_arp_respond(intf, chan, 0);
else {
print_lan_set_arp_usage();
@ -1479,12 +1480,12 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* set authentication types */
else if (strcmp(argv[1], "auth") == 0) {
else if (!strcmp(argv[1], "auth")) {
if (argc < 3) {
print_lan_set_auth_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_auth_usage();
return 0;
} else {
@ -1492,22 +1493,22 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* ip address source */
else if (strcmp(argv[1], "ipsrc") == 0) {
else if (!strcmp(argv[1], "ipsrc")) {
if (argc < 3) {
print_lan_set_ipsrc_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_ipsrc_usage();
return 0;
}
else if (strcmp(argv[2], "none") == 0)
else if (!strcmp(argv[2], "none"))
data[0] = 0;
else if (strcmp(argv[2], "static") == 0)
else if (!strcmp(argv[2], "static"))
data[0] = 1;
else if (strcmp(argv[2], "dhcp") == 0)
else if (!strcmp(argv[2], "dhcp"))
data[0] = 2;
else if (strcmp(argv[2], "bios") == 0)
else if (!strcmp(argv[2], "bios"))
data[0] = 3;
else {
print_lan_set_ipsrc_usage();
@ -1517,16 +1518,16 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
/* session password
* not strictly a lan setting, but its used for lan connections */
else if (strcmp(argv[1], "password") == 0) {
else if (!strcmp(argv[1], "password")) {
rc = ipmi_lan_set_password(intf, 1, argv[2]);
}
/* snmp community string */
else if (strcmp(argv[1], "snmp") == 0) {
else if (!strcmp(argv[1], "snmp")) {
if (argc < 3) {
print_lan_set_snmp_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_snmp_usage();
return 0;
} else {
@ -1537,7 +1538,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* ip address */
else if (strcmp(argv[1], "ipaddr") == 0) {
else if (!strcmp(argv[1], "ipaddr")) {
if(argc != 3)
{
print_lan_set_usage();
@ -1552,7 +1553,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* network mask */
else if (strcmp(argv[1], "netmask") == 0) {
else if (!strcmp(argv[1], "netmask")) {
if(argc != 3)
{
print_lan_set_usage();
@ -1567,7 +1568,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* mac address */
else if (strcmp(argv[1], "macaddr") == 0) {
else if (!strcmp(argv[1], "macaddr")) {
if(argc != 3)
{
print_lan_set_usage();
@ -1582,24 +1583,26 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* default gateway settings */
else if (strcmp(argv[1], "defgw") == 0) {
else if (!strcmp(argv[1], "defgw")) {
if (argc < 4) {
print_lan_set_defgw_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_defgw_usage();
return 0;
}
else if ((strcmp(argv[2], "ipaddr") == 0) &&
(get_cmdline_ipaddr(argv[3], data) == 0)) {
else if (!strcmp(argv[2], "ipaddr")
&& !get_cmdline_ipaddr(argv[3], data))
{
printf("Setting LAN %s to %d.%d.%d.%d\n",
ipmi_lan_params[IPMI_LANP_DEF_GATEWAY_IP].desc,
data[0], data[1], data[2], data[3]);
rc = set_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_IP, data, 4);
}
else if ((strcmp(argv[2], "macaddr") == 0) &&
(str2mac(argv[3], data) == 0)) {
else if (!strcmp(argv[2], "macaddr")
&& !str2mac(argv[3], data))
{
printf("Setting LAN %s to %s\n",
ipmi_lan_params[IPMI_LANP_DEF_GATEWAY_MAC].desc,
mac2str(data));
@ -1611,24 +1614,25 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* backup gateway settings */
else if (strcmp(argv[1], "bakgw") == 0) {
else if (!strcmp(argv[1], "bakgw")) {
if (argc < 4) {
print_lan_set_bakgw_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_bakgw_usage();
return 0;
}
else if ((strcmp(argv[2], "ipaddr") == 0) &&
(get_cmdline_ipaddr(argv[3], data) == 0)) {
else if (!strcmp(argv[2], "ipaddr")
&& !get_cmdline_ipaddr(argv[3], data))
{
printf("Setting LAN %s to %d.%d.%d.%d\n",
ipmi_lan_params[IPMI_LANP_BAK_GATEWAY_IP].desc,
data[0], data[1], data[2], data[3]);
rc = set_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_IP, data, 4);
}
else if ((strcmp(argv[2], "macaddr") == 0) &&
(str2mac(argv[3], data) == 0)) {
else if (!strcmp(argv[2], "macaddr")
&& !str2mac(argv[3], data)) {
printf("Setting LAN %s to %s\n",
ipmi_lan_params[IPMI_LANP_BAK_GATEWAY_MAC].desc,
mac2str(data));
@ -1639,24 +1643,24 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
return -1;
}
}
else if (strcmp(argv[1], "vlan") == 0) {
else if (!strcmp(argv[1], "vlan")) {
if (argc < 4) {
print_lan_set_vlan_usage();
return (-1);
}
else if (strcmp(argv[2], "help") == 0) {
else if (!strcmp(argv[2], "help")) {
print_lan_set_vlan_usage();
return 0;
}
else if (strcmp(argv[2], "id") == 0) {
if (strcmp(argv[3], "off") == 0) {
else if (!strcmp(argv[2], "id")) {
if (!strcmp(argv[3], "off")) {
ipmi_lan_set_vlan_id(intf, chan, NULL);
}
else {
ipmi_lan_set_vlan_id(intf, chan, argv[3]);
}
}
else if (strcmp(argv[2], "priority") == 0) {
else if (!strcmp(argv[2], "priority")) {
ipmi_lan_set_vlan_priority(intf, chan, argv[3]);
}
else {
@ -1665,18 +1669,18 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* set PEF alerting on or off */
else if (strcmp(argv[1], "alert") == 0) {
else if (!strcmp(argv[1], "alert")) {
if (argc < 3) {
lprintf(LOG_NOTICE, "LAN set alert must be 'on' or 'off'");
return (-1);
}
else if (strcmp(argv[2], "on") == 0 ||
strcmp(argv[2], "enable") == 0) {
else if (!strcmp(argv[2], "on") ||
!strcmp(argv[2], "enable")) {
printf("Enabling PEF alerts for LAN channel %d\n", chan);
rc = ipmi_set_alert_enable(intf, chan, 1);
}
else if (strcmp(argv[2], "off") == 0 ||
strcmp(argv[2], "disable") == 0) {
else if (!strcmp(argv[2], "off") ||
!strcmp(argv[2], "disable")) {
printf("Disabling PEF alerts for LAN channel %d\n", chan);
rc = ipmi_set_alert_enable(intf, chan, 0);
}
@ -1686,14 +1690,14 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
}
}
/* RMCP+ cipher suite privilege levels */
else if (strcmp(argv[1], "cipher_privs") == 0)
else if (!strcmp(argv[1], "cipher_privs"))
{
if (argc != 3) {
print_lan_set_cipher_privs_usage();
return (-1);
}
else if ((strcmp(argv[2], "help") == 0) ||
get_cmdline_cipher_suite_priv_data(argv[2], data))
else if (!strcmp(argv[2], "help")
|| get_cmdline_cipher_suite_priv_data(argv[2], data))
{
print_lan_set_cipher_privs_usage();
return 0;
@ -1703,9 +1707,9 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
rc = set_lan_param(intf, chan, IPMI_LANP_RMCP_PRIV_LEVELS, data, 9);
}
}
else if (strcmp(argv[1], "bad_pass_thresh") == 0)
else if (!strcmp(argv[1], "bad_pass_thresh"))
{
if (argc == 3 && strcmp(argv[2], "help") == 0) {
if (argc == 3 && !strcmp(argv[2], "help")) {
print_lan_set_bad_pass_thresh_usage();
return 0;
}
@ -1848,8 +1852,9 @@ ipmi_lan_alert_set(struct ipmi_intf * intf, uint8_t chan, uint8_t alert,
return (-1);
}
if (strcmp(argv[0], "help") == 0 ||
strcmp(argv[1], "help") == 0) {
if (!strcmp(argv[0], "help")
|| !strcmp(argv[1], "help"))
{
print_lan_alert_set_usage();
return 0;
}
@ -2476,13 +2481,13 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
if (argc == 0) {
print_lan_usage();
return (-1);
} else if (strcmp(argv[0], "help") == 0) {
} else if (!strcmp(argv[0], "help")) {
print_lan_usage();
return 0;
}
if (strcmp(argv[0], "printconf") == 0 ||
strcmp(argv[0], "print") == 0)
if (!strcmp(argv[0], "printconf")
|| !strcmp(argv[0], "print"))
{
if (argc > 2) {
print_lan_usage();
@ -2500,11 +2505,11 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
return (-1);
}
rc = ipmi_lan_print(intf, chan);
} else if (strcmp(argv[0], "set") == 0) {
} else if (!strcmp(argv[0], "set")) {
rc = ipmi_lan_set(intf, argc-1, &(argv[1]));
} else if (strcmp(argv[0], "alert") == 0) {
} else if (!strcmp(argv[0], "alert")) {
rc = ipmi_lan_alert(intf, argc-1, &(argv[1]));
} else if (strcmp(argv[0], "stats") == 0) {
} else if (!strcmp(argv[0], "stats")) {
if (argc < 2) {
print_lan_usage();
return (-1);
@ -2520,9 +2525,9 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
lprintf(LOG_ERR, "Invalid channel: %d", chan);
return (-1);
}
if (strcmp(argv[1], "get") == 0) {
if (!strcmp(argv[1], "get")) {
rc = ipmi_lan_stats_get(intf, chan);
} else if (strcmp(argv[1], "clear") == 0) {
} else if (!strcmp(argv[1], "clear")) {
rc = ipmi_lan_stats_clear(intf, chan);
} else {
print_lan_usage();

31
lib/ipmi_main.c
View File

@ -190,22 +190,22 @@ ipmi_cmd_run(struct ipmi_intf * intf, char * name, int argc, char ** argv)
if (!name) {
if (!cmd->func || !cmd->name)
return -1;
else if (strcmp(cmd->name, "default") == 0)
if (!strcmp(cmd->name, "default"))
return cmd->func(intf, 0, NULL);
else {
lprintf(LOG_ERR, "No command provided!");
ipmi_cmd_print(intf->cmdlist);
return -1;
}
}
for (cmd=intf->cmdlist; cmd->func; cmd++) {
if (strcmp(name, cmd->name) == 0)
if (!strcmp(name, cmd->name))
break;
}
if (!cmd->func) {
cmd = intf->cmdlist;
if (strcmp(cmd->name, "default") == 0)
if (!strcmp(cmd->name, "default"))
return cmd->func(intf, argc+1, argv-1);
lprintf(LOG_ERR, "Invalid command: %s", name);
@ -380,11 +380,12 @@ ipmi_main(int argc, char ** argv,
if (intflist) {
found = 0;
for (sup=intflist; sup->name; sup++) {
if (strcmp(sup->name, intfname) == 0 &&
strcmp(sup->name, intfname) == 0 &&
sup->supported == 1)
if (!strcmp(sup->name, intfname)
&& sup->supported)
{
found = 1;
}
}
if (!found) {
lprintf(LOG_ERR, "Interface %s not supported", intfname);
goto out_free;
@ -609,8 +610,9 @@ ipmi_main(int argc, char ** argv,
lprintf(LOG_ERR, "%s: malloc failure", progname);
goto out_free;
}
if (strcmp(oemtype, "list") == 0 ||
strcmp(oemtype, "help") == 0) {
if (!strcmp(oemtype, "list")
|| !strcmp(oemtype, "help"))
{
ipmi_oem_print();
rc = 0;
goto out_free;
@ -777,8 +779,9 @@ ipmi_main(int argc, char ** argv,
}
/* check for command before doing anything */
if (argc-optind > 0 &&
strcmp(argv[optind], "help") == 0) {
if (argc-optind > 0
&& !strcmp(argv[optind], "help"))
{
ipmi_cmd_print(cmdlist);
rc = 0;
goto out_free;
@ -823,11 +826,11 @@ ipmi_main(int argc, char ** argv,
}
if (password && intfname) {
if (strcmp(intfname, "lan") == 0 && strlen(password) > 16) {
if (!strcmp(intfname, "lan") && strlen(password) > 16) {
lprintf(LOG_ERR, "%s: password is longer than 16 bytes.", intfname);
rc = -1;
goto out_free;
} else if (strcmp(intfname, "lanplus") == 0 && strlen(password) > 20) {
} else if (!strcmp(intfname, "lanplus") && strlen(password) > 20) {
lprintf(LOG_ERR, "%s: password is longer than 20 bytes.", intfname);
rc = -1;
goto out_free;

42
lib/ipmi_mc.c
View File

@ -323,7 +323,7 @@ ipmi_mc_set_enables(struct ipmi_intf * intf, int argc, char ** argv)
printf_mc_usage();
return (-1);
}
else if (strcmp(argv[0], "help") == 0) {
else if (!strcmp(argv[0], "help")) {
printf_mc_usage();
return 0;
}
@ -348,13 +348,13 @@ ipmi_mc_set_enables(struct ipmi_intf * intf, int argc, char ** argv)
for (i = 0; i < argc; i++) {
for (bf = mc_enables_bf; bf->name; bf++) {
int nl = strlen(bf->name);
if (strcmp(argv[i], bf->name) != 0)
if (strcmp(argv[i], bf->name))
continue;
if (strcmp(argv[i]+nl+1, "off") == 0) {
if (!strcmp(argv[i]+nl+1, "off")) {
printf("Disabling %s\n", bf->desc);
en &= ~bf->mask;
}
else if (strcmp(argv[i]+nl+1, "on") == 0) {
else if (!strcmp(argv[i]+nl+1, "on")) {
printf("Enabling %s\n", bf->desc);
en |= bf->mask;
}
@ -1284,24 +1284,24 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
printf_mc_usage();
rc = (-1);
}
else if (strcmp(argv[0], "help") == 0) {
else if (!strcmp(argv[0], "help")) {
printf_mc_usage();
rc = 0;
}
else if (strcmp(argv[0], "reset") == 0) {
else if (!strcmp(argv[0], "reset")) {
if (argc < 2) {
lprintf(LOG_ERR, "Not enough parameters given.");
printf_mc_reset_usage();
rc = (-1);
}
else if (strcmp(argv[1], "help") == 0) {
else if (!strcmp(argv[1], "help")) {
printf_mc_reset_usage();
rc = 0;
}
else if (strcmp(argv[1], "cold") == 0) {
else if (!strcmp(argv[1], "cold")) {
rc = ipmi_mc_reset(intf, BMC_COLD_RESET);
}
else if (strcmp(argv[1], "warm") == 0) {
else if (!strcmp(argv[1], "warm")) {
rc = ipmi_mc_reset(intf, BMC_WARM_RESET);
}
else {
@ -1310,10 +1310,10 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
rc = (-1);
}
}
else if (strcmp(argv[0], "info") == 0) {
else if (!strcmp(argv[0], "info")) {
rc = ipmi_mc_get_deviceid(intf);
}
else if (strcmp(argv[0], "guid") == 0) {
else if (!strcmp(argv[0], "guid")) {
ipmi_guid_mode_t guid_mode = GUID_AUTO;
/* Allow for 'rfc' and 'rfc4122' */
@ -1336,10 +1336,10 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
}
rc = ipmi_mc_print_guid(intf, guid_mode);
}
else if (strcmp(argv[0], "getenables") == 0) {
else if (!strcmp(argv[0], "getenables")) {
rc = ipmi_mc_get_enables(intf);
}
else if (strcmp(argv[0], "setenables") == 0) {
else if (!strcmp(argv[0], "setenables")) {
rc = ipmi_mc_set_enables(intf, argc-1, &(argv[1]));
}
else if (!strcmp(argv[0], "selftest")) {
@ -1351,11 +1351,11 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
print_watchdog_usage();
rc = (-1);
}
else if (strcmp(argv[1], "help") == 0) {
else if (!strcmp(argv[1], "help")) {
print_watchdog_usage();
rc = 0;
}
else if (strcmp(argv[1], "set") == 0) {
else if (!strcmp(argv[1], "set")) {
if (argc < 3) { /* Requires options */
lprintf(LOG_ERR, "Not enough parameters given.");
print_watchdog_usage();
@ -1365,13 +1365,13 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
rc = ipmi_mc_set_watchdog(intf, argc - 2, &(argv[2]));
}
}
else if (strcmp(argv[1], "get") == 0) {
else if (!strcmp(argv[1], "get")) {
rc = ipmi_mc_get_watchdog(intf);
}
else if(strcmp(argv[1], "off") == 0) {
else if (!strcmp(argv[1], "off")) {
rc = ipmi_mc_shutoff_watchdog(intf);
}
else if(strcmp(argv[1], "reset") == 0) {
else if (!strcmp(argv[1], "reset")) {
rc = ipmi_mc_rst_watchdog(intf);
}
else {
@ -1380,10 +1380,10 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
rc = (-1);
}
}
else if (strcmp(argv[0], "getsysinfo") == 0) {
else if (!strcmp(argv[0], "getsysinfo")) {
rc = ipmi_sysinfo_main(intf, argc, argv, 0);
}
else if (strcmp(argv[0], "setsysinfo") == 0) {
else if (!strcmp(argv[0], "setsysinfo")) {
rc = ipmi_sysinfo_main(intf, argc, argv, 1);
}
else {
@ -1531,7 +1531,7 @@ ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv, int is_set)
char paramdata[18];
int len, maxset, param, pos, rc, set;
if (argc == 2 && strcmp(argv[1], "help") == 0) {
if (argc == 2 && !strcmp(argv[1], "help")) {
printf_sysinfo_usage(1);
return 0;
}

8
lib/ipmi_oem.c
View File

@ -135,15 +135,15 @@ ipmi_oem_setup(struct ipmi_intf * intf, char * oemtype)
int rc = 0;
if (!oemtype
|| strcmp(oemtype, "help") == 0
|| strcmp(oemtype, "list") == 0)
|| !strcmp(oemtype, "help")
|| !strcmp(oemtype, "list"))
{
ipmi_oem_print();
return -1;
}
for (oem=ipmi_oem_list; oem->name; oem++) {
if (strcmp(oemtype, oem->name) == 0)
if (!strcmp(oemtype, oem->name))
break;
}
@ -176,7 +176,7 @@ ipmi_oem_active(struct ipmi_intf * intf, const char * oemtype)
if (!intf->oem)
return 0;
if (strcmp(intf->oem->name, oemtype) == 0)
if (!strcmp(intf->oem->name, oemtype))
return 1;
return 0;

4
lib/ipmi_picmg.c
View File

@ -1883,13 +1883,13 @@ ipmi_picmg_main (struct ipmi_intf * intf, int argc, char ** argv)
int rc = 0;
int showProperties = 0;
if (argc == 0 || (!strcmp(argv[0], "help"))) {
if (!argc || !strcmp(argv[0], "help")) {
ipmi_picmg_help();
return 0;
}
/* Get PICMG properties is called to obtain version information */
if (argc !=0 && !strcmp(argv[0], "properties")) {
if (!strcmp(argv[0], "properties")) {
showProperties =1;
}
rc = ipmi_picmg_properties(intf,showProperties);

12
lib/ipmi_raw.c
View File

@ -145,7 +145,7 @@ ipmi_rawspd_main(struct ipmi_intf * intf, int argc, char ** argv)
memset(spd_data, 0, RAW_SPD_SIZE);
if (argc < 2 || strcmp(argv[0], "help") == 0) {
if (argc < 2 || !strcmp(argv[0], "help")) {
lprintf(LOG_NOTICE, "usage: spd <i2cbus> <i2caddr> [channel] [maxread]");
return 0;
}
@ -203,9 +203,9 @@ ipmi_rawi2c_main(struct ipmi_intf * intf, int argc, char ** argv)
int i = 0;
/* handle bus= argument */
if (argc > 2 && strcmp(argv[0], "bus=") == 0) {
if (argc > 2 && !strcmp(argv[0], "bus=")) {
i = 1;
if (strcmp(argv[0], "bus=public") == 0)
if (!strcmp(argv[0], "bus=public"))
bus = 0;
else if (sscanf(argv[0], "bus=%u", &rbus) == 1)
bus = ((rbus & 7) << 1) | 1;
@ -214,14 +214,14 @@ ipmi_rawi2c_main(struct ipmi_intf * intf, int argc, char ** argv)
/* handle channel= argument
* the bus= argument must be supplied first on command line */
if (argc > 3 && strcmp(argv[1], "chan=") == 0) {
if (argc > 3 && !strcmp(argv[1], "chan=")) {
i = 2;
if (sscanf(argv[1], "chan=%u", &rbus) == 1)
bus |= rbus << 4;
}
}
if ((argc-i) < 2 || strcmp(argv[0], "help") == 0) {
if ((argc - i) < 2 || !strcmp(argv[0], "help")) {
rawi2c_usage();
return 0;
}
@ -322,7 +322,7 @@ ipmi_raw_main(struct ipmi_intf * intf, int argc, char ** argv)
int i;
uint8_t data[256];
if (argc == 1 && strcmp(argv[0], "help") == 0) {
if (argc == 1 && !strcmp(argv[0], "help")) {
ipmi_raw_help();
return 0;
}

50
lib/ipmi_sdr.c
View File

@ -4581,7 +4581,7 @@ ipmi_sdr_print_type(struct ipmi_intf *intf, char *type)
return 0;
}
if (strcmp(type, "0x") == 0) {
if (!strcmp(type, "0x")) {
/* begins with 0x so let it be entered as raw hex value */
if (str2uchar(type, &sensor_type) != 0) {
lprintf(LOG_ERR,
@ -4741,41 +4741,41 @@ ipmi_sdr_main(struct ipmi_intf *intf, int argc, char **argv)
/* initialize random numbers used later */
srand(time(NULL));
if (argc == 0)
if (argc == 0) {
return ipmi_sdr_print_sdr(intf, 0xfe);
else if (strcmp(argv[0], "help") == 0) {
} else if (!strcmp(argv[0], "help")) {
printf_sdr_usage();
} else if (strcmp(argv[0], "list") == 0
|| strcmp(argv[0], "elist") == 0) {
if (strcmp(argv[0], "elist") == 0)
} else if (!strcmp(argv[0], "list")
|| !strcmp(argv[0], "elist"))
{
if (!strcmp(argv[0], "elist"))
sdr_extended = 1;
else
sdr_extended = 0;
if (argc <= 1)
rc = ipmi_sdr_print_sdr(intf, 0xfe);
else if (strcmp(argv[1], "all") == 0)
else if (!strcmp(argv[1], "all"))
rc = ipmi_sdr_print_sdr(intf, 0xff);
else if (strcmp(argv[1], "full") == 0)
else if (!strcmp(argv[1], "full"))
rc = ipmi_sdr_print_sdr(intf,
SDR_RECORD_TYPE_FULL_SENSOR);
else if (strcmp(argv[1], "compact") == 0)
else if (!strcmp(argv[1], "compact"))
rc = ipmi_sdr_print_sdr(intf,
SDR_RECORD_TYPE_COMPACT_SENSOR);
else if (strcmp(argv[1], "event") == 0)
else if (!strcmp(argv[1], "event"))
rc = ipmi_sdr_print_sdr(intf,
SDR_RECORD_TYPE_EVENTONLY_SENSOR);
else if (strcmp(argv[1], "mcloc") == 0)
else if (!strcmp(argv[1], "mcloc"))
rc = ipmi_sdr_print_sdr(intf,
SDR_RECORD_TYPE_MC_DEVICE_LOCATOR);
else if (strcmp(argv[1], "fru") == 0)
else if (!strcmp(argv[1], "fru"))
rc = ipmi_sdr_print_sdr(intf,
SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR);
else if (strcmp(argv[1], "generic") == 0)
else if (!strcmp(argv[1], "generic"))
rc = ipmi_sdr_print_sdr(intf,
SDR_RECORD_TYPE_GENERIC_DEVICE_LOCATOR);
else if (strcmp(argv[1], "help") == 0) {
else if (!strcmp(argv[1], "help")) {
lprintf(LOG_NOTICE,
"usage: sdr %s [all|full|compact|event|mcloc|fru|generic]",
argv[0]);
@ -4790,35 +4790,35 @@ ipmi_sdr_main(struct ipmi_intf *intf, int argc, char **argv)
argv[0]);
return (-1);
}
} else if (strcmp(argv[0], "type") == 0) {
} else if (!strcmp(argv[0], "type")) {
sdr_extended = 1;
rc = ipmi_sdr_print_type(intf, argv[1]);
} else if (strcmp(argv[0], "entity") == 0) {
} else if (!strcmp(argv[0], "entity")) {
sdr_extended = 1;
rc = ipmi_sdr_print_entity(intf, argv[1]);
} else if (strcmp(argv[0], "info") == 0) {
} else if (!strcmp(argv[0], "info")) {
rc = ipmi_sdr_print_info(intf);
} else if (strcmp(argv[0], "get") == 0) {
} else if (!strcmp(argv[0], "get")) {
rc = ipmi_sdr_print_entry_byid(intf, argc - 1, &argv[1]);
} else if (strcmp(argv[0], "dump") == 0) {
} else if (!strcmp(argv[0], "dump")) {
if (argc < 2) {
lprintf(LOG_ERR, "Not enough parameters given.");
lprintf(LOG_NOTICE, "usage: sdr dump <file>");
return (-1);
}
rc = ipmi_sdr_dump_bin(intf, argv[1]);
} else if (strcmp(argv[0], "fill") == 0) {
} else if (!strcmp(argv[0], "fill")) {
if (argc <= 1) {
lprintf(LOG_ERR, "Not enough parameters given.");
lprintf(LOG_NOTICE, "usage: sdr fill sensors");
lprintf(LOG_NOTICE, "usage: sdr fill file <file>");
lprintf(LOG_NOTICE, "usage: sdr fill range <range>");
return (-1);
} else if (strcmp(argv[1], "sensors") == 0) {
} else if (!strcmp(argv[1], "sensors")) {
rc = ipmi_sdr_add_from_sensors(intf, 21);
} else if (strcmp(argv[1], "nosat") == 0) {
} else if (!strcmp(argv[1], "nosat")) {
rc = ipmi_sdr_add_from_sensors(intf, 0);
} else if (strcmp(argv[1], "file") == 0) {
} else if (!strcmp(argv[1], "file")) {
if (argc < 3) {
lprintf(LOG_ERR,
"Not enough parameters given.");
@ -4827,7 +4827,7 @@ ipmi_sdr_main(struct ipmi_intf *intf, int argc, char **argv)
return (-1);
}
rc = ipmi_sdr_add_from_file(intf, argv[2]);
} else if (strcmp(argv[1], "range") == 0) {
} else if (!strcmp(argv[1], "range")) {
if (argc < 3) {
lprintf(LOG_ERR,
"Not enough parameters given.");

45
lib/ipmi_sel.c
View File

@ -2398,7 +2398,7 @@ ipmi_sel_interpret(struct ipmi_intf *intf, unsigned long iana,
* the command line
*/
sel_iana = iana;
if (strcmp("pps", format) == 0) {
if (!strcmp("pps", format)) {
/* Parser for the following format */
/* 0x001F: Event: at Mar 27 06:41:10 2007;from:(0x9a,0,7);
* sensor:(0xc3,119); event:0x6f(asserted): 0xA3 0x00 0x88
@ -2857,7 +2857,7 @@ ipmi_sel_delete(struct ipmi_intf * intf, int argc, char ** argv)
uint8_t msg_data[4];
int rc = 0;
if (argc == 0 || strcmp(argv[0], "help") == 0) {
if (!argc || !strcmp(argv[0], "help")) {
lprintf(LOG_ERR, "usage: delete <id>...<id>\n");
return -1;
}
@ -2918,7 +2918,7 @@ ipmi_sel_show_entry(struct ipmi_intf * intf, int argc, char ** argv)
int rc = 0;
uint16_t id;
if (argc == 0 || strcmp(argv[0], "help") == 0) {
if (!argc || !strcmp(argv[0], "help")) {
lprintf(LOG_ERR, "usage: sel get <id>...<id>");
return (-1);
}
@ -3007,10 +3007,10 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
if (argc == 0)
rc = ipmi_sel_get_info(intf);
else if (strcmp(argv[0], "help") == 0)
else if (!strcmp(argv[0], "help"))
lprintf(LOG_ERR, "SEL Commands: "
"info clear delete list elist get add time save readraw writeraw interpret");
else if (strcmp(argv[0], "interpret") == 0) {
else if (!strcmp(argv[0], "interpret")) {
uint32_t iana = 0;
if (argc < 4) {
lprintf(LOG_NOTICE, "usage: sel interpret iana filename format(pps)");
@ -3023,37 +3023,37 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
}
rc = ipmi_sel_interpret(intf, iana, argv[2], argv[3]);
}
else if (strcmp(argv[0], "info") == 0)
else if (!strcmp(argv[0], "info"))
rc = ipmi_sel_get_info(intf);
else if (strcmp(argv[0], "save") == 0) {
else if (!strcmp(argv[0], "save")) {
if (argc < 2) {
lprintf(LOG_NOTICE, "usage: sel save <filename>");
return 0;
}
rc = ipmi_sel_save_entries(intf, 0, argv[1]);
}
else if (strcmp(argv[0], "add") == 0) {
else if (!strcmp(argv[0], "add")) {
if (argc < 2) {
lprintf(LOG_NOTICE, "usage: sel add <filename>");
return 0;
}
rc = ipmi_sel_add_entries_fromfile(intf, argv[1]);
}
else if (strcmp(argv[0], "writeraw") == 0) {
else if (!strcmp(argv[0], "writeraw")) {
if (argc < 2) {
lprintf(LOG_NOTICE, "usage: sel writeraw <filename>");
return 0;
}
rc = ipmi_sel_writeraw(intf, argv[1]);
}
else if (strcmp(argv[0], "readraw") == 0) {
else if (!strcmp(argv[0], "readraw")) {
if (argc < 2) {
lprintf(LOG_NOTICE, "usage: sel readraw <filename>");
return 0;
}
rc = ipmi_sel_readraw(intf, argv[1]);
}
else if (strcmp(argv[0], "ereadraw") == 0) {
else if (!strcmp(argv[0], "ereadraw")) {
if (argc < 2) {
lprintf(LOG_NOTICE, "usage: sel ereadraw <filename>");
return 0;
@ -3061,8 +3061,9 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
sel_extended = 1;
rc = ipmi_sel_readraw(intf, argv[1]);
}
else if (strcmp(argv[0], "list") == 0 ||
strcmp(argv[0], "elist") == 0) {
else if (!strcmp(argv[0], "list")
|| !strcmp(argv[0], "elist"))
{
/*
* Usage:
* list - show all SEL entries
@ -3073,7 +3074,7 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
int sign = 1;
char *countstr = NULL;
if (strcmp(argv[0], "elist") == 0)
if (!strcmp(argv[0], "elist"))
sel_extended = 1;
else
sel_extended = 0;
@ -3084,10 +3085,10 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
else if (argc == 3) {
countstr = argv[2];
if (strcmp(argv[1], "last") == 0) {
if (!strcmp(argv[1], "last")) {
sign = -1;
}
else if (strcmp(argv[1], "first") != 0) {
else if (strcmp(argv[1], "first")) {
lprintf(LOG_ERR, "Unknown sel list option");
return -1;
}
@ -3104,26 +3105,26 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
rc = ipmi_sel_list_entries(intf,count);
}
else if (strcmp(argv[0], "clear") == 0)
else if (!strcmp(argv[0], "clear"))
rc = ipmi_sel_clear(intf);
else if (strcmp(argv[0], "delete") == 0) {
else if (!strcmp(argv[0], "delete")) {
if (argc < 2)
lprintf(LOG_ERR, "usage: sel delete <id>...<id>");
else
rc = ipmi_sel_delete(intf, argc-1, &argv[1]);
}
else if (strcmp(argv[0], "get") == 0) {
else if (!strcmp(argv[0], "get")) {
if (argc < 2)
lprintf(LOG_ERR, "usage: sel get <entry>");
else
rc = ipmi_sel_show_entry(intf, argc-1, &argv[1]);
}
else if (strcmp(argv[0], "time") == 0) {
else if (!strcmp(argv[0], "time")) {
if (argc < 2)
lprintf(LOG_ERR, "sel time commands: get set");
else if (strcmp(argv[1], "get") == 0)
else if (!strcmp(argv[1], "get"))
ipmi_sel_get_time(intf);
else if (strcmp(argv[1], "set") == 0) {
else if (!strcmp(argv[1], "set")) {
if (argc < 3)
lprintf(LOG_ERR, "usage: sel time set \"mm/dd/yyyy hh:mm:ss\"");
else

32
lib/ipmi_sensor.c
View File

@ -605,7 +605,7 @@ ipmi_sensor_set_threshold(struct ipmi_intf *intf, int argc, char **argv)
struct sdr_record_list *sdr;
if (argc < 3 || strcmp(argv[0], "help") == 0) {
if (argc < 3 || !strcmp(argv[0], "help")) {
print_sensor_thresh_usage();
return 0;
}
@ -613,7 +613,7 @@ ipmi_sensor_set_threshold(struct ipmi_intf *intf, int argc, char **argv)
id = argv[0];
thresh = argv[1];
if (strcmp(thresh, "upper") == 0) {
if (!strcmp(thresh, "upper")) {
if (argc < 5) {
lprintf(LOG_ERR,
"usage: sensor thresh <id> upper <unc> <ucr> <unr>");
@ -635,7 +635,7 @@ ipmi_sensor_set_threshold(struct ipmi_intf *intf, int argc, char **argv)
argv[4]);
return (-1);
}
} else if (strcmp(thresh, "lower") == 0) {
} else if (!strcmp(thresh, "lower")) {
if (argc < 5) {
lprintf(LOG_ERR,
"usage: sensor thresh <id> lower <lnr> <lcr> <lnc>");
@ -658,17 +658,17 @@ ipmi_sensor_set_threshold(struct ipmi_intf *intf, int argc, char **argv)
return (-1);
}
} else {
if (strcmp(thresh, "unr") == 0)
if (!strcmp(thresh, "unr"))
settingMask = UPPER_NON_RECOV_SPECIFIED;
else if (strcmp(thresh, "ucr") == 0)
else if (!strcmp(thresh, "ucr"))
settingMask = UPPER_CRIT_SPECIFIED;
else if (strcmp(thresh, "unc") == 0)
else if (!strcmp(thresh, "unc"))
settingMask = UPPER_NON_CRIT_SPECIFIED;
else if (strcmp(thresh, "lnc") == 0)
else if (!strcmp(thresh, "lnc"))
settingMask = LOWER_NON_CRIT_SPECIFIED;
else if (strcmp(thresh, "lcr") == 0)
else if (!strcmp(thresh, "lcr"))
settingMask = LOWER_CRIT_SPECIFIED;
else if (strcmp(thresh, "lnr") == 0)
else if (!strcmp(thresh, "lnr"))
settingMask = LOWER_NON_RECOV_SPECIFIED;
else {
lprintf(LOG_ERR,
@ -886,7 +886,7 @@ ipmi_sensor_get_reading(struct ipmi_intf *intf, int argc, char **argv)
struct sdr_record_list *sdr;
int i, rc=0;
if (argc < 1 || strcmp(argv[0], "help") == 0) {
if (argc < 1 || !strcmp(argv[0], "help")) {
lprintf(LOG_NOTICE, "sensor reading <id> ... [id]");
lprintf(LOG_NOTICE, " id : name of desired sensor");
return -1;
@ -950,7 +950,7 @@ ipmi_sensor_get(struct ipmi_intf *intf, int argc, char **argv)
lprintf(LOG_ERR, "Not enough parameters given.");
print_sensor_get_usage();
return (-1);
} else if (strcmp(argv[0], "help") == 0) {
} else if (!strcmp(argv[0], "help")) {
print_sensor_get_usage();
return 0;
}
@ -995,15 +995,15 @@ ipmi_sensor_main(struct ipmi_intf *intf, int argc, char **argv)
if (argc == 0) {
rc = ipmi_sensor_list(intf);
} else if (strcmp(argv[0], "help") == 0) {
} else if (!strcmp(argv[0], "help")) {
lprintf(LOG_NOTICE, "Sensor Commands: list thresh get reading");
} else if (strcmp(argv[0], "list") == 0) {
} else if (!strcmp(argv[0], "list")) {
rc = ipmi_sensor_list(intf);
} else if (strcmp(argv[0], "thresh") == 0) {
} else if (!strcmp(argv[0], "thresh")) {
rc = ipmi_sensor_set_threshold(intf, argc - 1, &argv[1]);
} else if (strcmp(argv[0], "get") == 0) {
} else if (!strcmp(argv[0], "get")) {
rc = ipmi_sensor_get(intf, argc - 1, &argv[1]);
} else if (strcmp(argv[0], "reading") == 0) {
} else if (!strcmp(argv[0], "reading")) {
rc = ipmi_sensor_get_reading(intf, argc - 1, &argv[1]);
} else {
lprintf(LOG_ERR, "Invalid sensor command: %s", argv[0]);

20
lib/ipmi_session.c
View File

@ -302,11 +302,13 @@ ipmi_get_session_info(struct ipmi_intf * intf,
if (retval < 0)
{
if ((session_request_type == IPMI_SESSION_REQUEST_CURRENT) &&
(strcmp(intf->name, "lan") != 0))
if (session_request_type == IPMI_SESSION_REQUEST_CURRENT
&& strcmp(intf->name, "lan"))
{
lprintf(LOG_ERR, "It is likely that the channel in use "
"does not support sessions");
}
}
else
{
memcpy(&session_info, rsp->data,
@ -369,14 +371,14 @@ ipmi_session_main(struct ipmi_intf * intf, int argc, char ** argv)
{
int retval = 0;
if (argc == 0 || strcmp(argv[0], "help") == 0)
if (!argc || !strcmp(argv[0], "help"))
{
printf_session_usage();
}
else if (strcmp(argv[0], "info") == 0)
else if (!strcmp(argv[0], "info"))
{
if ((argc < 2) || strcmp(argv[1], "help") == 0)
if (argc < 2 || !strcmp(argv[1], "help"))
{
printf_session_usage();
}
@ -385,11 +387,11 @@ ipmi_session_main(struct ipmi_intf * intf, int argc, char ** argv)
Ipmi_Session_Request_Type session_request_type = 0;
uint32_t id_or_handle = 0;
if (strcmp(argv[1], "active") == 0)
if (!strcmp(argv[1], "active"))
session_request_type = IPMI_SESSION_REQUEST_CURRENT;
else if (strcmp(argv[1], "all") == 0)
else if (!strcmp(argv[1], "all"))
session_request_type = IPMI_SESSION_REQUEST_ALL;
else if (strcmp(argv[1], "id") == 0)
else if (!strcmp(argv[1], "id"))
{
if (argc >= 3)
{
@ -408,7 +410,7 @@ ipmi_session_main(struct ipmi_intf * intf, int argc, char ** argv)
retval = -1;
}
}
else if (strcmp(argv[1], "handle") == 0)
else if (!strcmp(argv[1], "handle"))
{
if (argc >= 3)
{

2
lib/ipmi_sol.c
View File

@ -1705,7 +1705,7 @@ ipmi_sol_activate(struct ipmi_intf * intf, int looptest, int interval,
* This command is only available over RMCP+ (the lanplus
* interface).
*/
if (strcmp(intf->name, "lanplus") != 0)
if (strcmp(intf->name, "lanplus"))
{
lprintf(LOG_ERR, "Error: This command is only available over the "
"lanplus interface");

51
lib/ipmi_sunoem.c
View File

@ -459,7 +459,7 @@ ipmi_sunoem_led_get(struct ipmi_intf * intf, int argc, char ** argv)
* sunoem led/sbled get <id> [type]
*/
if (argc < 1 || strcmp(argv[0], "help") == 0) {
if (argc < 1 || !strcmp(argv[0], "help")) {
ipmi_sunoem_usage();
return (0);
}
@ -657,7 +657,7 @@ ipmi_sunoem_led_set(struct ipmi_intf * intf, int argc, char ** argv)
* sunoem led/sbled set <id> <mode> [type]
*/
if (argc < 2 || strcmp(argv[0], "help") == 0) {
if (argc < 2 || !strcmp(argv[0], "help")) {
ipmi_sunoem_usage();
return (0);
}
@ -1076,7 +1076,7 @@ ipmi_sunoem_cli(struct ipmi_intf * intf, int argc, char *argv[])
memset(&cli_req, 0, sizeof(cli_req));
cli_req.version = SunOemCliActingVersion;
cli_req.command_response = SUNOEM_CLI_CMD_OPEN;
if (argc > 0 && strcmp(argv[0], "force") == 0) {
if (argc > 0 && !strcmp(argv[0], "force")) {
cli_req.command_response = SUNOEM_CLI_CMD_FORCE;
argc--;
argv++;
@ -1096,8 +1096,9 @@ ipmi_sunoem_cli(struct ipmi_intf * intf, int argc, char *argv[])
}
cli_rsp = (sunoem_cli_msg_t *) rsp->data;
if (cli_rsp->command_response || rsp->ccode) {
if (strcmp(cli_rsp->buf, SUNOEM_CLI_INVALID_VER_ERR) == 0
|| strcmp(&(cli_rsp->buf[1]), SUNOEM_CLI_INVALID_VER_ERR) == 0) {
if (!strcmp(cli_rsp->buf, SUNOEM_CLI_INVALID_VER_ERR)
|| !strcmp(&(cli_rsp->buf[1]), SUNOEM_CLI_INVALID_VER_ERR))
{
if (SunOemCliActingVersion == SUNOEM_CLI_VERSION) {
/* Server doesn't support version SUNOEM_CLI_VERSION
Fall back to legacy version, and try again*/
@ -1107,7 +1108,7 @@ ipmi_sunoem_cli(struct ipmi_intf * intf, int argc, char *argv[])
/* Server doesn't support legacy version either */
lprintf(LOG_ERR, "Failed to connect: %s", cli_rsp->buf);
return (-1);
} else if (strcmp(cli_rsp->buf, SUNOEM_CLI_BUSY_ERR) == 0) {
} else if (!strcmp(cli_rsp->buf, SUNOEM_CLI_BUSY_ERR)) {
if (retries++ < SUNOEM_CLI_MAX_RETRY) {
lprintf(LOG_INFO, "Failed to connect: %s, retrying",
cli_rsp->buf);
@ -1193,7 +1194,7 @@ ipmi_sunoem_cli(struct ipmi_intf * intf, int argc, char *argv[])
} else if (arg_num >= argc) {
/* Last arg was sent. Set EOF */
cli_req.command_response = SUNOEM_CLI_CMD_EOF;
} else if (strcmp(argv[arg_num], "@wait=") == 0) {
} else if (!strcmp(argv[arg_num], "@wait=")) {
/* This is a wait command */
char *s = &argv[arg_num][6];
delay = 0;
@ -2319,27 +2320,29 @@ ipmi_sunoem_main(struct ipmi_intf * intf, int argc, char ** argv)
{
int rc = 0;
if (argc == 0 || strcmp(argv[0], "help") == 0) {
if (!argc || !strcmp(argv[0], "help")) {
ipmi_sunoem_usage();
return (0);
} /* if (argc == 0 || strcmp(argv[0], "help") == 0) */
}
if (strcmp(argv[0], "cli") == 0) {
if (!strcmp(argv[0], "cli")) {
rc = ipmi_sunoem_cli(intf, argc - 1, &argv[1]);
} else if ((strcmp(argv[0], "led") == 0) || (strcmp(argv[0], "sbled") == 0)) {
} else if (!strcmp(argv[0], "led")
|| !strcmp(argv[0], "sbled"))
{
if (argc < 2) {
ipmi_sunoem_usage();
return (-1);
}
if (strcmp(argv[1], "get") == 0) {
if (!strcmp(argv[1], "get")) {
if (argc < 3) {
char * arg[] = { "all" };
rc = ipmi_sunoem_led_get(intf, 1, arg);
} else {
rc = ipmi_sunoem_led_get(intf, argc - 2, &(argv[2]));
}
} else if (strcmp(argv[1], "set") == 0) {
} else if (!strcmp(argv[1], "set")) {
if (argc < 4) {
ipmi_sunoem_usage();
return (-1);
@ -2349,7 +2352,7 @@ ipmi_sunoem_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_sunoem_usage();
return (-1);
}
} else if (strcmp(argv[0], "sshkey") == 0) {
} else if (!strcmp(argv[0], "sshkey")) {
uint8_t uid = 0;
if (argc < 3) {
ipmi_sunoem_usage();
@ -2367,10 +2370,10 @@ ipmi_sunoem_main(struct ipmi_intf * intf, int argc, char ** argv)
return (-1);
}
if (strcmp(argv[1], "del") == 0) {
if (!strcmp(argv[1], "del")) {
/* number of arguments, three, is already checked at this point */
rc = ipmi_sunoem_sshkey_del(intf, uid);
} else if (strcmp(argv[1], "set") == 0) {
} else if (!strcmp(argv[1], "set")) {
if (argc < 4) {
ipmi_sunoem_usage();
return (-1);
@ -2380,39 +2383,39 @@ ipmi_sunoem_main(struct ipmi_intf * intf, int argc, char ** argv)
ipmi_sunoem_usage();
return (-1);
}
} else if (strcmp(argv[0], "ping") == 0) {
} else if (!strcmp(argv[0], "ping")) {
if (argc < 2) {
ipmi_sunoem_usage();
return (-1);
}
rc = ipmi_sunoem_echo(intf, argc - 1, &(argv[1]));
} else if (strcmp(argv[0], "version") == 0) {
} else if (!strcmp(argv[0], "version")) {
rc = ipmi_sunoem_version(intf);
} else if (strcmp(argv[0], "nacname") == 0) {
} else if (!strcmp(argv[0], "nacname")) {
if (argc < 2) {
ipmi_sunoem_usage();
return (-1);
}
rc = ipmi_sunoem_nacname(intf, argc - 1, &(argv[1]));
} else if (strcmp(argv[0], "getval") == 0) {
} else if (!strcmp(argv[0], "getval")) {
if (argc < 2) {
ipmi_sunoem_usage();
return (-1);
}
rc = ipmi_sunoem_getval(intf, argc - 1, &(argv[1]));
} else if (strcmp(argv[0], "setval") == 0) {
} else if (!strcmp(argv[0], "setval")) {
if (argc < 3) {
ipmi_sunoem_usage();
return (-1);
}
rc = ipmi_sunoem_setval(intf, argc - 1, &(argv[1]));
} else if (strcmp(argv[0], "getfile") == 0) {
} else if (!strcmp(argv[0], "getfile")) {
if (argc < 3) {
ipmi_sunoem_usage();
return (-1);
}
rc = ipmi_sunoem_getfile(intf, argc - 1, &(argv[1]));
} else if (strcmp(argv[0], "getbehavior") == 0) {
} else if (!strcmp(argv[0], "getbehavior")) {
if (argc < 2) {
ipmi_sunoem_usage();
return (-1);
@ -2421,7 +2424,7 @@ ipmi_sunoem_main(struct ipmi_intf * intf, int argc, char ** argv)
} else {
lprintf(LOG_ERR, "Invalid sunoem command: %s", argv[0]);
return (-1);
} /* if (strcmp(argv[0], "cli") == 0) */
}
return (rc);
}

14
lib/ipmi_tsol.c
View File

@ -381,7 +381,7 @@ ipmi_tsol_main(struct ipmi_intf *intf, int argc, char **argv)
int read_only = 0, rows = 0, cols = 0;
int port = IPMI_TSOL_DEF_PORT;
if (strlen(intf->name) < 3 || strcmp(intf->name, "lan") != 0) {
if (strlen(intf->name) < 3 || strcmp(intf->name, "lan")) {
lprintf(LOG_ERR, "Error: Tyan SOL is only available over lan interface");
return (-1);
}
@ -397,17 +397,13 @@ ipmi_tsol_main(struct ipmi_intf *intf, int argc, char **argv)
rows = ip1;
} else if (sscanf(argv[i], "cols=%d", &ip1) == 1) {
cols = ip1;
} else if (strlen(argv[i]) == 2
&& strcmp(argv[i], "ro") == 0) {
} else if (!strcmp(argv[i], "ro")) {
read_only = 1;
} else if (strlen(argv[i]) == 2
&& strcmp(argv[i], "rw") == 0) {
} else if (!strcmp(argv[i], "rw")) {
read_only = 0;
} else if (strlen(argv[i]) == 7
&& strcmp(argv[i], "altterm") == 0) {
} else if (!strcmp(argv[i], "altterm")) {
_altterm = 1;
} else if (strlen(argv[i]) == 4
&& strcmp(argv[i], "help") == 0) {
} else if (!strcmp(argv[i], "help")) {
print_tsol_usage();
return 0;
} else {

28
lib/ipmi_user.c
View File

@ -613,7 +613,7 @@ ipmi_user_mod(struct ipmi_intf *intf, int argc, char **argv)
if (is_ipmi_user_id(argv[1], &user_id)) {
return (-1);
}
operation = (strcmp(argv[0], "disable") == 0) ?
operation = (!strcmp(argv[0], "disable")) ?
IPMI_PASSWORD_DISABLE_USER : IPMI_PASSWORD_ENABLE_USER;
ccode = _ipmi_set_user_password(intf, user_id, operation,
@ -740,32 +740,34 @@ ipmi_user_main(struct ipmi_intf *intf, int argc, char **argv)
print_user_usage();
return (-1);
}
if (strcmp(argv[0], "help") == 0) {
if (!strcmp(argv[0], "help")) {
/* Help */
print_user_usage();
return 0;
} else if (strcmp(argv[0], "summary") == 0) {
} else if (!strcmp(argv[0], "summary")) {
return ipmi_user_summary(intf, argc, argv);
} else if (strcmp(argv[0], "list") == 0) {
} else if (!strcmp(argv[0], "list")) {
return ipmi_user_list(intf, argc, argv);
} else if (strcmp(argv[0], "test") == 0) {
} else if (!strcmp(argv[0], "test")) {
return ipmi_user_test(intf, argc, argv);
} else if (strcmp(argv[0], "set") == 0) {
} else if (!strcmp(argv[0], "set")) {
/* Set */
if ((argc >= 3)
&& (strcmp("password", argv[1]) == 0)) {
if (argc >= 3
&& !strcmp("password", argv[1]))
{
return ipmi_user_password(intf, argc, argv);
} else if ((argc >= 2)
&& (strcmp("name", argv[1]) == 0)) {
} else if (argc >= 2
&& !strcmp("name", argv[1]))
{
return ipmi_user_name(intf, argc, argv);
} else {
print_user_usage();
return (-1);
}
} else if (strcmp(argv[0], "priv") == 0) {
} else if (!strcmp(argv[0], "priv")) {
return ipmi_user_priv(intf, argc, argv);
} else if ((strcmp(argv[0], "disable") == 0)
|| (strcmp(argv[0], "enable") == 0)) {
} else if (!strcmp(argv[0], "disable")
|| !strcmp(argv[0], "enable")) {
return ipmi_user_mod(intf, argc, argv);
} else {
lprintf(LOG_ERR, "Invalid user command: '%s'\n", argv[0]);

4
src/ipmievd.c
View File

@ -192,7 +192,7 @@ ipmi_event_intf_load(char * name)
intf++)
{
i = *intf;
if (strcmp(name, i->name) == 0) {
if (!strcmp(name, i->name)) {
return i;
}
}
@ -845,7 +845,7 @@ ipmievd_open_main(struct ipmi_intf * intf, int argc, char ** argv)
struct ipmi_event_intf * eintf;
/* only one interface works for this */
if (strcmp(intf->name, "open") != 0) {
if (strcmp(intf->name, "open")) {
lprintf(LOG_ERR, "Invalid Interface for OpenIPMI Event Handler: %s", intf->name);
return -1;
}

34
src/ipmishell.c
View File

@ -125,14 +125,12 @@ int ipmi_shell_main(struct ipmi_intf *intf, int argc, char **argv)
pbuf = NULL;
continue;
}
if (strcmp(pbuf, "quit") == 0 ||
strcmp(pbuf, "exit") == 0) {
if (!strcmp(pbuf, "quit") || !strcmp(pbuf, "exit")) {
free(pbuf);
pbuf = NULL;
return 0;
}
if (strcmp(pbuf, "help") == 0 ||
strcmp(pbuf, "?") == 0) {
if (!strcmp(pbuf, "help") || !strcmp(pbuf, "?")) {
ipmi_cmd_print(intf->cmdlist);
free(pbuf);
pbuf = NULL;
@ -258,13 +256,13 @@ ipmi_set_usage(void)
int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
{
if (argc == 0 || strcmp(argv[0], "help") == 0) {
if (!argc || !strcmp(argv[0], "help")) {
ipmi_set_usage();
return -1;
}
/* these options can have no arguments */
if (strcmp(argv[0], "verbose") == 0) {
if (!strcmp(argv[0], "verbose")) {
if (argc > 1) {
if (str2int(argv[1], &verbose) != 0) {
lprintf(LOG_ERR,
@ -277,7 +275,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
}
return 0;
}
if (strcmp(argv[0], "csv") == 0) {
if (!strcmp(argv[0], "csv")) {
if (argc > 1) {
if (str2int(argv[1], &csv_output) != 0) {
lprintf(LOG_ERR,
@ -297,8 +295,8 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
return -1;
}
if (strcmp(argv[0], "host") == 0 ||
strcmp(argv[0], "hostname") == 0) {
if (!strcmp(argv[0], "host") ||
!strcmp(argv[0], "hostname")) {
ipmi_intf_session_set_hostname(intf, argv[1]);
if (!intf->session) {
lprintf(LOG_ERR, "Failed to set session hostname.");
@ -307,8 +305,8 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
printf("Set session hostname to %s\n",
intf->ssn_params.hostname);
}
else if (strcmp(argv[0], "user") == 0 ||
strcmp(argv[0], "username") == 0) {
else if (!strcmp(argv[0], "user") ||
!strcmp(argv[0], "username")) {
ipmi_intf_session_set_username(intf, argv[1]);
if (!intf->session) {
lprintf(LOG_ERR, "Failed to set session username.");
@ -317,8 +315,8 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
printf("Set session username to %s\n",
intf->ssn_params.username);
}
else if (strcmp(argv[0], "pass") == 0 ||
strcmp(argv[0], "password") == 0) {
else if (!strcmp(argv[0], "pass") ||
!strcmp(argv[0], "password")) {
ipmi_intf_session_set_password(intf, argv[1]);
if (!intf->session) {
lprintf(LOG_ERR, "Failed to set session password.");
@ -326,7 +324,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
}
printf("Set session password\n");
}
else if (strcmp(argv[0], "authtype") == 0) {
else if (!strcmp(argv[0], "authtype")) {
int authtype;
authtype = str2val(argv[1], ipmi_authtype_session_vals);
if (authtype == 0xFF) {
@ -343,7 +341,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
val2str(intf->ssn_params.authtype_set,
ipmi_authtype_session_vals));
}
else if (strcmp(argv[0], "privlvl") == 0) {
else if (!strcmp(argv[0], "privlvl")) {
int privlvl;
privlvl = str2val(argv[1], ipmi_privlvl_vals);
if (privlvl == 0xFF) {
@ -361,7 +359,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
val2str(intf->ssn_params.privlvl,
ipmi_privlvl_vals));
}
else if (strcmp(argv[0], "port") == 0) {
else if (!strcmp(argv[0], "port")) {
int port = 0;
if (str2int(argv[1], &port) != 0 || port > MAX_PORT) {
lprintf(LOG_ERR, "Given port '%s' is invalid.",
@ -375,7 +373,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
}
printf("Set session port to %d\n", intf->ssn_params.port);
}
else if (strcmp(argv[0], "localaddr") == 0) {
else if (!strcmp(argv[0], "localaddr")) {
uint8_t my_addr = 0;
if (str2uchar(argv[1], &my_addr) != 0) {
lprintf(LOG_ERR, "Given localaddr '%s' is invalid.",
@ -385,7 +383,7 @@ int ipmi_set_main(struct ipmi_intf * intf, int argc, char ** argv)
intf->my_addr = my_addr;
printf("Set local IPMB address to 0x%02x\n", intf->my_addr);
}
else if (strcmp(argv[0], "targetaddr") == 0) {
else if (!strcmp(argv[0], "targetaddr")) {
uint8_t target_addr = 0;
if (str2uchar(argv[1], &target_addr) != 0) {
lprintf(LOG_ERR, "Given targetaddr '%s' is invalid.",

7
src/plugins/ipmi_intf.c
View File

@ -167,9 +167,8 @@ void ipmi_intf_print(struct ipmi_intf_support * intflist)
if (intflist) {
found = 0;
for (sup=intflist; sup->name; sup++) {
if (strcmp(sup->name, (*intf)->name) == 0 &&
strcmp(sup->name, (*intf)->name) == 0 &&
sup->supported == 1)
if (!strcmp(sup->name, (*intf)->name)
&& sup->supported)
found = 1;
}
if (found == 0)
@ -211,7 +210,7 @@ struct ipmi_intf * ipmi_intf_load(char * name)
intf++)
{
i = *intf;
if (strcmp(name, i->name) == 0) {
if (!strcmp(name, i->name)) {
if (i->setup && (i->setup(i) < 0)) {
lprintf(LOG_ERR, "Unable to setup "
"interface %s", name);

2
src/plugins/serial/serial_terminal.c
View File

@ -394,7 +394,7 @@ recv_response(struct ipmi_intf * intf, unsigned char *data, int len)
*pp = 0;
/* was it an error? */
if (strcmp(p, "ERR ") == 0) {
if (!strcmp(p, "ERR ")) {
serial_write_line(intf, "\r\r\r\r");
sleep(1);
serial_flush(intf);

4
src/plugins/usb/usb.c
View File

@ -133,7 +133,7 @@ scsiProbeNew(int *num_ami_devices, int *sg_nos)
}
if (sscanf(linebuf, "%s", vendor) == 1) {
if (strcmp(vendor, "AMI") == 0) {
if (!strcmp(vendor, "AMI")) {
numdevfound++;
sg_nos[numdevfound - 1] = lineno;
if (numdevfound == inplen) {
@ -249,7 +249,7 @@ IsG2Drive(int cd_desc)
return 1;
}
if (strcmp(szSignature, "$$$AMI$$$") != 0) {
if (strcmp(szSignature, "$$$AMI$$$")) {
lprintf(LOG_ERR,
"IsG2Drive:Signature mismatch when ID command sent");
return 1;