Skip to content

Commit 3f79000

Browse files
jrngitster
authored andcommitted
vcs-svn: suppress a -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 (this is gcc bug 12963). In later versions the same warning 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 this is warning 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 <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 150f754 commit 3f79000

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

vcs-svn/sliding_window.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ static int read_to_fill_or_whine(struct line_buffer *file,
3131
return 0;
3232
}
3333

34-
static int check_offset_overflow(off_t offset, size_t len)
34+
static int check_offset_overflow(off_t offset, uintmax_t len)
3535
{
3636
if (len > maximum_signed_value_of_type(off_t))
3737
return error("unrepresentable length in delta: "
38-
"%"PRIuMAX" > OFF_MAX", (uintmax_t) len);
38+
"%"PRIuMAX" > OFF_MAX", len);
3939
if (signed_add_overflows(offset, (off_t) len))
4040
return error("unrepresentable offset in delta: "
4141
"%"PRIuMAX" + %"PRIuMAX" > OFF_MAX",
42-
(uintmax_t) offset, (uintmax_t) len);
42+
(uintmax_t) offset, len);
4343
return 0;
4444
}
4545

0 commit comments

Comments
 (0)