From: Ramsay Jones <ramsay@ramsay1•demon.co.uk>
To: Jonathan Nieder <jrnieder@gmail•com>
Cc: david.barr@cordelta•com, Junio C Hamano <gitster@pobox•com>,
GIT Mailing-list <git@vger•kernel.org>
Subject: [PATCH] vcs-svn: Fix some compiler warnings
Date: Tue, 31 Jan 2012 18:48:47 +0000 [thread overview]
Message-ID: <4F28378F.6080108@ramsay1.demon.co.uk> (raw)
In particular, some versions of gcc complains as follows:
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
CC vcs-svn/fast_export.o
vcs-svn/fast_export.c: In function `fast_export_blob_delta':
vcs-svn/fast_export.c:303: warning: comparison is always false due \
to limited range of data type
Simply casting the (limited range unsigned) variable in the comparison
to an uintmax_t does not suppress the warning, however, since gcc is
"smart" enough to know that the cast does not change anything regarding
the value of the casted expression. In order to suppress the warning, we
replace the variable with a new uintmax_t variable initialized with the
value of the original variable.
Note that the "some versions of gcc" which complain includes 3.4.4 and
4.1.2, whereas gcc version 4.4.0 compiles the code without complaint.
Signed-off-by: Ramsay Jones <ramsay@ramsay1•demon.co.uk>
---
Hi Jonathan,
When I wrote this patch, your "jn/svn-fe" branch was still in pu, so I was
going to ask you to squash this, or some variant, into any re-roll ...
Note, in the original version of this patch, the change to check_overflow()
was much simpler; it was effectively the same 2-line change (modulo some
variable names) which is applied to fast_export_blob_delta(). But it just
didn't look right (not sure why!), which prompted the renaming of the
function parameter names. This is, obviously, an unrelated change, so maybe
the change to sliding_window.c should be reverted to the 2-line change ...
ATB,
Ramsay Jones
vcs-svn/fast_export.c | 3 ++-
vcs-svn/sliding_window.c | 11 ++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index 19d7c34..6edd37e 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -300,7 +300,8 @@ void fast_export_blob_delta(uint32_t mode,
uint32_t len, struct line_buffer *input)
{
long postimage_len;
- if (len > maximum_signed_value_of_type(off_t))
+ uintmax_t delta_len = (uintmax_t) len;
+ if (delta_len > maximum_signed_value_of_type(off_t))
die("enormous delta");
postimage_len = apply_delta((off_t) len, input, old_data, old_mode);
if (mode == REPO_MODE_LNK) {
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
index 1bac7a4..49a7293 100644
--- a/vcs-svn/sliding_window.c
+++ b/vcs-svn/sliding_window.c
@@ -31,15 +31,16 @@ 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))
+ uintmax_t delta_len = (uintmax_t) len;
+ if (delta_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", delta_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, delta_len);
return 0;
}
--
1.7.9
next reply other threads:[~2012-01-31 18:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 18:48 Ramsay Jones [this message]
2012-01-31 19:20 ` [PATCH] vcs-svn: Fix some compiler warnings 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
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=4F28378F.6080108@ramsay1.demon.co.uk \
--to=ramsay@ramsay1$(echo .)demon.co.uk \
--cc=david.barr@cordelta$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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