ipmitool/several_more_compile_fixes.patch

Cleanup and compiler issues only, no functional change

Changes partly very old and not possible to find the original author.

Signed-off-by: Thomas Renninger <trenn@suse.de>

Index: ipmitool-1.8.15/lib/ipmi_ekanalyzer.c
===================================================================
--- ipmitool-1.8.15.orig/lib/ipmi_ekanalyzer.c	2015-01-14 14:27:59.116693459 +0100
+++ ipmitool-1.8.15/lib/ipmi_ekanalyzer.c	2015-01-14 14:28:08.504693609 +0100
@@ -399,7 +399,6 @@
 static int
 ipmi_ek_get_file_type(char *argument)
 {
-	int index_name=0;
 	int filetype = ERROR_STATUS;
 	if (strlen(argument) <= MIN_ARGUMENT) {
 		return filetype;
@@ -3366,7 +3365,7 @@
 		printf("\n");
 		offset += sizeof(struct fru_picmgext_guid);
 	}
-	for (offset;
+	for (;
 			offset < record->header.len;
 			offset += sizeof(struct fru_picmgext_link_desc)) {
 		/* to solve little endian/big endian problem */
@@ -3525,7 +3524,7 @@
 	if (record->data[offset] < 1) {
 		return;
 	}
-	for (offset; offset < record->header.len;) {
+	for (; offset < record->header.len;) {
 		unsigned char entry_count = 0;
 		printf("   IPMB-0 Hub Descriptor\n");
 		printf("\tHardware Address: 0x%02x\n",
@@ -3983,7 +3982,7 @@
 					(feature & 1) ? "Source" : "Receiver");
 			printf("\tFamily:  0x%02x    - AccLVL: 0x%02x\n",
 					family, accuracy);
-			printf("\tFRQ: %-9ld - min: %-9ld - max: %-9ld\n",
+			printf("\tFRQ: %-9lu - min: %-9lu - max: %-9lu\n",
 					freq, min_freq, max_freq);
 		}
 		printf("\n");
Index: ipmitool-1.8.15/lib/ipmi_fwum.c
===================================================================
--- ipmitool-1.8.15.orig/lib/ipmi_fwum.c	2015-01-14 14:27:59.116693459 +0100
+++ ipmitool-1.8.15/lib/ipmi_fwum.c	2015-01-14 14:28:08.504693609 +0100
@@ -858,7 +858,6 @@
 	unsigned long lastAddress = 0;
 	unsigned char sequenceNumber = 0;
 	unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
-	unsigned char isLengthValid = 1;
 	do {
 		writeSize = save_fw_nfo.bufferSize - save_fw_nfo.overheadSize;
 		/* Reach the end */
Index: ipmitool-1.8.15/lib/ipmi_isol.c
===================================================================
--- ipmitool-1.8.15.orig/lib/ipmi_isol.c	2015-01-14 14:27:59.116693459 +0100
+++ ipmitool-1.8.15/lib/ipmi_isol.c	2015-01-14 14:28:08.504693609 +0100
@@ -413,7 +413,6 @@
 	struct ipmi_rs * rsp;
 	struct ipmi_rq   req;
 	uint8_t    data[6];	 
-	struct isol_config_parameters params;
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_ISOL;
Index: ipmitool-1.8.15/lib/ipmi_picmg.c
===================================================================
--- ipmitool-1.8.15.orig/lib/ipmi_picmg.c	2015-01-14 14:25:17.556690891 +0100
+++ ipmitool-1.8.15/lib/ipmi_picmg.c	2015-01-14 14:28:08.504693609 +0100
@@ -878,7 +878,7 @@
 					}
 					else if (d->type >= 0x06 && d->type <= 0xef)
 					{
-						printf("Reserved\n");
+						printf("Reserved %d\n",d->type);
 					}
 					else if (d->type >= 0xf0 && d->type <= 0xfe)
 					{
@@ -1690,7 +1690,7 @@
 						oemval2str( rsp->data[3], rsp->data[4],
 											picmg_clk_accuracy_vals));
 		
-		      printf("  - Freq:   %ld\n", freq);
+		      printf("  - Freq:   %lu\n", freq);
 		   }
 		}
 	}
Index: ipmitool-1.8.15/lib/ipmi_sdradd.c
===================================================================
--- ipmitool-1.8.15.orig/lib/ipmi_sdradd.c	2015-01-14 14:27:59.120693459 +0100
+++ ipmitool-1.8.15/lib/ipmi_sdradd.c	2015-01-14 14:28:08.504693609 +0100
@@ -575,7 +575,6 @@
 static int
 ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
 {
-  struct sdr_get_rs header;
   int rc = 0;
   int fd;
   uint8_t binHdr[5];
Index: ipmitool-1.8.15/lib/ipmi_sdr.c
===================================================================
--- ipmitool-1.8.15.orig/lib/ipmi_sdr.c	2015-01-14 14:27:59.120693459 +0100
+++ ipmitool-1.8.15/lib/ipmi_sdr.c	2015-01-14 14:28:08.508693609 +0100
@@ -52,6 +52,7 @@
 #include <ipmitool/ipmi_entity.h>
 #include <ipmitool/ipmi_constants.h>
 #include <ipmitool/ipmi_strings.h>
+#include <ipmitool/ipmi_sensor.h>
 
 #if HAVE_CONFIG_H
 # include <config.h>