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

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/sha1_file.c b/sha1_file.c
index 095a7e1622326e9e456d138b35c73b4a2777c8e5..53e25f278c6193860431f63a3c9de97f4e347f27 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -22,6 +22,12 @@
 #endif
 #endif
 
 #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;
 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,
 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);
                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_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,
                pack_used_ctr,
                pack_mmap_calls,
                pack_open_windows, peak_pack_open_windows,