diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2018-11-11 07:05:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-12 07:43:52 (GMT) |
| commit | ca473cef9140f55d68d6758fe226ef47c216669c (patch) | |
| tree | 62b470517f2f74c50c9204431d2a8d5354d7a4e8 /archive-tar.c | |
| parent | 8858448bb49332d353febc078ce4a3abcc962efe (diff) | |
| download | git-ca473cef9140f55d68d6758fe226ef47c216669c.zip git-ca473cef9140f55d68d6758fe226ef47c216669c.tar.gz git-ca473cef9140f55d68d6758fe226ef47c216669c.tar.bz2 | |
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 'archive-tar.c')
| -rw-r--r-- | archive-tar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/archive-tar.c b/archive-tar.c index 7a535cb..a58e1a8 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -202,7 +202,7 @@ static void prepare_header(struct archiver_args *args, unsigned int mode, unsigned long size) { xsnprintf(header->mode, sizeof(header->mode), "%07o", mode & 07777); - xsnprintf(header->size, sizeof(header->size), "%011lo", S_ISREG(mode) ? size : 0); + xsnprintf(header->size, sizeof(header->size), "%011"PRIoMAX , S_ISREG(mode) ? (uintmax_t)size : (uintmax_t)0); xsnprintf(header->mtime, sizeof(header->mtime), "%011lo", (unsigned long) args->time); xsnprintf(header->uid, sizeof(header->uid), "%07o", 0); |