Skip to content

Commit 2b3ac35

Browse files
gitstergitster
committed
Merge branch 'js/objects-larger-than-4gb-on-windows-more' into next
* js/objects-larger-than-4gb-on-windows-more: odb: use size_t for object_info.sizep and the size APIs packfile,delta: drop the `cast_size_t_to_ulong()` wrappers pack-objects: use size_t for in-core object sizes packfile: widen unpack_entry()'s size out-parameter to size_t pack-objects(check_pack_inflate()): use size_t instead of unsigned long patch-delta: use size_t for sizes compat/msvc: use _chsize_s for ftruncate
2 parents 99d7cf9 + c6a4629 commit 2b3ac35

72 files changed

Lines changed: 300 additions & 271 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apply.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3232,7 +3232,7 @@ static int apply_binary_fragment(struct apply_state *state,
32323232
struct patch *patch)
32333233
{
32343234
struct fragment *fragment = patch->fragments;
3235-
unsigned long len;
3235+
size_t len;
32363236
void *dst;
32373237

32383238
if (!fragment)
@@ -3321,7 +3321,7 @@ static int apply_binary(struct apply_state *state,
33213321
if (odb_has_object(the_repository->objects, &oid, 0)) {
33223322
/* We already have the postimage */
33233323
enum object_type type;
3324-
unsigned long size;
3324+
size_t size;
33253325
char *result;
33263326

33273327
result = odb_read_object(the_repository->objects, &oid,
@@ -3384,7 +3384,7 @@ static int read_blob_object(struct strbuf *buf, const struct object_id *oid, uns
33843384
strbuf_addf(buf, "Subproject commit %s\n", oid_to_hex(oid));
33853385
} else {
33863386
enum object_type type;
3387-
unsigned long sz;
3387+
size_t sz;
33883388
char *result;
33893389

33903390
result = odb_read_object(the_repository->objects, oid,
@@ -3611,7 +3611,7 @@ static int load_preimage(struct apply_state *state,
36113611

36123612
static int resolve_to(struct image *image, const struct object_id *result_id)
36133613
{
3614-
unsigned long size;
3614+
size_t size;
36153615
enum object_type type;
36163616
char *data;
36173617

‎archive.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ static void *object_file_to_archive(const struct archiver_args *args,
8787
const struct object_id *oid,
8888
unsigned int mode,
8989
enum object_type *type,
90-
unsigned long *sizep)
90+
size_t *sizep)
9191
{
9292
void *buffer;
9393
const struct commit *commit = args->convert ? args->commit : NULL;
@@ -158,7 +158,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
158158
write_archive_entry_fn_t write_entry = c->write_entry;
159159
int err;
160160
const char *path_without_prefix;
161-
unsigned long size;
161+
size_t size;
162162
void *buffer;
163163
enum object_type type;
164164

‎attr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ static struct attr_stack *read_attr_from_blob(struct index_state *istate,
768768
const char *path, unsigned flags)
769769
{
770770
struct object_id oid;
771-
unsigned long sz;
771+
size_t sz;
772772
enum object_type type;
773773
void *buf;
774774
unsigned short mode;

‎bisect.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static void show_list(const char *debug, int counted, int nr,
154154
struct commit *commit = p->item;
155155
unsigned commit_flags = commit->object.flags;
156156
enum object_type type;
157-
unsigned long size;
157+
size_t size;
158158
char *buf = odb_read_object(the_repository->objects,
159159
&commit->object.oid, &type,
160160
&size);

‎blame.c‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,10 +1041,13 @@ static void fill_origin_blob(struct diff_options *opt,
10411041
textconv_object(opt->repo, o->path, o->mode,
10421042
&o->blob_oid, 1, &file->ptr, &file_size))
10431043
;
1044-
else
1044+
else {
1045+
size_t file_size_st = 0;
10451046
file->ptr = odb_read_object(the_repository->objects,
10461047
&o->blob_oid, &type,
1047-
&file_size);
1048+
&file_size_st);
1049+
file_size = cast_size_t_to_ulong(file_size_st);
1050+
}
10481051
file->size = file_size;
10491052

10501053
if (!file->ptr)
@@ -2869,10 +2872,14 @@ void setup_scoreboard(struct blame_scoreboard *sb,
28692872
textconv_object(sb->repo, sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
28702873
&sb->final_buf_size))
28712874
;
2872-
else
2875+
else {
2876+
size_t final_buf_size_st = 0;
28732877
sb->final_buf = odb_read_object(the_repository->objects,
28742878
&o->blob_oid, &type,
2875-
&sb->final_buf_size);
2879+
&final_buf_size_st);
2880+
sb->final_buf_size =
2881+
cast_size_t_to_ulong(final_buf_size_st);
2882+
}
28762883

28772884
if (!sb->final_buf)
28782885
die(_("cannot read blob %s for path %s"),

‎builtin/cat-file.c‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static char *replace_idents_using_mailmap(char *object_buf, size_t *size)
8484

8585
static int filter_object(const char *path, unsigned mode,
8686
const struct object_id *oid,
87-
char **buf, unsigned long *size)
87+
char **buf, size_t *size)
8888
{
8989
enum object_type type;
9090

@@ -120,7 +120,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
120120
struct object_id oid;
121121
enum object_type type;
122122
char *buf;
123-
unsigned long size;
123+
size_t size;
124124
struct object_context obj_context = {0};
125125
struct object_info oi = OBJECT_INFO_INIT;
126126
unsigned flags = OBJECT_INFO_LOOKUP_REPLACE;
@@ -163,11 +163,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
163163
if (odb_read_object_info_extended(the_repository->objects, &oid, &oi, flags) < 0)
164164
die("git cat-file: could not get object info");
165165

166-
if (use_mailmap && (type == OBJ_COMMIT || type == OBJ_TAG)) {
167-
size_t s = size;
168-
buf = replace_idents_using_mailmap(buf, &s);
169-
size = cast_size_t_to_ulong(s);
170-
}
166+
if (use_mailmap && (type == OBJ_COMMIT || type == OBJ_TAG))
167+
buf = replace_idents_using_mailmap(buf, &size);
171168

172169
printf("%"PRIuMAX"\n", (uintmax_t)size);
173170
ret = 0;
@@ -188,9 +185,15 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
188185
break;
189186

190187
case 'c':
191-
if (textconv_object(the_repository, path, obj_context.mode,
192-
&oid, 1, &buf, &size))
188+
{
189+
unsigned long size_ul = 0;
190+
int textconv_ret = textconv_object(the_repository, path,
191+
obj_context.mode, &oid, 1,
192+
&buf, &size_ul);
193+
size = size_ul;
194+
if (textconv_ret)
193195
break;
196+
}
194197
/* else fallthrough */
195198

196199
case 'p':
@@ -216,11 +219,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
216219
if (!buf)
217220
die("Cannot read object %s", obj_name);
218221

219-
if (use_mailmap) {
220-
size_t s = size;
221-
buf = replace_idents_using_mailmap(buf, &s);
222-
size = cast_size_t_to_ulong(s);
223-
}
222+
if (use_mailmap)
223+
buf = replace_idents_using_mailmap(buf, &size);
224224

225225
/* otherwise just spit out the data */
226226
break;
@@ -263,11 +263,8 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
263263
buf = odb_read_object_peeled(the_repository->objects, &oid,
264264
exp_type_id, &size, NULL);
265265

266-
if (use_mailmap) {
267-
size_t s = size;
268-
buf = replace_idents_using_mailmap(buf, &s);
269-
size = cast_size_t_to_ulong(s);
270-
}
266+
if (use_mailmap)
267+
buf = replace_idents_using_mailmap(buf, &size);
271268
break;
272269
}
273270
default:
@@ -288,7 +285,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
288285
struct expand_data {
289286
struct object_id oid;
290287
enum object_type type;
291-
unsigned long size;
288+
size_t size;
292289
unsigned short mode;
293290
off_t disk_size;
294291
const char *rest;
@@ -404,7 +401,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
404401
fflush(stdout);
405402
if (opt->transform_mode) {
406403
char *contents;
407-
unsigned long size;
404+
size_t size;
408405

409406
if (!data->rest)
410407
die("missing path for '%s'", oid_to_hex(oid));
@@ -416,9 +413,12 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
416413
oid_to_hex(oid), data->rest);
417414
} else if (opt->transform_mode == 'c') {
418415
enum object_type type;
419-
if (!textconv_object(the_repository,
420-
data->rest, 0100644, oid,
421-
1, &contents, &size))
416+
unsigned long size_ul = 0;
417+
if (textconv_object(the_repository,
418+
data->rest, 0100644, oid,
419+
1, &contents, &size_ul))
420+
size = size_ul;
421+
else
422422
contents = odb_read_object(the_repository->objects,
423423
oid, &type, &size);
424424
if (!contents)
@@ -434,19 +434,16 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
434434
}
435435
else {
436436
enum object_type type;
437-
unsigned long size;
437+
size_t size;
438438
void *contents;
439439

440440
contents = odb_read_object(the_repository->objects, oid,
441441
&type, &size);
442442
if (!contents)
443443
die("object %s disappeared", oid_to_hex(oid));
444444

445-
if (use_mailmap) {
446-
size_t s = size;
447-
contents = replace_idents_using_mailmap(contents, &s);
448-
size = cast_size_t_to_ulong(s);
449-
}
445+
if (use_mailmap)
446+
contents = replace_idents_using_mailmap(contents, &size);
450447

451448
if (type != data->type)
452449
die("object %s changed type!?", oid_to_hex(oid));
@@ -549,15 +546,13 @@ static void batch_object_write(const char *obj_name,
549546
}
550547

551548
if (use_mailmap && (data->type == OBJ_COMMIT || data->type == OBJ_TAG)) {
552-
size_t s = data->size;
553549
char *buf = NULL;
554550

555551
buf = odb_read_object(the_repository->objects, &data->oid,
556552
&data->type, &data->size);
557553
if (!buf)
558554
die(_("unable to read %s"), oid_to_hex(&data->oid));
559-
buf = replace_idents_using_mailmap(buf, &s);
560-
data->size = cast_size_t_to_ulong(s);
555+
buf = replace_idents_using_mailmap(buf, &data->size);
561556

562557
free(buf);
563558
}

‎builtin/difftool.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ static char *get_symlink(struct repository *repo,
319319
data = strbuf_detach(&link, NULL);
320320
} else {
321321
enum object_type type;
322-
unsigned long size;
322+
size_t size;
323323
data = odb_read_object(repo->objects, oid, &type, &size);
324324
if (!data)
325325
die(_("could not read object %s for symlink %s"),

‎builtin/fast-export.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,10 @@ static void export_blob(const struct object_id *oid)
317317
object = (struct object *)lookup_blob(the_repository, oid);
318318
eaten = 0;
319319
} else {
320-
buf = odb_read_object(the_repository->objects, oid, &type, &size);
320+
size_t size_st = 0;
321+
buf = odb_read_object(the_repository->objects, oid, &type,
322+
&size_st);
323+
size = cast_size_t_to_ulong(size_st);
321324
if (!buf)
322325
die(_("could not read blob %s"), oid_to_hex(oid));
323326
if (check_object_signature(the_repository, oid, buf, size,
@@ -880,7 +883,7 @@ static char *anonymize_tag(void)
880883

881884
static void handle_tag(const char *name, struct tag *tag)
882885
{
883-
unsigned long size;
886+
size_t size;
884887
enum object_type type;
885888
char *buf;
886889
const char *tagger, *tagger_end, *message;

‎builtin/fast-import.c‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,6 +1241,8 @@ static void *gfi_unpack_entry(
12411241
unsigned long *sizep)
12421242
{
12431243
enum object_type type;
1244+
size_t size_st = 0;
1245+
void *data;
12441246
struct packed_git *p = all_packs[oe->pack_id];
12451247
if (p == pack_data && p->pack_size < (pack_size + the_hash_algo->rawsz)) {
12461248
/* The object is stored in the packfile we are writing to
@@ -1262,7 +1264,10 @@ static void *gfi_unpack_entry(
12621264
*/
12631265
p->pack_size = pack_size + the_hash_algo->rawsz;
12641266
}
1265-
return unpack_entry(the_repository, p, oe->idx.offset, &type, sizep);
1267+
data = unpack_entry(the_repository, p, oe->idx.offset, &type, &size_st);
1268+
if (sizep)
1269+
*sizep = cast_size_t_to_ulong(size_st);
1270+
return data;
12661271
}
12671272

12681273
static void load_tree(struct tree_entry *root)
@@ -1288,7 +1293,10 @@ static void load_tree(struct tree_entry *root)
12881293
die(_("can't load tree %s"), oid_to_hex(oid));
12891294
} else {
12901295
enum object_type type;
1291-
buf = odb_read_object(the_repository->objects, oid, &type, &size);
1296+
size_t size_st = 0;
1297+
buf = odb_read_object(the_repository->objects, oid, &type,
1298+
&size_st);
1299+
size = cast_size_t_to_ulong(size_st);
12921300
if (!buf || type != OBJ_TREE)
12931301
die(_("can't load tree %s"), oid_to_hex(oid));
12941302
}
@@ -2557,7 +2565,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
25572565
die(_("mark :%" PRIuMAX " not a commit"), commit_mark);
25582566
oidcpy(&commit_oid, &commit_oe->idx.oid);
25592567
} else if (!repo_get_oid(the_repository, p, &commit_oid)) {
2560-
unsigned long size;
2568+
size_t size;
25612569
char *buf = odb_read_object_peeled(the_repository->objects,
25622570
&commit_oid, OBJ_COMMIT, &size,
25632571
&commit_oid);
@@ -2624,10 +2632,12 @@ static void parse_from_existing(struct branch *b)
26242632
oidclr(&b->branch_tree.versions[1].oid, the_repository->hash_algo);
26252633
} else {
26262634
unsigned long size;
2635+
size_t size_st = 0;
26272636
char *buf;
26282637

26292638
buf = odb_read_object_peeled(the_repository->objects, &b->oid,
2630-
OBJ_COMMIT, &size, &b->oid);
2639+
OBJ_COMMIT, &size_st, &b->oid);
2640+
size = cast_size_t_to_ulong(size_st);
26312641
parse_from_commit(b, buf, size);
26322642
free(buf);
26332643
}
@@ -2719,7 +2729,7 @@ static struct hash_list *parse_merge(unsigned int *count)
27192729
die(_("mark :%" PRIuMAX " not a commit"), idnum);
27202730
oidcpy(&n->oid, &oe->idx.oid);
27212731
} else if (!repo_get_oid(the_repository, from, &n->oid)) {
2722-
unsigned long size;
2732+
size_t size;
27232733
char *buf = odb_read_object_peeled(the_repository->objects,
27242734
&n->oid, OBJ_COMMIT,
27252735
&size, &n->oid);
@@ -3327,7 +3337,10 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
33273337
char *buf;
33283338

33293339
if (!oe || oe->pack_id == MAX_PACK_ID) {
3330-
buf = odb_read_object(the_repository->objects, oid, &type, &size);
3340+
size_t size_st = 0;
3341+
buf = odb_read_object(the_repository->objects, oid, &type,
3342+
&size_st);
3343+
size = cast_size_t_to_ulong(size_st);
33313344
} else {
33323345
type = oe->type;
33333346
buf = gfi_unpack_entry(oe, &size);
@@ -3435,8 +3448,10 @@ static struct object_entry *dereference(struct object_entry *oe,
34353448
buf = gfi_unpack_entry(oe, &size);
34363449
} else {
34373450
enum object_type unused;
3451+
size_t size_st = 0;
34383452
buf = odb_read_object(the_repository->objects, oid,
3439-
&unused, &size);
3453+
&unused, &size_st);
3454+
size = cast_size_t_to_ulong(size_st);
34403455
}
34413456
if (!buf)
34423457
die(_("can't load object %s"), oid_to_hex(oid));

‎builtin/fsck.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ static int fsck_loose(const struct object_id *oid, const char *path,
724724
struct for_each_loose_cb *data = cb_data;
725725
struct object *obj;
726726
enum object_type type = OBJ_NONE;
727-
unsigned long size;
727+
size_t size;
728728
void *contents = NULL;
729729
int eaten;
730730
struct object_info oi = OBJECT_INFO_INIT;

0 commit comments

Comments
 (0)