@matheusbsbs / matheus-bagliano / commits / 5b8bf02930

vcs-svn: suppress -Wtype-limits warning

On 32-bit architectures with 64-bit file offsets, gcc 4.3 and earlier produce the following warning: CC vcs-svn/sliding_window.o vcs-svn/sliding_window.c: In function `check_overflow': vcs-svn/sliding_window.c:36: warning: comparison is always false \ due to limited range of data type The warning appears even when gcc is run without any warning flags (PR12963). In later versions it can be reproduced with -Wtype-limits, which is implied by -Wextra. On 64-bit architectures it really is possible for a size_t not to be representable as an off_t so the check being warned about is not actually redundant. But even false positives are distracting. Avoid the warning by making the "len" argument to check_overflow a uintmax_t; no functional change intended. Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Jonathan Nieder committed Feb 2, 2012 at 04:28 UTC 5b8bf02930674a5c2cba42d919ba3c0c96bf58e4

1 file changed +3 -3

vcs-svn/sliding_window.c

+3 -3

@@ -31,15 +31,15 @@ static int read_to_fill_or_whine(struct line_buffer *file,

31 return 0;

32 }

34 -static int check_offset_overflow(off_t offset, size_t len)

34 +static int check_offset_overflow(off_t offset, uintmax_t len)

35 {

36 if (len > maximum_signed_value_of_type(off_t))

37 return error("unrepresentable length in delta: "

38 - "%"PRIuMAX" > OFF_MAX", (uintmax_t) len);

38 + "%"PRIuMAX" > OFF_MAX", len);

39 if (signed_add_overflows(offset, (off_t) len))

40 return error("unrepresentable offset in delta: "

41 "%"PRIuMAX" + %"PRIuMAX" > OFF_MAX",

42 - (uintmax_t) offset, (uintmax_t) len);

42 + (uintmax_t) offset, len);

43 return 0;

44 }