Skip to content

Commit

Permalink
sha1_file.c: Fix size_t related printf format warnings
Browse files Browse the repository at this point in the history
The old way of fixing warnings did not succeed on MinGW.  MinGW
does not support C99 printf format strings for size_t [1].  But
gcc on MinGW issues warnings if C99 printf format is not used.
Hence, the old stragegy to avoid warnings fails.

[1] http://www.mingw.org/MinGWiki/index.php/C99

This commits passes arguments of type size_t through a tiny
helper functions that casts to the type expected by the format
string.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Steffen Prohaska authored and Junio C Hamano committed Nov 29, 2007
1 parent 0673c96 commit 9e42d6a
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@

#ifdef NO_C99_FORMAT
#define SZ_FMT "lu"
static unsigned long sz_fmt(size_t s) { return (unsigned long)s; }
#else
#define SZ_FMT "zu"
static size_t sz_fmt(size_t s) { return s; }
#endif

const unsigned char null_sha1[20];
Expand Down Expand Up @@ -423,9 +425,9 @@ void pack_report(void)
"pack_report: getpagesize() = %10" SZ_FMT "\n"
"pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n"
"pack_report: core.packedGitLimit = %10" SZ_FMT "\n",
(size_t) getpagesize(),
packed_git_window_size,
packed_git_limit);
sz_fmt(getpagesize()),
sz_fmt(packed_git_window_size),
sz_fmt(packed_git_limit));
fprintf(stderr,
"pack_report: pack_used_ctr = %10u\n"
"pack_report: pack_mmap_calls = %10u\n"
Expand All @@ -435,7 +437,7 @@ void pack_report(void)
pack_used_ctr,
pack_mmap_calls,
pack_open_windows, peak_pack_open_windows,
pack_mapped, peak_pack_mapped);
sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped));
}

static int check_packed_git_idx(const char *path, struct packed_git *p)
Expand Down

0 comments on commit 9e42d6a

Please sign in to comment.