mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tb/print-size-t-with-uintmax-format'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2018-11-19 16:24:41 +09:00
parent 502fe438bf ca473cef91
commit f5f0f68d61
11 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/cat-file.c
View File

@ -99,7 +99,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':
@ -245,7 +245,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;