diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:09 -0700 |
| commit | 38bbb9e990e7290c286ad0a8ea250ab53470a374 (patch) | |
| tree | 9643b7ecc0a51c01ade32df122f5d7e1d70d3aff /merge-ort.c | |
| parent | 7431379a9c5ed4006603114b1991c6c6e98d5dca (diff) | |
| parent | 99d60545f87445d7050999b826fc4cd49e69376c (diff) | |
Merge branch 'ab/string-list-count-in-size-t'
Count string_list items in size_t, not "unsigned int". * ab/string-list-count-in-size-t: string-list API: change "nr" and "alloc" to "size_t" gettext API users: don't explicitly cast ngettext()'s "n"
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c index dc3fc0efc7..8545354daf 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -4064,8 +4064,8 @@ static void process_entries(struct merge_options *opt, trace2_region_enter("merge", "process_entries cleanup", opt->repo); if (dir_metadata.offsets.nr != 1 || (uintptr_t)dir_metadata.offsets.items[0].util != 0) { - printf("dir_metadata.offsets.nr = %d (should be 1)\n", - dir_metadata.offsets.nr); + printf("dir_metadata.offsets.nr = %"PRIuMAX" (should be 1)\n", + (uintmax_t)dir_metadata.offsets.nr); printf("dir_metadata.offsets.items[0].util = %u (should be 0)\n", (unsigned)(uintptr_t)dir_metadata.offsets.items[0].util); fflush(stdout); |