threads / patch / 37444

patchbuiltin/commit.c: fix type warnings from gcc and sparse

Subject: [PATCH] builtin/commit.c: fix type warnings from gcc and sparse

## tl;dr

3 messages between Aug 29, 2014 and Aug 29, 2014. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Ramsay Jones· Aug 29, 2014, 16:36 UTC · lore

On 32-bit platforms (only), gcc and sparse both issue warnings about the type of the pointer expression passed as the third argument to find_commit_header(). In order to suppress the warnings, we simply change the type of the 'len' variable to size_t.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
Hi Jeff,

If you need to re-roll your 'jk/commit-author-parsing' series, could you please squash this into the equivalent of commit 95b5989 ("determine_author_info(): reuse parsing functions", 27-08-2014).

Thanks!

ATB, Ramsay Jones

 builtin/commit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to builtin/commit.c +1 −1
diff --git a/builtin/commit.c b/builtin/commit.c
index a9bef73..7cb9981 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -583,7 +583,7 @@ static void determine_author_info(struct strbuf *author_ident)
 
 	if (author_message) {
 		struct ident_split ident;
-		unsigned long len;
+		size_t len;
 		const char *a;
 
 		a = find_commit_header(author_message_buffer, "author", &len);

-- 
2.1.0
Jeff King· Aug 29, 2014, 18:44 UTC · re: Ramsay Jones · lore

Re: [PATCH] builtin/commit.c: fix type warnings from gcc and sparse

On Fri, Aug 29, 2014 at 05:36:21PM +0100, Ramsay Jones wrote:
Show 7 quoted lines
> On 32-bit platforms (only), gcc and sparse both issue warnings
> about the type of the pointer expression passed as the third
> argument to find_commit_header().  In order to suppress the
> warnings, we simply change the type of the 'len' variable to
> size_t.
> 
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>

Thanks, this looks good to me. I think I just switched between size_t and "unsigned long" during the development and forgot to tweak this spot.

> If you need to re-roll your 'jk/commit-author-parsing' series, could
> you please squash this into the equivalent of commit 95b5989
> ("determine_author_info(): reuse parsing functions", 27-08-2014).

I don't think I have any other reason to re-roll at this point. I'm happy to have this on top, or it can be squashed into the second from the top (95b5989) if we want to keep the history cleaner.

I'm also happy to re-roll just for this, but my impression is that is not really any easier on Junio than just squashing a patch in.

-Peff
Junio C Hamano· Aug 29, 2014, 22:17 UTC · re: Jeff King · lore

Re: [PATCH] builtin/commit.c: fix type warnings from gcc and sparse

Jeff King <peff@peff.net> writes:
Show 24 quoted lines
> On Fri, Aug 29, 2014 at 05:36:21PM +0100, Ramsay Jones wrote:
>
>> On 32-bit platforms (only), gcc and sparse both issue warnings
>> about the type of the pointer expression passed as the third
>> argument to find_commit_header().  In order to suppress the
>> warnings, we simply change the type of the 'len' variable to
>> size_t.
>> 
>> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
>
> Thanks, this looks good to me. I think I just switched between size_t
> and "unsigned long" during the development and forgot to tweak this
> spot.
>
>> If you need to re-roll your 'jk/commit-author-parsing' series, could
>> you please squash this into the equivalent of commit 95b5989
>> ("determine_author_info(): reuse parsing functions", 27-08-2014).
>
> I don't think I have any other reason to re-roll at this point. I'm
> happy to have this on top, or it can be squashed into the second from
> the top (95b5989) if we want to keep the history cleaner.
>
> I'm also happy to re-roll just for this, but my impression is that is
> not really any easier on Junio than just squashing a patch in.

Thanks for being very considerate ;-) Have squashed it in with "rebase -i" while preparing for the mid-day pushout.

← back to recent threads