git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: David Barr <davidbarr@google.com>
Cc: Dmitry Ivankov <divanorama@gmail.com>,
	Junio C Hamano <gitster@pobox.com>,
	Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
	GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity
Date: Thu, 2 Feb 2012 05:27:32 -0600	[thread overview]
Message-ID: <20120202112732.GA15537@burratino> (raw)
In-Reply-To: <CAFfmPPOeFk871m_N+nLXgQx3Uj4wVhgR9BNFzM2ggtseop0JaA@mail.gmail.com>

David Barr wrote:

> Maybe rename to check_offset_overflow to make it explicit?

Ok, here's the patch I'll squash in. ;-)

diff --git i/vcs-svn/sliding_window.c w/vcs-svn/sliding_window.c
index 2f4ae60f..ec2707c9 100644
--- i/vcs-svn/sliding_window.c
+++ w/vcs-svn/sliding_window.c
@@ -31,7 +31,7 @@ static int read_to_fill_or_whine(struct line_buffer *file,
 	return 0;
 }
 
-static int check_overflow(off_t offset, uintmax_t len)
+static int check_offset_overflow(off_t offset, uintmax_t len)
 {
 	if (len > maximum_signed_value_of_type(off_t))
 		return error("unrepresentable length in delta: "
@@ -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");

  reply	other threads:[~2012-02-02 11:27 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-31 18:48 [PATCH] vcs-svn: Fix some compiler warnings Ramsay Jones
2012-01-31 19:20 ` Jonathan Nieder
2012-01-31 20:14   ` Junio C Hamano
2012-02-02  4:14   ` Junio C Hamano
2012-02-02 10:41     ` [PATCH/RFC 0/3] " Jonathan Nieder
2012-02-02 10:59       ` [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity Jonathan Nieder
2012-02-02 11:05         ` Dmitry Ivankov
2012-02-02 11:16           ` Jonathan Nieder
2012-02-02 11:25             ` David Barr
2012-02-02 11:27               ` Jonathan Nieder [this message]
2012-02-02 18:56                 ` Junio C Hamano
2012-02-02 11:03       ` [PATCH 2/3] vcs-svn: allow import of > 4GiB files Jonathan Nieder
2012-02-02 11:06       ` [PATCH 3/3] vcs-svn: suppress a -Wtype-limits warning Jonathan Nieder
2012-02-02 22:18         ` Ramsay Jones
2012-02-02 18:24   ` [PATCH] vcs-svn: Fix some compiler warnings Ramsay Jones
2012-02-02 18:53     ` Jonathan Nieder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120202112732.GA15537@burratino \
    --to=jrnieder@gmail.com \
    --cc=davidbarr@google.com \
    --cc=divanorama@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ramsay@ramsay1.demon.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).