narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
pull/88/head
Michael Brown 2019-01-21 11:17:04 +00:00
parent 3946aa9bac
commit 956f6a7227
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/zbin.c
View File

@ -386,16 +386,16 @@ static int process_zinfo_add ( struct input_file *input
( ( 1UL << ( 8 * datasize ) ) - 1 ) : ~0UL ); ( ( 1UL << ( 8 * datasize ) ) - 1 ) : ~0UL );
if ( val < 0 ) { if ( val < 0 ) {
fprintf ( stderr, "Add %s%#x+%#lx at %#zx %sflows field\n", fprintf ( stderr, "Add %s%#lx+%#lx at %#zx %sflows field\n",
( ( addend < 0 ) ? "-" : "" ), abs ( addend ), size, ( ( addend < 0 ) ? "-" : "" ), labs ( addend ), size,
offset, ( ( addend < 0 ) ? "under" : "over" ) ); offset, ( ( addend < 0 ) ? "under" : "over" ) );
return -1; return -1;
} }
if ( val & ~mask ) { 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", "field (%d bytes too big)\n",
( ( addend < 0 ) ? "-" : "" ), abs ( addend ), size, ( ( addend < 0 ) ? "-" : "" ), labs ( addend ), size,
offset, datasize, offset, datasize,
( int )( ( val - mask - 1 ) * add->divisor ) ); ( int )( ( val - mask - 1 ) * add->divisor ) );
return -1; return -1;
@ -414,9 +414,9 @@ static int process_zinfo_add ( struct input_file *input
} }
if ( DEBUG ) { 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 ), "%#lx\n", offset, ( offset + datasize ),
( ( addend < 0 ) ? "-" : "" ), abs ( addend ), ( ( addend < 0 ) ? "-" : "" ), labs ( addend ),
len, add->divisor, val ); len, add->divisor, val );
} }