development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vcs-svn: rename check_overflow arguments for clarity

Browse source 
Code using the argument names a and b just doesn't look right (not
sure why!).  Use more explicit names "offset" and "len" to make their
type and meaning clearer.

Also rename check_overflow() to check_offset_overflow() to clarify
that we are making sure that "len" bytes beyond "offset" still fits
the type to represent an offset.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramsay Jones 2012-02-02 04:59:23 -06:00 committed by Junio C Hamano
parent 58ebd9865d
commit 173223aa62
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
vcs-svn/sliding_window.c
View file

@ -31,15 +31,15 @@ static int read_to_fill_or_whine(struct line_buffer *file,
return 0;
}
static int check_overflow(off_t a, size_t b)
static int check_offset_overflow(off_t offset, size_t len)
{
if (b > maximum_signed_value_of_type(off_t))
if (len > maximum_signed_value_of_type(off_t))
return error("unrepresentable length in delta: "
"%"PRIuMAX" > OFF_MAX", (uintmax_t) b);
if (signed_add_overflows(a, (off_t) b))
"%"PRIuMAX" > OFF_MAX", (uintmax_t) len);
if (signed_add_overflows(offset, (off_t) len))
return error("unrepresentable offset in delta: "
"%"PRIuMAX" + %"PRIuMAX" > OFF_MAX",
(uintmax_t) a, (uintmax_t) b);
(uintmax_t) offset, (uintmax_t) len);
return 0;
}
@ -48,9 +48,9 @@ int move_window(struct sliding_view *view, off_t off, size_t width)
off_t file_offset;
assert(view);
assert(view->width <= view->buf.len);
assert(!check_overflow(view->off, view->buf.len));
assert(!check_offset_overflow(view->off, view->buf.len));
if (check_overflow(off, width))
if (check_offset_overflow(off, width))
return -1;
if (off < view->off || off + width < view->off + view->width)
return error("invalid delta: window slides left");