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 /builtin/cat-file.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 'builtin/cat-file.c')
| -rw-r--r-- | builtin/cat-file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 8d97c84725..05decee33f 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -92,7 +92,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name, oi.sizep = &size; if (oid_object_info_extended(the_repository, &oid, &oi, flags) < 0) die("git cat-file: could not get object info"); - printf("%lu\n", size); + printf("%"PRIuMAX"\n", (uintmax_t)size); return 0; case 'e': @@ -238,7 +238,7 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len, if (data->mark_query) data->info.sizep = &data->size; else - strbuf_addf(sb, "%lu", data->size); + strbuf_addf(sb, "%"PRIuMAX , (uintmax_t)data->size); } else if (is_atom("objectsize:disk", atom, len)) { if (data->mark_query) data->info.disk_sizep = &data->disk_size; |