File ipxe.956f6a7227b62ce98d7840439af17bbca04f0c86.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ipxe.956f6a7227b62ce98d7840439af17bbca04f0c86.patch of Package xen (Revision 64deec46161a6604ed78bd78b28ddd99)

Currently displaying revision 64deec46161a6604ed78bd78b28ddd99 , Show latest

From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 21 Jan 2019 11:17:04 +0000
Subject: 956f6a7227b62ce98d7840439af17bbca04f0c86
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[zbin] Fix compiler warning with GCC 9

GCC 9 warns that abs() may truncate its signed long argument.  Fix by
using labs() instead.

Reported-by: Martin Liška <mliska@suse.cz>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/util/zbin.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- a/src/util/zbin.c
+++ b/src/util/zbin.c
@@ -377,55 +377,55 @@ static int process_zinfo_add ( struct input_file *input
 		fprintf ( stderr, "Unsupported add datasize %zd\n",
 			  datasize );
 		return -1;
 	}
 
 	val = size + addend;
 
 	/* The result of 1UL << ( 8 * sizeof(unsigned long) ) is undefined */
 	mask = ( ( datasize < sizeof ( mask ) ) ?
 		 ( ( 1UL << ( 8 * datasize ) ) - 1 ) : ~0UL );
 
 	if ( val < 0 ) {
-		fprintf ( stderr, "Add %s%#x+%#lx at %#zx %sflows field\n",
-			  ( ( addend < 0 ) ? "-" : "" ), abs ( addend ), size,
+		fprintf ( stderr, "Add %s%#lx+%#lx at %#zx %sflows field\n",
+			  ( ( addend < 0 ) ? "-" : "" ), labs ( addend ), size,
 			  offset, ( ( addend < 0 ) ? "under" : "over" ) );
 		return -1;
 	}
 
 	if ( val & ~mask ) {
-		fprintf ( stderr, "Add %s%#x+%#lx at %#zx overflows %zd-byte "
+		fprintf ( stderr, "Add %s%#lx+%#lx at %#zx overflows %zd-byte "
 			  "field (%d bytes too big)\n",
-			  ( ( addend < 0 ) ? "-" : "" ), abs ( addend ), size,
+			  ( ( addend < 0 ) ? "-" : "" ), labs ( addend ), size,
 			  offset, datasize,
 			  ( int )( ( val - mask - 1 ) * add->divisor ) );
 		return -1;
 	}
 
 	switch ( datasize ) {
 	case 1:
 		*( ( uint8_t * ) target ) = val;
 		break;
 	case 2:
 		*( ( uint16_t * ) target ) = val;
 		break;
 	case 4:
 		*( ( uint32_t * ) target ) = val;
 		break;
 	}
 
 	if ( DEBUG ) {
-		fprintf ( stderr, "ADDx [%#zx,%#zx) (%s%#x+(%#zx/%#x)) = "
+		fprintf ( stderr, "ADDx [%#zx,%#zx) (%s%#lx+(%#zx/%#x)) = "
 			  "%#lx\n", offset, ( offset + datasize ),
-			  ( ( addend < 0 ) ? "-" : "" ), abs ( addend ),
+			  ( ( addend < 0 ) ? "-" : "" ), labs ( addend ),
 			  len, add->divisor, val );
 	}
 
 	return 0;
 }
 
 static int process_zinfo_addb ( struct input_file *input,
 				struct output_file *output,
 				union zinfo_record *zinfo ) {
 	return process_zinfo_add ( input, output, output->len,
 				   &zinfo->add, 0, 1 );
 }

Places

File ipxe.956f6a7227b62ce98d7840439af17bbca04f0c86.patch of Package xen (Revision 64deec46161a6604ed78bd78b28ddd99)

Places