diff options
author | Torsten Bögershausen <tboegi@web.de> | 2018-11-11 10:05:04 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 10:43:52 +0300 |
commit | ca473cef9140f55d68d6758fe226ef47c216669c (patch) | |
tree | 62b470517f2f74c50c9204431d2a8d5354d7a4e8 /diff.c | |
parent | 8858448bb49332d353febc078ce4a3abcc962efe (diff) |
Upcast size_t variables to uintmax_t when printing
When printing variables which contain a size, today "unsigned long"
is used at many places.
In order to be able to change the type from "unsigned long" into size_t
some day in the future, we need to have a way to print 64 bit variables
on a system that has "unsigned long" defined to be 32 bit, like Win64.
Upcast all those variables into uintmax_t before they are printed.
This is to prepare for a bigger change, when "unsigned long"
will be converted into size_t for variables which may be > 4Gib.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3227,7 +3227,7 @@ static void emit_binary_diff_body(struct diff_options *o, } if (delta && delta_size < deflate_size) { - char *s = xstrfmt("%lu", orig_size); + char *s = xstrfmt("%"PRIuMAX , (uintmax_t)orig_size); emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA, s, strlen(s), 0); free(s); |