Re: [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:55
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity · Jonathan Nieder <hidden>
- 2016-06-15 · Re: [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity · Dmitry Ivankov <hidden>
- 2016-06-15 · Re: [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity · Jonathan Nieder <hidden>
- 2016-06-15 · Re: [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity · David Barr <hidden>
- 2016-06-15 · Re: [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity · Jonathan Nieder <hidden>
Ok, I've tentatively queued this. -- >8 -- From: Ramsay Jones <redacted> 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 <redacted> Signed-off-by: Junio C Hamano <redacted> --- vcs-svn/sliding_window.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index 1bac7a4..c6c2eff 100644
--- a/vcs-svn/sliding_window.c
+++ b/vcs-svn/sliding_window.c@@ -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");
--
1.7.9.172.ge26ae