From: Phil Hord <phil.hord@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
git@vger.kernel.org
Subject: Re: [PATCH] fmt-merge-msg: show those involved in a merged series
Date: Mon, 12 Mar 2012 17:37:57 -0400 [thread overview]
Message-ID: <CABURp0oVn3s27Rtq2JQeLBgcXq1-R-=0qawcXVMxZ8qgOeZGkQ@mail.gmail.com> (raw)
In-Reply-To: <7v1up2ew9u.fsf@alter.siamese.dyndns.org>
On Thu, Mar 8, 2012 at 2:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
> René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
>
>> Am 07.03.2012 22:59, schrieb Junio C Hamano:
>>> René Scharfe<rene.scharfe@lsrfire.ath.cx> writes:
>>>
>>>> Am 05.03.2012 22:34, schrieb Junio C Hamano:
>>>>
>>>>> +#define util_as_int(elem) ((intptr_t)((elem)->util))
>>>>
>>>> Something that actually returns an int would fit the name better. ;)
>>>
>>> The particular type would not matter to the callers of the helper
>>> macro, would it?
>>
>> Three of the five callers introduced in that commit cast the result to
>> int and the remaining two don't care, so it actually does seem to
>> matter for most of them, strictly speaking. When I see a nit, I can't
>> resist the urge to pick it, apparently.
>
> Unfortunately, replacing intptr_t with int or casting the above
> again as int will result in
>
> builtin/fmt-merge-msg.c: In function 'record_person':
> builtin/fmt-merge-msg.c:213: error: cast to pointer from integer of different size
>
> So...
Out of the frying pan, into the fire...
builtin/fmt-merge-msg.c: In function ‘record_person’:
builtin/fmt-merge-msg.c:213:34: warning: cast from pointer to
integer of different size [-Wpointer-to-int-cast]
builtin/fmt-merge-msg.c: In function ‘cmp_string_list_util_as_int’:
builtin/fmt-merge-msg.c:219:9: warning: cast from pointer to
integer of different size [-Wpointer-to-int-cast]
builtin/fmt-merge-msg.c:219:26: warning: cast from pointer to
integer of different size [-Wpointer-to-int-cast]
builtin/fmt-merge-msg.c: In function ‘add_people_count’:
builtin/fmt-merge-msg.c:229:8: warning: cast from pointer to
integer of different size [-Wpointer-to-int-cast]
builtin/fmt-merge-msg.c:231:8: warning: cast from pointer to
integer of different size [-Wpointer-to-int-cast]
builtin/fmt-merge-msg.c:235:8: warning: cast from pointer to
integer of different size [-Wpointer-to-int-cast]
I see slightly different code in pu than in next, but it produces the
same warnings on my 64-bit Linux machine.
Here's a fix against next:
-- >8 --
Subject: [PATCH] Appease compiler pedantry with an extra cast
Recently git repurposed a pointer as an integer to hold some
counter which git fancies.
Casting directly from 'pointer' to 'int' ((int)(void*)&x) causes a
possible size mismatch because pointers can be bigger than ints.
In such a situation, the compiler complains:
warning: cast from pointer to integer of different size
[-Wpointer-to-int-cast]
Cast the value through intptr_t first to quell compiler complaints
about how this gun appears to be aimed near our feet. Then cast this
value to an int; this path assures the compiler we are smarter than we
look, or at least that we intend to aim the gun this way for a reason.
---
builtin/fmt-merge-msg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 8ddefb3..fee65e0 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -182,7 +182,7 @@ static void add_branch_desc(struct strbuf *out,
const char *name)
strbuf_release(&desc);
}
-#define util_as_int(elem) ((int)((elem)->util))
+#define util_as_int(elem) ((int)(intptr_t)((elem)->util))
static void record_person(int which, struct string_list *people,
struct commit *commit)
--
1.7.9.3
next prev parent reply other threads:[~2012-03-12 21:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 3:17 A possible fmt-merge-msg update? Junio C Hamano
2012-03-05 5:24 ` Linus Torvalds
2012-03-05 19:04 ` Junio C Hamano
2012-03-05 20:33 ` Linus Torvalds
2012-03-05 21:34 ` [PATCH] fmt-merge-msg: show those involved in a merged series Junio C Hamano
2012-03-05 21:46 ` Linus Torvalds
2012-03-05 21:49 ` Junio C Hamano
2012-03-07 21:22 ` René Scharfe
2012-03-07 21:59 ` Junio C Hamano
2012-03-08 17:46 ` René Scharfe
2012-03-08 19:18 ` Junio C Hamano
2012-03-08 21:31 ` Junio C Hamano
2012-03-12 21:37 ` Phil Hord [this message]
2012-03-13 21:03 ` Jeff King
2012-03-14 3:44 ` Junio C Hamano
2012-03-14 19:12 ` Phil Hord
2012-03-12 7:11 ` Jonathan Nieder
2012-03-13 1:55 ` Junio C Hamano
2012-03-13 5:23 ` Jonathan Nieder
2012-03-13 5:45 ` Junio C Hamano
2012-03-13 7:27 ` Johannes Sixt
2012-03-13 18:26 ` Junio C Hamano
2012-03-14 6:37 ` Johannes Sixt
2012-03-14 20:34 ` Junio C Hamano
2012-03-13 18:28 ` [PATCH v2 1/1] " Junio C Hamano
2012-05-11 10:31 ` [PATCH/RFC] fmt-merge-msg: add a blank line after people info Jonathan Nieder
2012-05-11 22:46 ` Junio C Hamano
2012-05-11 23:20 ` Linus Torvalds
2012-05-14 18:31 ` Junio C Hamano
2012-05-15 20:24 ` Junio C Hamano
2012-05-16 2:02 ` Linus Torvalds
2012-05-16 17:28 ` Junio C Hamano
2012-06-06 20:27 ` Jonathan Nieder
2012-06-06 20:46 ` Jonathan Nieder
2012-06-06 21:11 ` Junio C Hamano
2012-03-06 7:59 ` A possible fmt-merge-msg update? Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABURp0oVn3s27Rtq2JQeLBgcXq1-R-=0qawcXVMxZ8qgOeZGkQ@mail.gmail.com' \
--to=phil.hord@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=torvalds@linux-foundation.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).