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

fix compile warnings

Browse Source
This commit is contained in:
Duncan Laurie 2006-05-16 23:09:06 +00:00
parent 12a6554416
commit 10154ba9ce
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipmitool/lib/ipmi_fwum.c
View File

@ -37,12 +37,12 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
#include <unistd.h>
#include <ipmitool/helper.h> #include <ipmitool/helper.h>
#include <ipmitool/ipmi.h> #include <ipmitool/ipmi.h>
#include <ipmitool/ipmi_fwum.h> #include <ipmitool/ipmi_fwum.h>
#include <ipmitool/ipmi_intf.h> #include <ipmitool/ipmi_intf.h>
#include <ipmitool/ipmi_mc.h> #include <ipmitool/ipmi_mc.h>
@ -132,8 +132,6 @@ typedef struct sKFWUM_SaveFirmwareInfo
extern int verbose; extern int verbose;
static unsigned char fileName[512]; static unsigned char fileName[512];
static unsigned char firmBuf[1024*512]; static unsigned char firmBuf[1024*512];
static unsigned char firmMaj;
static unsigned char firmMinSub;
static tKFWUM_SaveFirmwareInfo saveFirmwareInfo; static tKFWUM_SaveFirmwareInfo saveFirmwareInfo;
static void KfwumOutputHelp(void); static void KfwumOutputHelp(void);
@ -172,7 +170,7 @@ static tKFWUM_Status KfwumGetTraceLog(struct ipmi_intf * intf);
tKFWUM_Status KfwumValidFirmwareForBoard(tKFWUM_BoardInfo boardInfo, tKFWUM_Status KfwumValidFirmwareForBoard(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo); tKFWUM_InFirmwareInfo firmInfo);
tKFWUM_Status KfwumOutputInfo(tKFWUM_BoardInfo boardInfo, static void KfwumOutputInfo(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo); tKFWUM_InFirmwareInfo firmInfo);
int ipmi_fwum_main(struct ipmi_intf * intf, int argc, char ** argv) int ipmi_fwum_main(struct ipmi_intf * intf, int argc, char ** argv)
@ -541,7 +539,7 @@ void KfwumShowProgress( const unsigned char * task, unsigned long current ,
printf("%s", spaces ); printf("%s", spaces );
printf(" %3d %%\r",progress); /* total 7 bytes */ printf(" %3ld %%\r",progress); /* total 7 bytes */
if( progress == 100 ) if( progress == 100 )
{ {
@ -705,8 +703,6 @@ static tKFWUM_Status KfwumGetDeviceInfo(struct ipmi_intf * intf,
if(status == KFWUM_STATUS_OK) if(status == KFWUM_STATUS_OK)
{ {
unsigned long manufId;
unsigned short boardId;
pGetDevId = (struct ipm_devid_rsp *) rsp->data; pGetDevId = (struct ipm_devid_rsp *) rsp->data;
pBoardInfo->iana = IPM_DEV_MANUFACTURER_ID(pGetDevId->manufacturer_id); pBoardInfo->iana = IPM_DEV_MANUFACTURER_ID(pGetDevId->manufacturer_id);
pBoardInfo->boardId = buf2short(pGetDevId->product_id); pBoardInfo->boardId = buf2short(pGetDevId->product_id);
@ -821,7 +817,7 @@ static tKFWUM_Status KfwumGetStatus(struct ipmi_intf * intf)
firmLength = firmLength << 8; firmLength = firmLength << 8;
firmLength |= pGetStatus->firmLengthLSB; firmLength |= pGetStatus->firmLengthLSB;
printf("Firmware Length : %d bytes\n", firmLength); printf("Firmware Length : %ld bytes\n", firmLength);
printf("Firmware Revision : %u.%u%u SDR %u\n", printf("Firmware Revision : %u.%u%u SDR %u\n",
pGetStatus->firmRev1, pGetStatus->firmRev2 >> 4, pGetStatus->firmRev1, pGetStatus->firmRev2 >> 4,
pGetStatus->firmRev2 & 0x0f, pGetStatus->firmRev3); pGetStatus->firmRev2 & 0x0f, pGetStatus->firmRev3);
@ -964,7 +960,6 @@ static tKFWUM_Status KfwumSaveFirmwareImage(struct ipmi_intf * intf,
struct ipmi_rq req; struct ipmi_rq req;
unsigned char out = 0; unsigned char out = 0;
unsigned char retry = 0; unsigned char retry = 0;
unsigned char counter;
struct KfwumSaveFirmwareAddressReq addressReq; struct KfwumSaveFirmwareAddressReq addressReq;
struct KfwumSaveFirmwareSequenceReq sequenceReq; struct KfwumSaveFirmwareSequenceReq sequenceReq;
@ -1106,9 +1101,6 @@ static tKFWUM_Status KfwumUploadFirmware(struct ipmi_intf * intf,
do do
{ {
unsigned char bytes;
unsigned char chksum = 0;
writeSize = saveFirmwareInfo.bufferSize - saveFirmwareInfo.overheadSize; writeSize = saveFirmwareInfo.bufferSize - saveFirmwareInfo.overheadSize;
/* Reach the end */ /* Reach the end */
@ -1461,7 +1453,7 @@ tKFWUM_Status KfwumValidFirmwareForBoard(tKFWUM_BoardInfo boardInfo,
} }
tKFWUM_Status KfwumOutputInfo(tKFWUM_BoardInfo boardInfo, static void KfwumOutputInfo(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo) tKFWUM_InFirmwareInfo firmInfo)
{ {
#if 0 #if 0
@ -1485,7 +1477,7 @@ tKFWUM_Status KfwumOutputInfo(tKFWUM_BoardInfo boardInfo,
printf("Target Board Id : %u\n",boardInfo.boardId); printf("Target Board Id : %u\n",boardInfo.boardId);
printf("Target IANA number : %u\n",boardInfo.iana); printf("Target IANA number : %u\n",boardInfo.iana);
printf("File Size : %u bytes\n",firmInfo.fileSize); printf("File Size : %lu bytes\n",firmInfo.fileSize);
printf("Firmware Version : %d.%d%d SDR %d\n",firmInfo.versMajor, printf("Firmware Version : %d.%d%d SDR %d\n",firmInfo.versMajor,
firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev); firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev);

8
ipmitool/lib/ipmi_kontronoem.c
View File

@ -148,8 +148,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
struct fru_header header; struct fru_header header;
uint8_t msg_data[4]; uint8_t msg_data[4];
char *sn; char *sn;
uint8_t sn_size, checksum,prev_lun; uint8_t sn_size, checksum;
int ret = 0;
uint8_t *fru_data, *fru_area; uint8_t *fru_data, *fru_area;
uint32_t fru_data_offset, fru_data_offset_tmp, board_sec_len, prod_sec_len, i; uint32_t fru_data_offset, fru_data_offset_tmp, board_sec_len, prod_sec_len, i;
@ -193,7 +192,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
if(sn == NULL) if(sn == NULL)
{ {
printf("Out of memory!"); printf("Out of memory!");
return; return -1;
} }
memset(sn, 0, sn_size + 1); memset(sn, 0, sn_size + 1);
@ -435,7 +434,6 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf * intf)
uint32_t board_sec_len, i; uint32_t board_sec_len, i;
uint8_t *fru_data, checksum; uint8_t *fru_data, checksum;
int ret = 0;
@ -551,7 +549,7 @@ ipmi_kontron_set_mfg_date (struct ipmi_intf * intf)
if(fru_data == NULL) if(fru_data == NULL)
{ {
lprintf("Out of memory!"); printf("Out of memory!");
return(-1); return(-1);
} }