diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:41 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-19 16:24:41 +0900 |
| commit | f5f0f68d61301c3ffb2f8da84f627547e8f9a94c (patch) | |
| tree | 2c4e826363e1febaaf1c7fd6187e8fa714561c5d /fast-import.c | |
| parent | 502fe438bf83f5db6026c278767decf2ce6395b0 (diff) | |
| parent | ca473cef9140f55d68d6758fe226ef47c216669c (diff) | |
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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c index 95600c78e0..69886687ce 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2955,8 +2955,8 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid) die("Object %s is a %s but a blob was expected.", oid_to_hex(oid), type_name(type)); strbuf_reset(&line); - strbuf_addf(&line, "%s %s %lu\n", oid_to_hex(oid), - type_name(type), size); + strbuf_addf(&line, "%s %s %"PRIuMAX"\n", oid_to_hex(oid), + type_name(type), (uintmax_t)size); cat_blob_write(line.buf, line.len); strbuf_release(&line); cat_blob_write(buf, size); |