File compile-fixes of Package ipmitool

Overview Repositories Revisions Requests Users Attributes Meta

File compile-fixes of Package ipmitool

Several compiler warning fixes

These were in SUSE distris for quite some time and got
forwardported from 1.8.10 to 1.8.11.

---
 lib/ipmi_ekanalyzer.c |   24 ++++++++++++++----------
 lib/ipmi_fru.c        |    3 ++-
 lib/ipmi_hpmfwupg.c   |    8 ++++----
 3 files changed, 20 insertions(+), 15 deletions(-)

Index: ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
===================================================================
--- ipmitool-1.8.11.orig/lib/ipmi_ekanalyzer.c
+++ ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
@@ -3025,9 +3025,10 @@ ipmi_ek_display_address_table_record( st
 
    for ( i = 0; i < entries; i++ ){
       printf("\tHWAddr: 0x%02x  - SiteNum: 0x%02x - SiteType: 0x%02x \n",
-               record->data[offset++],
-               record->data[offset++],
-               record->data[offset++]);
+               record->data[offset+2],
+               record->data[offset+1],
+               record->data[offset+0]);
+      offset += 3;
    }
 }
 
@@ -3148,21 +3149,24 @@ ipmi_ek_display_shelf_ip_connection_reco
    int offset = START_DATA_OFFSET;
    if (offset > record->header.len){
       printf("   Shelf Manager IP Address: %d.%d.%d.%d\n",
-            record->data[offset++], record->data[offset++],
-            record->data[offset++], record->data[offset++]
+            record->data[offset+3], record->data[offset+2],
+            record->data[offset+1], record->data[offset+0]
          );
+      offset += 4;
    }
    if (offset > record->header.len){
       printf("   Default Gateway Address: %d.%d.%d.%d\n",
-            record->data[offset++], record->data[offset++],
-            record->data[offset++], record->data[offset++]
+            record->data[offset+3], record->data[offset+2],
+            record->data[offset+1], record->data[offset+0]
          );
+      offset += 4;
    }
    if (offset > record->header.len){
-      printf("   Subnet Mask: %d.%d.%d.%d\n", record->data[offset++],
-            record->data[offset++], record->data[offset++],
-            record->data[offset++]
+      printf("   Subnet Mask: %d.%d.%d.%d\n",
+            record->data[offset+3], record->data[offset+2],
+            record->data[offset+1], record->data[offset+0]
          );
+      offset += 4;
    }
 }
 
Index: ipmitool-1.8.11/lib/ipmi_fru.c
===================================================================
--- ipmitool-1.8.11.orig/lib/ipmi_fru.c
+++ ipmitool-1.8.11/lib/ipmi_fru.c
@@ -1840,7 +1840,8 @@ static void ipmi_fru_picmg_ext_print(uin
 
 			for (i=0; i<entries; i++) {
 				printf("			 HWAddr: 0x%02x  - SiteNum: 0x%02x - SiteType: 0x%02x \n",
-					 fru_data[offset++], fru_data[offset++], fru_data[offset++]);
+					 fru_data[offset+2], fru_data[offset+1], fru_data[offset+0]);
+				offset += 3;
 			}
 		}
 			break;
Index: ipmitool-1.8.11/lib/ipmi_hpmfwupg.c
===================================================================
--- ipmitool-1.8.11.orig/lib/ipmi_hpmfwupg.c
+++ ipmitool-1.8.11/lib/ipmi_hpmfwupg.c
@@ -1136,7 +1136,7 @@ void HpmDisplayUpgrade( int skip, unsign
 * Description: This function displays the information about version header 
 *
 *****************************************************************************/
-int HpmDisplayVersionHeader(int mode)
+void HpmDisplayVersionHeader(int mode)
 {
 
    if ( mode & IMAGE_VER)
@@ -1162,7 +1162,7 @@ int HpmDisplayVersionHeader(int mode)
 * Description: This function displays the version of the image and target
 *
 *****************************************************************************/
-int HpmDisplayVersion(int mode,VERSIONINFO *pVersion)
+void HpmDisplayVersion(int mode,VERSIONINFO *pVersion)
 {
       char descString[12];
       memset(&descString,0x00,12);
@@ -1233,7 +1233,7 @@ int HpmfwupgTargetCheck(struct ipmi_intf
     if (rc != HPMFWUPG_SUCCESS)
     {
         lprintf(LOG_NOTICE,"Verify whether the Target board is present \n");
-        return;
+        return rc;
     }
 
     rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
@@ -3516,7 +3516,7 @@ int ipmi_hpmfwupg_main(struct ipmi_intf
    if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) 
    {
       HpmfwupgPrintUsage();
-      return;
+      return rc;
     }
    if ( (strcmp(argv[0], "check") == 0) )
    {

Places

File compile-fixes of Package ipmitool

Places