Thomas Renninger
ee43dfb67f
- Update to latest ipmitool source code commit 999cd0ad9192b19ec57574e7aca111571f4d21d8 Date: Fri Mar 6 09:03:05 2015 -0600 and throw away patches that went mainline. OBS-URL: https://build.opensuse.org/request/show/339080 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=31
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
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
|
|
@@ -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_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_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>
|