commit 1ba8f4363f62dd04b504e3d42107f0cad7807f2c2e33090f619752615ceaaaf1 from: Stefan Sperling date: Sun Nov 15 14:59:12 2026 UTC stop passing seed around where not needed commit - cd09e882304a191d841c7e06a5270322e38507bae5c40735890cb7695f4dc965 commit + 1ba8f4363f62dd04b504e3d42107f0cad7807f2c2e33090f619752615ceaaaf1 blob - b1f5176058c506ef45503786438fbd2f46a6c7adb64a3237837dfd57f7e28a6f blob + 589712e679d6f92ea421ad230afaf30e2ae0d8e6289b72b83ca8f65424704945 --- lib/got_lib_pack_create.h +++ lib/got_lib_pack_create.h @@ -140,7 +140,7 @@ got_pack_load_tree(int want_meta, struct got_object_id const struct got_error * got_pack_add_object(int want_meta, struct got_object_idset *idset, struct got_object_id *id, uint32_t path_hash, int obj_type, - time_t mtime, uint32_t seed, int loose_obj_only, + time_t mtime, int loose_obj_only, struct got_repository *repo, int *ncolored, int *nfound, int *ntrees, got_pack_progress_cb progress_cb, void *progress_arg, struct got_ratelimit *rl); blob - dd575c1631431af968b06f6a2549cdcf84edfb90b1237997af92febb33fadf94 blob + 167876f05813be7e7d49f6cc6a730916223efa6b82ecbfee9711a49db0f54db6 --- lib/pack_create.c +++ lib/pack_create.c @@ -78,7 +78,7 @@ static const struct got_error * alloc_meta(struct got_pack_meta **new, struct got_object_id *id, - uint32_t path_hash, int obj_type, time_t mtime, uint32_t seed) + uint32_t path_hash, int obj_type, time_t mtime) { struct got_pack_meta *m; @@ -747,7 +747,7 @@ search_packidx(int *found, struct got_object_id *id, const struct got_error * got_pack_add_object(int want_meta, struct got_object_idset *idset, struct got_object_id *id, uint32_t path_hash, int obj_type, - time_t mtime, uint32_t seed, int loose_obj_only, + time_t mtime, int loose_obj_only, struct got_repository *repo, int *ncolored, int *nfound, int *ntrees, got_pack_progress_cb progress_cb, void *progress_arg, struct got_ratelimit *rl) @@ -765,7 +765,7 @@ got_pack_add_object(int want_meta, struct got_object_i } if (want_meta) { - err = alloc_meta(&m, id, path_hash, obj_type, mtime, seed); + err = alloc_meta(&m, id, path_hash, obj_type, mtime); if (err) return err; @@ -891,7 +891,7 @@ got_pack_load_tree_entries(struct got_object_id_queue path_hash = murmurhash2(p, strlen(p), seed); err = got_pack_add_object(want_meta, want_meta ? idset : idset_exclude, id, path_hash, - GOT_OBJ_TYPE_BLOB, mtime, seed, loose_obj_only, + GOT_OBJ_TYPE_BLOB, mtime, loose_obj_only, repo, ncolored, nfound, ntrees, progress_cb, progress_arg, rl); if (err) @@ -959,7 +959,7 @@ got_pack_load_tree(int want_meta, struct got_object_id err = got_pack_add_object(want_meta, want_meta ? idset : idset_exclude, &qid->id, path_hash, GOT_OBJ_TYPE_TREE, - mtime, seed, loose_obj_only, repo, + mtime, loose_obj_only, repo, ncolored, nfound, ntrees, progress_cb, progress_arg, rl); if (err) { free(qid->data); @@ -1053,7 +1053,7 @@ load_commit(int want_meta, struct got_object_idset *id err = got_pack_add_object(want_meta, want_meta ? idset : idset_exclude, &qid->id, 0, GOT_OBJ_TYPE_COMMIT, - got_object_commit_get_committer_time(commit), seed, + got_object_commit_get_committer_time(commit), loose_obj_only, repo, ncolored, nfound, ntrees, progress_cb, progress_arg, rl); if (err) @@ -1128,7 +1128,7 @@ load_tag(int want_meta, struct got_object_idset *idset err = got_pack_add_object(want_meta, want_meta ? idset : idset_exclude, id, 0, GOT_OBJ_TYPE_TAG, - got_object_tag_get_tagger_time(tag), seed, loose_obj_only, repo, + got_object_tag_get_tagger_time(tag), loose_obj_only, repo, ncolored, nfound, ntrees, progress_cb, progress_arg, rl); if (err) goto done; blob - 006c6d8bd619840c7113579ec311166df95e6d1c8c4e6f484e12c2921a95d22a blob + 6a4a0e258c032df33536c6290a7d49af96e88df84d93ac464a63ad7c8849ed9e --- lib/pack_create_privsep.c +++ lib/pack_create_privsep.c @@ -593,7 +593,6 @@ struct load_packed_obj_arg { time_t mtime; /* input parameters: */ - uint32_t seed; int want_meta; struct got_object_idset *idset; struct got_object_idset *idset_exclude; @@ -620,7 +619,7 @@ load_packed_commit_id(void *arg, time_t mtime, struct return got_pack_add_object(a->want_meta, a->want_meta ? a->idset : a->idset_exclude, - id, 0, GOT_OBJ_TYPE_COMMIT, mtime, a->seed, a->loose_obj_only, + id, 0, GOT_OBJ_TYPE_COMMIT, mtime, a->loose_obj_only, repo, a->ncolored, a->nfound, a->ntrees, a->progress_cb, a->progress_arg, a->rl); } @@ -657,7 +656,7 @@ load_packed_trees(void *arg, struct got_tree_object *t err = got_pack_add_object(a->want_meta, a->want_meta ? a->idset : a->idset_exclude, - id, path_hash, GOT_OBJ_TYPE_TREE, mtime, a->seed, + id, path_hash, GOT_OBJ_TYPE_TREE, mtime, a->loose_obj_only, repo, a->ncolored, a->nfound, a->ntrees, a->progress_cb, a->progress_arg, a->rl); if (err) @@ -696,7 +695,7 @@ load_packed_trees(void *arg, struct got_tree_object *t err = got_pack_add_object(a->want_meta, a->want_meta ? a->idset : a->idset_exclude, id, got_tree_entry_get_path_hash(e), - GOT_OBJ_TYPE_BLOB, mtime, a->seed, + GOT_OBJ_TYPE_BLOB, mtime, a->loose_obj_only, repo, a->ncolored, a->nfound, a->ntrees, a->progress_cb, a->progress_arg, a->rl); @@ -724,7 +723,6 @@ got_pack_load_packed_object_ids(int *found_all_objects struct load_packed_obj_arg lpa; memset(&lpa, 0, sizeof(lpa)); - lpa.seed = seed; lpa.want_meta = want_meta; lpa.idset = idset; lpa.idset_exclude = idset_exclude;