summaryrefslogtreecommitdiff
path: root/sha1-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-19 07:24:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-19 07:24:41 (GMT)
commitf5f0f68d61301c3ffb2f8da84f627547e8f9a94c (patch)
tree2c4e826363e1febaaf1c7fd6187e8fa714561c5d /sha1-file.c
parent502fe438bf83f5db6026c278767decf2ce6395b0 (diff)
parentca473cef9140f55d68d6758fe226ef47c216669c (diff)
downloadgit-f5f0f68d61301c3ffb2f8da84f627547e8f9a94c.zip
git-f5f0f68d61301c3ffb2f8da84f627547e8f9a94c.tar.gz
git-f5f0f68d61301c3ffb2f8da84f627547e8f9a94c.tar.bz2
Merge branch 'tb/print-size-t-with-uintmax-format'
Code preparation to replace ulong vars with size_t vars where appropriate. * tb/print-size-t-with-uintmax-format: Upcast size_t variables to uintmax_t when printing
Diffstat (limited to 'sha1-file.c')
-rw-r--r--sha1-file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sha1-file.c b/sha1-file.c
index 2daf7d9..5bd11c8 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -833,7 +833,7 @@ int check_object_signature(const struct object_id *oid, void *map,
return -1;
/* Generate the header */
- hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(obj_type), size) + 1;
+ hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(obj_type), (uintmax_t)size) + 1;
/* Sha1.. */
the_hash_algo->init_fn(&c);
@@ -1492,7 +1492,7 @@ static void write_object_file_prepare(const void *buf, unsigned long len,
git_hash_ctx c;
/* Generate the header */
- *hdrlen = xsnprintf(hdr, *hdrlen, "%s %lu", type, len)+1;
+ *hdrlen = xsnprintf(hdr, *hdrlen, "%s %"PRIuMAX , type, (uintmax_t)len)+1;
/* Sha1.. */
the_hash_algo->init_fn(&c);
@@ -1758,7 +1758,7 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
buf = read_object(oid->hash, &type, &len);
if (!buf)
return error(_("cannot read sha1_file for %s"), oid_to_hex(oid));
- hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", type_name(type), len) + 1;
+ hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(type), (uintmax_t)len) + 1;
ret = write_loose_object(oid, hdr, hdrlen, buf, len, mtime);
free(buf);