From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
David Barr <davidbarr@google.com>,
GIT Mailing-list <git@vger.kernel.org>,
Dmitry Ivankov <divanorama@gmail.com>
Subject: [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity
Date: Thu, 2 Feb 2012 04:59:23 -0600 [thread overview]
Message-ID: <20120202105923.GJ3823@burratino> (raw)
In-Reply-To: <20120202104128.GG3823@burratino>
From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
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 function clearer.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Split out from Ramsay's patch.
vcs-svn/sliding_window.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index 1bac7a4c..fafa4a63 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_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);
+ "%"PRIuMAX" > OFF_MAX", (uintmax_t) len);
- if (signed_add_overflows(a, (off_t) b))
+ 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;
}
--
1.7.9
next prev parent reply other threads:[~2012-02-02 10:59 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 ` Jonathan Nieder [this message]
2012-02-02 11:05 ` [PATCH 1/3] vcs-svn: rename check_overflow arguments for clarity Dmitry Ivankov
2012-02-02 11:16 ` Jonathan Nieder
2012-02-02 11:25 ` David Barr
2012-02-02 11:27 ` Jonathan Nieder
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=20120202105923.GJ3823@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).