* [PATCH] fast_export.c: Fix a compiler warning
@ 2012-08-19 15:29 Ramsay Jones
2012-08-20 6:19 ` Florian Achleitner
0 siblings, 1 reply; 4+ messages in thread
From: Ramsay Jones @ 2012-08-19 15:29 UTC (permalink / raw)
To: florian.achleitner.2.6.31; +Cc: GIT Mailing-list
In particular, gcc complains thus:
CC vcs-svn/fast_export.o
vcs-svn/fast_export.c: In function 'fast_export_begin_note':
vcs-svn/fast_export.c:77: warning: long long unsigned int format, \
different type arg (arg 2)
In order to fix the warning, we cast the second size_t argument in
the call to printf to uintmax_t.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
Hi Florian,
If you need to re-roll your patches in the 'fa/remote-svn' branch, could
you please squash this fix into them. [This was implemented on top of
commit 2ce959ba, but you will probably want to make the equivalent change
to commit d319a37c ("Create a note for every imported commit containing
svn metadata", 17-08-2012) instead. Note that, because of the context
lines in the patch, it won't apply as-is.]
Thanks!
ATB,
Ramsay Jones
vcs-svn/fast_export.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index c780d32..dd09c7d 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -74,7 +74,7 @@ void fast_export_begin_note(uint32_t revision, const char *author,
size_t loglen = strlen(log);
printf("commit %s\n", note_ref);
printf("committer %s <%s@%s> %ld +0000\n", author, author, "local", timestamp);
- printf("data %"PRIuMAX"\n", loglen);
+ printf("data %"PRIuMAX"\n", (uintmax_t) loglen);
fwrite(log, loglen, 1, stdout);
if (firstnote) {
if (revision > 1)
--
1.7.11.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] fast_export.c: Fix a compiler warning
2012-08-19 15:29 [PATCH] fast_export.c: Fix a compiler warning Ramsay Jones
@ 2012-08-20 6:19 ` Florian Achleitner
2012-08-20 6:50 ` Junio C Hamano
2012-08-21 18:58 ` Ramsay Jones
0 siblings, 2 replies; 4+ messages in thread
From: Florian Achleitner @ 2012-08-20 6:19 UTC (permalink / raw)
To: Ramsay Jones; +Cc: florian.achleitner.2.6.31, GIT Mailing-list
On Sunday 19 August 2012 16:29:02 Ramsay Jones wrote:
> In particular, gcc complains thus:
>
> CC vcs-svn/fast_export.o
> vcs-svn/fast_export.c: In function 'fast_export_begin_note':
> vcs-svn/fast_export.c:77: warning: long long unsigned int format, \
> different type arg (arg 2)
>
> In order to fix the warning, we cast the second size_t argument in
> the call to printf to uintmax_t.
>
> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
> ---
>
> Hi Florian,
>
> If you need to re-roll your patches in the 'fa/remote-svn' branch, could
> you please squash this fix into them. [This was implemented on top of
> commit 2ce959ba, but you will probably want to make the equivalent change
> to commit d319a37c ("Create a note for every imported commit containing
> svn metadata", 17-08-2012) instead. Note that, because of the context
> lines in the patch, it won't apply as-is.]
Ok, I'll add it to the next version. This warning only occurs when building
for 32bit, thus I never saw it. There would be a format flag for printf that
sprecifies the platform's size_t integer type: "z".
Probalby we should use it instead? I don't know how widely supported it is.
>
> Thanks!
>
> ATB,
> Ramsay Jones
Thanks,
Florian
>
> vcs-svn/fast_export.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
> index c780d32..dd09c7d 100644
> --- a/vcs-svn/fast_export.c
> +++ b/vcs-svn/fast_export.c
> @@ -74,7 +74,7 @@ void fast_export_begin_note(uint32_t revision, const char
> *author, size_t loglen = strlen(log);
> printf("commit %s\n", note_ref);
> printf("committer %s <%s@%s> %ld +0000\n", author, author, "local",
> timestamp); - printf("data %"PRIuMAX"\n", loglen);
> + printf("data %"PRIuMAX"\n", (uintmax_t) loglen);
> fwrite(log, loglen, 1, stdout);
> if (firstnote) {
> if (revision > 1)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fast_export.c: Fix a compiler warning
2012-08-20 6:19 ` Florian Achleitner
@ 2012-08-20 6:50 ` Junio C Hamano
2012-08-21 18:58 ` Ramsay Jones
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2012-08-20 6:50 UTC (permalink / raw)
To: Florian Achleitner; +Cc: Ramsay Jones, GIT Mailing-list
Florian Achleitner <florian.achleitner.2.6.31@gmail.com> writes:
>> If you need to re-roll your patches in the 'fa/remote-svn' branch, could
>> you please squash this fix into them. [This was implemented on top of
>> commit 2ce959ba, but you will probably want to make the equivalent change
>> to commit d319a37c ("Create a note for every imported commit containing
>> svn metadata", 17-08-2012) instead. Note that, because of the context
>> lines in the patch, it won't apply as-is.]
>
> Ok, I'll add it to the next version. This warning only occurs when building
> for 32bit, thus I never saw it. There would be a format flag for printf that
> sprecifies the platform's size_t integer type: "z".
Yeah, I also queued 05ce866 (fixup: add missing cast to
vcs-svn/fast_export.c, 2012-08-18) on top of your series before
pushing 'pu' out yesterday. Have you had a chance to look at these
fixups? There are others you would find in my tree, including minor
log message typofixes.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fast_export.c: Fix a compiler warning
2012-08-20 6:19 ` Florian Achleitner
2012-08-20 6:50 ` Junio C Hamano
@ 2012-08-21 18:58 ` Ramsay Jones
1 sibling, 0 replies; 4+ messages in thread
From: Ramsay Jones @ 2012-08-21 18:58 UTC (permalink / raw)
To: Florian Achleitner; +Cc: GIT Mailing-list
Florian Achleitner wrote:
> On Sunday 19 August 2012 16:29:02 Ramsay Jones wrote:
> Ok, I'll add it to the next version. This warning only occurs when building
> for 32bit, thus I never saw it. There would be a format flag for printf that
> sprecifies the platform's size_t integer type: "z".
> Probalby we should use it instead? I don't know how widely supported it is.
The git codebase is actually moving in the other direction! :-D
I think the last "%z" modifier was removed by commit 28bd70d8 ("unbreak and
eliminate NO_C99_FORMAT", 16-03-2011).
ATB,
Ramsay Jones
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-21 19:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-19 15:29 [PATCH] fast_export.c: Fix a compiler warning Ramsay Jones
2012-08-20 6:19 ` Florian Achleitner
2012-08-20 6:50 ` Junio C Hamano
2012-08-21 18:58 ` Ramsay Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.