[PATCH] Fix warnings on PowerPC - use C99 printf format if available

[PATCH] Fix warnings on PowerPC - use C99 printf format if available

[Pavel Roskin]

Signed-off-by: Pavel Roskin <proski@gnu.org>
---

 sha1_file.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index 095a7e1..53e25f2 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -22,6 +22,12 @@
 #endif
 #endif
 
+#ifdef NO_C99_FORMAT
+#define SZ_FMT "lu"
+#else
+#define SZ_FMT "zu"
+#endif
+
 const unsigned char null_sha1[20];
 
 static unsigned int sha1_file_open_flag = O_NOATIME;
@@ -407,9 +413,9 @@ struct packed_git *packed_git;
 void pack_report()
 {
 	fprintf(stderr,
-		"pack_report: getpagesize()            = %10lu\n"
-		"pack_report: core.packedGitWindowSize = %10lu\n"
-		"pack_report: core.packedGitLimit      = %10lu\n",
+		"pack_report: getpagesize()            = %10" SZ_FMT "\n"
+		"pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n"
+		"pack_report: core.packedGitLimit      = %10" SZ_FMT "\n",
 		page_size,
 		packed_git_window_size,
 		packed_git_limit);
@@ -417,7 +423,8 @@ void pack_report()
 		"pack_report: pack_used_ctr            = %10u\n"
 		"pack_report: pack_mmap_calls          = %10u\n"
 		"pack_report: pack_open_windows        = %10u / %10u\n"
-		"pack_report: pack_mapped              = %10lu / %10lu\n",
+		"pack_report: pack_mapped              = "
+			"%10" SZ_FMT " / %10" SZ_FMT "\n",
 		pack_used_ctr,
 		pack_mmap_calls,
 		pack_open_windows, peak_pack_open_windows,

Re: [PATCH] Fix warnings on PowerPC - use C99 printf format if available

[Junio C Hamano]

Pavel Roskin <proski@gnu.org> writes:

> Signed-off-by: Pavel Roskin <proski@gnu.org>

This needs a better subject.  I do not see anything PowerPC specific...

Re: [PATCH] Fix warnings on PowerPC - use C99 printf format if available

[Pavel Roskin]

Quoting Junio C Hamano <junkio@cox.net>:

> Pavel Roskin <proski@gnu.org> writes:
>
> > Signed-off-by: Pavel Roskin <proski@gnu.org>
>
> This needs a better subject.  I do not see anything PowerPC specific...

Indeed, it happens on i386 as well (but not on x86_64).  OK, the subject should
be:

Fix warnings in sha1_file.c - use C99 printf format if available

--
Regards,
Pavel Roskin

Re: [PATCH] Fix warnings on PowerPC - use C99 printf format if available

[Shawn O. Pearce]

Pavel Roskin <proski@gnu.org> wrote:
> Quoting Junio C Hamano <junkio@cox.net>:
> > Pavel Roskin <proski@gnu.org> writes:
> >
> > > Signed-off-by: Pavel Roskin <proski@gnu.org>
> >
> > This needs a better subject.  I do not see anything PowerPC specific...
> 
> Indeed, it happens on i386 as well (but not on x86_64).  OK, the subject should
> be:
> 
> Fix warnings in sha1_file.c - use C99 printf format if available

When I wrote that code it was warning free on Mac OS X/PowerPC.
Apparently that wasn't true elsewhere.  :-)
Thanks for cleaning up after me.

-- 
Shawn.