rpm/ipmitool
SHA256
1
0
Fork 0
forked from pool/ipmitool
Code Pull Requests Activity
c38aedcaf2
ipmitool/several_more_compile_fixes.patch

158 lines
6.2 KiB
Diff
Raw Blame History

diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_ekanalyzer.c ./lib/ipmi_ekanalyzer.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_ekanalyzer.c 2013-02-28 13:59:10.489669393 +0100
+++ ./lib/ipmi_ekanalyzer.c 2013-02-28 14:03:01.722792252 +0100
@@ -395,7 +395,6 @@
static int
ipmi_ek_get_file_type( char * argument )
{
- int index_name=0;
int filetype = ERROR_STATUS;
if( strlen (argument) > MIN_ARGUMENT ){
@@ -1092,8 +1091,6 @@
}
else{
int num_file=0;
- int index_data = 0;
- int first_data = 1;
tboolean amc_file = FALSE; /*used to indicate the present of AMC file*/
tboolean oc_file = FALSE; /*used to indicate the present of Carrier file*/
@@ -1139,7 +1136,6 @@
struct ipmi_ek_multi_header * pcarrier_p2p;
int list = 0;
int match_pair = 0;
- tboolean match_result = FALSE;
/*Create an empty list*/
for ( list=0; list<argc; list++ ){
@@ -3250,7 +3246,7 @@
offset += sizeof(struct fru_picmgext_guid);
}
- for ( offset;
+ for ( ;
offset < record->header.len;
offset += sizeof(struct fru_picmgext_link_desc)
) {
@@ -3419,7 +3415,7 @@
printf(" IPMB-0 Hub Descriptor Count: 0x%02x", record->data[offset++]);
if (record->data[offset] > 0){
- 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", record->data[offset++]);
@@ -3850,7 +3846,7 @@
(feature > 1) & 1,
(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: %-9ld - max: %-9ld\n",
freq, min_freq, max_freq);
}
printf("\n");
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c ./lib/ipmi_fwum.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c 2013-02-28 13:53:34.644417793 +0100
+++ ./lib/ipmi_fwum.c 2013-02-28 14:04:34.910468572 +0100
@@ -480,7 +480,7 @@
if(pFileHandle)
{
- if(fseek(pFileHandle, 0L , SEEK_END) == (unsigned int) NULL)
+ if(fseek(pFileHandle, 0L , SEEK_END) == 0)
{
*pFileSize = ftell(pFileHandle);
@@ -1307,7 +1307,6 @@
unsigned long lastAddress = 0;
unsigned char sequenceNumber = 0;
unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
- unsigned char isLengthValid = 1;
do
{
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_hpmfwupg.c ./lib/ipmi_hpmfwupg.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_hpmfwupg.c 2013-02-28 13:52:11.893152359 +0100
+++ ./lib/ipmi_hpmfwupg.c 2013-02-28 14:01:19.162746040 +0100
@@ -1286,7 +1286,6 @@
*****************************************************************************/
int HpmfwupgTargetCheck(struct ipmi_intf * intf, int option)
{
- struct HpmfwupgUpgradeCtx fwupgCtx;
struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
int rc = HPMFWUPG_SUCCESS;
int componentId = 0;
@@ -1445,7 +1444,6 @@
int activate,int componentToUpload, int option)
{
int rc = HPMFWUPG_SUCCESS;
- struct HpmfwupgImageHeader imageHeader;
struct HpmfwupgUpgradeCtx fwupgCtx;
/*
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_isol.c ./lib/ipmi_isol.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_isol.c 2012-01-21 06:32:24.000000000 +0100
+++ ./lib/ipmi_isol.c 2013-02-28 14:01:19.162746040 +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;
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_picmg.c ./lib/ipmi_picmg.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_picmg.c 2012-08-03 19:07:07.000000000 +0200
+++ ./lib/ipmi_picmg.c 2013-02-28 14:18:31.523468906 +0100
@@ -432,7 +432,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)
{
@@ -1201,7 +1201,7 @@
oemval2str( rsp->data[3], rsp->data[4],
picmg_clk_accuracy_vals));
- printf(" - Freq: %ld\n", freq);
+ printf(" - Freq: %lu\n", freq);
}
}
}
@@ -1258,7 +1258,7 @@
printf("## setting: 0x%02x\n", msg_data[3]);
printf("## family: %d\n", msg_data[4]);
printf("## acc: %d\n", msg_data[5]);
-printf("## freq: %ld\n", freq );
+printf("## freq: %lu\n", freq );
printf("## res: %d\n", msg_data[10]);
#endif
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_sdradd.c ./lib/ipmi_sdradd.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_sdradd.c 2013-02-28 13:55:22.988692984 +0100
+++ ./lib/ipmi_sdradd.c 2013-02-28 14:01:19.166746197 +0100
@@ -573,7 +573,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];
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_sdr.c ./lib/ipmi_sdr.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_sdr.c 2012-07-23 16:52:57.000000000 +0200
+++ ./lib/ipmi_sdr.c 2013-02-28 14:01:19.166746197 +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>
View Git Blame Copy Permalink