From 10154ba9cec9e4ca1d3f4679ffb3b7f78b9b15ae Mon Sep 17 00:00:00 2001
From: Duncan Laurie <duncan@iceblink.org>
Date: Tue, 16 May 2006 23:09:06 +0000
Subject: [PATCH] fix compile warnings

---
 ipmitool/lib/ipmi_fwum.c       | 20 ++++++--------------
 ipmitool/lib/ipmi_kontronoem.c |  8 +++-----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/ipmitool/lib/ipmi_fwum.c b/ipmitool/lib/ipmi_fwum.c
index 2b8e03d..2a448e5 100644
--- a/ipmitool/lib/ipmi_fwum.c
+++ b/ipmitool/lib/ipmi_fwum.c
@@ -37,12 +37,12 @@
 #include <string.h>
 #include <math.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <ipmitool/helper.h>
 #include <ipmitool/ipmi.h>
 #include <ipmitool/ipmi_fwum.h>
 #include <ipmitool/ipmi_intf.h>
-
 #include <ipmitool/ipmi_mc.h>
 
 
@@ -132,8 +132,6 @@ typedef struct sKFWUM_SaveFirmwareInfo
 extern int verbose;
 static unsigned char fileName[512];
 static unsigned char firmBuf[1024*512];
-static unsigned char firmMaj;
-static unsigned char firmMinSub;
 static tKFWUM_SaveFirmwareInfo saveFirmwareInfo;
 
 static void KfwumOutputHelp(void);
@@ -172,7 +170,7 @@ static tKFWUM_Status KfwumGetTraceLog(struct ipmi_intf * intf);
 
 tKFWUM_Status KfwumValidFirmwareForBoard(tKFWUM_BoardInfo boardInfo,
                                                 tKFWUM_InFirmwareInfo firmInfo);
-tKFWUM_Status KfwumOutputInfo(tKFWUM_BoardInfo boardInfo,
+static void KfwumOutputInfo(tKFWUM_BoardInfo boardInfo,
                                                 tKFWUM_InFirmwareInfo firmInfo);
 
 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(" %3d %%\r",progress); /* total 7 bytes */
+      printf(" %3ld %%\r",progress); /* total 7 bytes */
 
       if( progress == 100 )
       {
@@ -705,8 +703,6 @@ static tKFWUM_Status KfwumGetDeviceInfo(struct ipmi_intf * intf,
 
    if(status == KFWUM_STATUS_OK)
    {
-      unsigned long manufId;
-      unsigned short boardId;
       pGetDevId = (struct ipm_devid_rsp *) rsp->data;
       pBoardInfo->iana = IPM_DEV_MANUFACTURER_ID(pGetDevId->manufacturer_id);
       pBoardInfo->boardId = buf2short(pGetDevId->product_id);
@@ -821,7 +817,7 @@ static tKFWUM_Status KfwumGetStatus(struct ipmi_intf * intf)
             firmLength  = firmLength << 8;
             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",
                               pGetStatus->firmRev1,  pGetStatus->firmRev2 >> 4,
                            pGetStatus->firmRev2 & 0x0f, pGetStatus->firmRev3);
@@ -964,7 +960,6 @@ static tKFWUM_Status KfwumSaveFirmwareImage(struct ipmi_intf * intf,
    struct ipmi_rq req;
    unsigned char out = 0;
    unsigned char retry = 0;
-   unsigned char counter;
    struct KfwumSaveFirmwareAddressReq  addressReq;
    struct KfwumSaveFirmwareSequenceReq sequenceReq;
    
@@ -1106,9 +1101,6 @@ static tKFWUM_Status KfwumUploadFirmware(struct ipmi_intf * intf,
 
    do
    {
-      unsigned char  bytes;
-      unsigned char  chksum = 0;
-      
       writeSize = saveFirmwareInfo.bufferSize - saveFirmwareInfo.overheadSize;
            
       /* 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)
 {
 #if 0
@@ -1485,7 +1477,7 @@ tKFWUM_Status KfwumOutputInfo(tKFWUM_BoardInfo boardInfo,
 
    printf("Target Board Id            : %u\n",boardInfo.boardId);
    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,
                    firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev);
 
diff --git a/ipmitool/lib/ipmi_kontronoem.c b/ipmitool/lib/ipmi_kontronoem.c
index 80df38a..ef3e378 100644
--- a/ipmitool/lib/ipmi_kontronoem.c
+++ b/ipmitool/lib/ipmi_kontronoem.c
@@ -148,8 +148,7 @@ ipmi_kontron_set_serial_number(struct ipmi_intf * intf)
    struct fru_header header;
    uint8_t msg_data[4];
    char *sn;
-   uint8_t sn_size, checksum,prev_lun;
-   int ret = 0;
+   uint8_t sn_size, checksum;
    uint8_t  *fru_data, *fru_area;
    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)
    {
       printf("Out of memory!");
-      return;
+      return -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;
    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)
    {
-      lprintf("Out of memory!");
+      printf("Out of memory!");
       return(-1);
    }