misc cleanups

This commit is contained in:
Duncan Laurie
2006-06-28 21:21:34 +00:00
parent 520aa05c07
commit 388b9e058d
4 changed files with 10 additions and 10 deletions

View File

@ -1431,7 +1431,7 @@ ipmi_fru_write_from_bin(struct ipmi_intf * intf,
free(pFruBuf); free(pFruBuf);
} }
static void static int
ipmi_fru_upg_ekeying(struct ipmi_intf * intf, ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
char * pFileName, char * pFileName,
uint8_t fruId) uint8_t fruId)
@ -1486,6 +1486,8 @@ ipmi_fru_upg_ekeying(struct ipmi_intf * intf,
if (buf) if (buf)
free(buf); free(buf);
return retStatus;
} }
static int static int

View File

@ -1560,7 +1560,7 @@ ipmi_lan_set(struct ipmi_intf * intf, int argc, char ** argv)
else { else {
ipmi_lan_set_usage(); ipmi_lan_set_usage();
} }
return rc; return rc;
} }

View File

@ -1332,7 +1332,7 @@ __ipmi_sel_savelist_entries(struct ipmi_intf * intf, int count, const char * sav
if (savefile != NULL) { if (savefile != NULL) {
fp = ipmi_open_file_write(savefile); fp = ipmi_open_file_write(savefile);
} }
while (next_id != 0xffff) { while (next_id != 0xffff) {
curr_id = next_id; curr_id = next_id;
@ -1498,7 +1498,7 @@ ipmi_sel_get_time(struct ipmi_intf * intf)
"Invalid data length %d", rsp->data_len); "Invalid data length %d", rsp->data_len);
return -1; return -1;
} }
memcpy(&timei, rsp->data, 4); memcpy(&timei, rsp->data, 4);
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
timei = BSWAP_32(timei); timei = BSWAP_32(timei);
@ -1551,7 +1551,7 @@ ipmi_sel_set_time(struct ipmi_intf * intf, const char * time_string)
} }
timei = (uint32_t)t; timei = (uint32_t)t;
req.msg.data = (uint8_t *)&timei; req.msg.data = (uint8_t *)&timei;
req.msg.data_len = 4; req.msg.data_len = 4;
#if WORDS_BIGENDIAN #if WORDS_BIGENDIAN
@ -1879,7 +1879,7 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
} else { } else {
lprintf(LOG_ERR, "sel time commands: get set"); lprintf(LOG_ERR, "sel time commands: get set");
} }
} }
else { else {
lprintf(LOG_ERR, "Invalid SEL command: %s", argv[0]); lprintf(LOG_ERR, "Invalid SEL command: %s", argv[0]);
rc = -1; rc = -1;
@ -1887,4 +1887,3 @@ int ipmi_sel_main(struct ipmi_intf * intf, int argc, char ** argv)
return rc; return rc;
} }

View File

@ -132,7 +132,7 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
/* for the all-important up arrow :) */ /* for the all-important up arrow :) */
add_history(pbuf); add_history(pbuf);
/* change "" and '' with spaces in the middle to ~ */ /* change "" and '' with spaces in the middle to ~ */
ptr = pbuf; ptr = pbuf;
while (*ptr != '\0') { while (*ptr != '\0') {
@ -196,7 +196,7 @@ int ipmi_shell_main(struct ipmi_intf * intf, int argc, char ** argv)
&(__argv[1])); &(__argv[1]));
free(pbuf); free(pbuf);
} }
return rc; return rc;
} }
@ -429,4 +429,3 @@ int ipmi_exec_main(struct ipmi_intf * intf, int argc, char ** argv)
fclose(fp); fclose(fp);
return rc; return rc;
} }