SHA256
1
0
forked from pool/ipmitool
ipmitool/several_more_compile_fixes.patch
Thomas Renninger 61368ed885 Accepting request 393423 from home:trenn:branches:systemsmanagement
- Update to latest version: 1.8.17
D    ipmitool-1.8.10-implicit-fortify-decl.patch
D    ipmitool-1_8_16_HEAD.patch
D    latest_compile_fixes.patch
D    ipmitool-sol_memleak.patch
- Remove whitespace changes from:
M    0001-Incorporate-upstream-comments-to-289-add-whitespace.patch

OBS-URL: https://build.opensuse.org/request/show/393423
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=36
2016-05-03 13:21:12 +00:00

72 lines
2.6 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.17/lib/ipmi_ekanalyzer.c
===================================================================
--- ipmitool-1.8.17.orig/lib/ipmi_ekanalyzer.c 2016-05-01 10:03:39.000000000 +0200
+++ ipmitool-1.8.17/lib/ipmi_ekanalyzer.c 2016-05-03 14:09:46.242458958 +0200
@@ -3363,7 +3363,7 @@ ipmi_ek_display_board_p2p_record(struct
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 */
@@ -3522,7 +3522,7 @@ ipmi_ek_display_radial_ipmb0_record(stru
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",
@@ -3980,7 +3980,7 @@ ipmi_ek_display_clock_config_record(stru
(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.17/lib/ipmi_picmg.c
===================================================================
--- ipmitool-1.8.17.orig/lib/ipmi_picmg.c 2016-05-01 10:03:39.000000000 +0200
+++ ipmitool-1.8.17/lib/ipmi_picmg.c 2016-05-03 14:09:46.250459411 +0200
@@ -855,7 +855,7 @@ ipmi_picmg_portstate_get(struct ipmi_int
}
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)
{
@@ -1707,7 +1707,7 @@ ipmi_picmg_clk_get(struct ipmi_intf * in
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.17/lib/ipmi_sdr.c
===================================================================
--- ipmitool-1.8.17.orig/lib/ipmi_sdr.c 2016-05-01 10:03:39.000000000 +0200
+++ ipmitool-1.8.17/lib/ipmi_sdr.c 2016-05-03 14:09:46.258459865 +0200
@@ -53,6 +53,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>