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

mc: Fix compiler warnings

Browse Source 
Fix a number of warnings in ipmi_mc.c, including a potentially
uninitialized variable for `mc watchdog set` command.

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2018-08-02 00:48:32 +03:00
parent 29e7d26edb
commit a8f3413dc2
No known key found for this signature in database
GPG Key ID: E893587B5B74178D
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ipmi_mc.c
View File

@ -726,7 +726,7 @@ ipmi_mc_get_watchdog(struct ipmi_intf * intf)
struct ipm_get_watchdog_rsp * wdt_res; struct ipm_get_watchdog_rsp * wdt_res;
double init_cnt; double init_cnt;
double pres_cnt; double pres_cnt;
int i; size_t i;
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_APP; req.msg.netfn = IPMI_NETFN_APP;
@ -808,8 +808,7 @@ parse_set_wdt_options(wdt_conf_t *conf, int argc, char *argv[])
} }
for (i = 0; i < argc; ++i) { for (i = 0; i < argc; ++i) {
unsigned long val; long val;
int j;
char *vstr = strchr(argv[i], '='); char *vstr = strchr(argv[i], '=');
if (vstr) if (vstr)
vstr++; /* Point to the value */ vstr++; /* Point to the value */
@ -817,7 +816,7 @@ parse_set_wdt_options(wdt_conf_t *conf, int argc, char *argv[])
switch (argv[i][0]) { /* only check the first letter to allow for switch (argv[i][0]) { /* only check the first letter to allow for
shortcuts */ shortcuts */
case 't': /* timeout */ case 't': /* timeout */
val = strtoul(vstr, NULL, 10); val = strtol(vstr, NULL, 10);
if (val < 1 || val > MAX_TIMEOUT) { if (val < 1 || val > MAX_TIMEOUT) {
lprintf(LOG_ERR, "Timeout value %lu is out of range (1-%d)\n", lprintf(LOG_ERR, "Timeout value %lu is out of range (1-%d)\n",
val, MAX_TIMEOUT); val, MAX_TIMEOUT);
@ -826,7 +825,7 @@ parse_set_wdt_options(wdt_conf_t *conf, int argc, char *argv[])
conf->timeout = val * 10; /* Convert seconds to 100ms intervals */ conf->timeout = val * 10; /* Convert seconds to 100ms intervals */
break; break;
case 'p': /* pretimeout */ case 'p': /* pretimeout */
val = strtoul(vstr, NULL, 10); val = strtol(vstr, NULL, 10);
if (val < 1 || val > MAX_PRETIMEOUT) { if (val < 1 || val > MAX_PRETIMEOUT) {
lprintf(LOG_ERR, lprintf(LOG_ERR,
"Pretimeout value %lu is out of range (1-%d)\n", "Pretimeout value %lu is out of range (1-%d)\n",
@ -897,9 +896,8 @@ ipmi_mc_set_watchdog(struct ipmi_intf * intf, int argc, char *argv[])
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
struct ipmi_rq req = {0}; struct ipmi_rq req = {0};
unsigned char msg_data[6] = {0}; unsigned char msg_data[6] = {0};
struct ipm_get_watchdog_rsp * wdt_res;
int rc = -1; int rc = -1;
wdt_conf_t conf; wdt_conf_t conf = {0};
bool options_error = parse_set_wdt_options(&conf, argc, argv); bool options_error = parse_set_wdt_options(&conf, argc, argv);
/* Fill data bytes according to IPMI 2.0 Spec section 27.6 */ /* Fill data bytes according to IPMI 2.0 Spec section 27.6 */
@ -1291,7 +1289,7 @@ ipmi_sysinfo_main(struct ipmi_intf *intf, int argc, char ** argv, int is_set)
{ {
char *str; char *str;
unsigned char infostr[256]; unsigned char infostr[256];
unsigned char paramdata[18]; char paramdata[18];
int len, maxset, param, pos, rc, set; int len, maxset, param, pos, rc, set;
if (argc == 2 && strcmp(argv[1], "help") == 0) { if (argc == 2 && strcmp(argv[1], "help") == 0) {