diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_ekanalyzer.c ./lib/ipmi_ekanalyzer.c --- ../orig-ipmitool-1.8.13/lib/ipmi_ekanalyzer.c 2013-08-23 21:02:34.000000000 +0200 +++ ./lib/ipmi_ekanalyzer.c 2013-10-04 09:11:10.594954861 +0200 @@ -397,7 +397,6 @@ static int ipmi_ek_get_file_type( char * argument ) { - int index_name=0; int filetype = ERROR_STATUS; if( strlen (argument) > MIN_ARGUMENT ){ @@ -3378,7 +3377,7 @@ offset += sizeof(struct fru_picmgext_guid); } - for ( offset; + for ( ; offset < record->header.len; offset += sizeof(struct fru_picmgext_link_desc) ) { @@ -3547,7 +3546,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++]); @@ -3990,7 +3989,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 ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c ./lib/ipmi_fwum.c --- ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c 2013-10-04 09:07:54.914943566 +0200 +++ ./lib/ipmi_fwum.c 2013-10-04 09:11:10.594954861 +0200 @@ -1302,7 +1302,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 ../orig-ipmitool-1.8.13/lib/ipmi_hpmfwupg.c ./lib/ipmi_hpmfwupg.c --- ../orig-ipmitool-1.8.13/lib/ipmi_hpmfwupg.c 2013-10-04 09:06:38.711823686 +0200 +++ ./lib/ipmi_hpmfwupg.c 2013-10-04 09:11:10.594954861 +0200 @@ -1323,7 +1323,6 @@ *****************************************************************************/ int HpmfwupgTargetCheck(struct ipmi_intf * intf, int option) { - struct HpmfwupgUpgradeCtx fwupgCtx; struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd; int rc = HPMFWUPG_SUCCESS; int componentId = 0; @@ -1507,7 +1506,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 ../orig-ipmitool-1.8.13/lib/ipmi_isol.c ./lib/ipmi_isol.c --- ../orig-ipmitool-1.8.13/lib/ipmi_isol.c 2013-01-16 13:29:21.000000000 +0100 +++ ./lib/ipmi_isol.c 2013-10-04 09:11:10.594954861 +0200 @@ -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 ../orig-ipmitool-1.8.13/lib/ipmi_picmg.c ./lib/ipmi_picmg.c --- ../orig-ipmitool-1.8.13/lib/ipmi_picmg.c 2013-05-18 08:31:02.000000000 +0200 +++ ./lib/ipmi_picmg.c 2013-10-04 09:11:10.598955025 +0200 @@ -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); } } } @@ -1751,7 +1751,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 ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c ./lib/ipmi_sdradd.c --- ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c 2013-10-04 09:10:35.533519436 +0200 +++ ./lib/ipmi_sdradd.c 2013-10-04 09:11:10.598955025 +0200 @@ -576,7 +576,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 ../orig-ipmitool-1.8.13/lib/ipmi_sdr.c ./lib/ipmi_sdr.c --- ../orig-ipmitool-1.8.13/lib/ipmi_sdr.c 2013-08-23 21:02:34.000000000 +0200 +++ ./lib/ipmi_sdr.c 2013-10-04 09:11:10.598955025 +0200 @@ -52,6 +52,7 @@ #include #include #include +#include #if HAVE_CONFIG_H # include