diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-07-17 06:56:37 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-16 22:16:16 -0700 |
| commit | f2c40e51b235b3814475d3988782ae5dfcae8752 (patch) | |
| tree | 80c0e21173392c0173955e9781106462d821a94b | |
| parent | object-file: get rid of `the_repository` when writing objects (diff) | |
| download | git-f2c40e51b235b3814475d3988782ae5dfcae8752.tar.gz git-f2c40e51b235b3814475d3988782ae5dfcae8752.zip | |
object-file: inline `for_each_loose_file_in_objdir_buf()`
The function `for_each_loose_file_in_objdir_buf()` is declared in our
headers, but it is not used anywhere else than in the corresponding code
file itself. Drop the declaration and inline the function into its only
caller.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | object-file.c | 31 | ||||
| -rw-r--r-- | object-file.h | 5 |
2 files changed, 8 insertions, 28 deletions
diff --git a/object-file.c b/object-file.c index fc061c37bb..5a936f1714 100644 --- a/object-file.c +++ b/object-file.c @@ -1388,26 +1388,6 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr, return r; } -int for_each_loose_file_in_objdir_buf(struct strbuf *path, - each_loose_object_fn obj_cb, - each_loose_cruft_fn cruft_cb, - each_loose_subdir_fn subdir_cb, - void *data) -{ - int r = 0; - int i; - - for (i = 0; i < 256; i++) { - r = for_each_file_in_obj_subdir(i, path, the_repository->hash_algo, - obj_cb, cruft_cb, - subdir_cb, data); - if (r) - break; - } - - return r; -} - int for_each_loose_file_in_objdir(const char *path, each_loose_object_fn obj_cb, each_loose_cruft_fn cruft_cb, @@ -1418,10 +1398,15 @@ int for_each_loose_file_in_objdir(const char *path, int r; strbuf_addstr(&buf, path); - r = for_each_loose_file_in_objdir_buf(&buf, obj_cb, cruft_cb, - subdir_cb, data); - strbuf_release(&buf); + for (int i = 0; i < 256; i++) { + r = for_each_file_in_obj_subdir(i, &buf, the_repository->hash_algo, + obj_cb, cruft_cb, + subdir_cb, data); + if (r) + break; + } + strbuf_release(&buf); return r; } diff --git a/object-file.h b/object-file.h index 622e2b2bb7..eca323f973 100644 --- a/object-file.h +++ b/object-file.h @@ -98,11 +98,6 @@ int for_each_loose_file_in_objdir(const char *path, each_loose_cruft_fn cruft_cb, each_loose_subdir_fn subdir_cb, void *data); -int for_each_loose_file_in_objdir_buf(struct strbuf *path, - each_loose_object_fn obj_cb, - each_loose_cruft_fn cruft_cb, - each_loose_subdir_fn subdir_cb, - void *data); /* * Iterate over all accessible loose objects without respect to |