Patrick Steinhardt <ps@xxxxxx> writes:
> The names of the functions that implement the the `init` and `init_db`
s/the//
> callbacks in the "files" and "packed" backends do not match the names of
> the callbacks, which is inconsistent. Rename them so that they match,
> which makes it easier to discover their respective implementations.
>
> Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
> ---
> refs/files-backend.c | 10 +++++-----
> refs/packed-backend.c | 16 ++++++++--------
> refs/packed-backend.h | 6 +++---
> 3 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/refs/files-backend.c b/refs/files-backend.c
> index a098d14ea0..2c9d5e0747 100644
> --- a/refs/files-backend.c
> +++ b/refs/files-backend.c
> @@ -89,9 +89,9 @@ static void clear_loose_ref_cache(struct files_ref_store *refs)
> * Create a new submodule ref cache and add it to the internal
> * set of caches.
> */
> -static struct ref_store *files_ref_store_create(struct repository *repo,
> - const char *gitdir,
> - unsigned int flags)
> +static struct ref_store *files_ref_store_init(struct repository *repo,
> + const char *gitdir,
> + unsigned int flags)
> {
> struct files_ref_store *refs = xcalloc(1, sizeof(*refs));
> struct ref_store *ref_store = (struct ref_store *)refs;
> @@ -102,7 +102,7 @@ static struct ref_store *files_ref_store_create(struct repository *repo,
> get_common_dir_noenv(&sb, gitdir);
> refs->gitcommondir = strbuf_detach(&sb, NULL);
> refs->packed_ref_store =
> - packed_ref_store_create(repo, refs->gitcommondir, flags);
> + packed_ref_store_init(repo, refs->gitcommondir, flags);
>
> chdir_notify_reparent("files-backend $GIT_DIR", &refs->base.gitdir);
> chdir_notify_reparent("files-backend $GIT_COMMONDIR",
> @@ -3283,7 +3283,7 @@ static int files_init_db(struct ref_store *ref_store,
>
> struct ref_storage_be refs_be_files = {
> .name = "files",
> - .init = files_ref_store_create,
> + .init = files_ref_store_init,
> .init_db = files_init_db,
> .transaction_prepare = files_transaction_prepare,
> .transaction_finish = files_transaction_finish,
> diff --git a/refs/packed-backend.c b/refs/packed-backend.c
> index 4e826c05ff..a3c5a75073 100644
> --- a/refs/packed-backend.c
> +++ b/refs/packed-backend.c
> @@ -200,9 +200,9 @@ static int release_snapshot(struct snapshot *snapshot)
> }
> }
>
> -struct ref_store *packed_ref_store_create(struct repository *repo,
> - const char *gitdir,
> - unsigned int store_flags)
> +struct ref_store *packed_ref_store_init(struct repository *repo,
> + const char *gitdir,
> + unsigned int store_flags)
> {
> struct packed_ref_store *refs = xcalloc(1, sizeof(*refs));
> struct ref_store *ref_store = (struct ref_store *)refs;
> @@ -1244,9 +1244,9 @@ int packed_refs_is_locked(struct ref_store *ref_store)
> static const char PACKED_REFS_HEADER[] =
> "# pack-refs with: peeled fully-peeled sorted \n";
>
> -static int packed_init_db(struct ref_store *ref_store UNUSED,
> - int flags UNUSED,
> - struct strbuf *err UNUSED)
> +static int packed_ref_store_init_db(struct ref_store *ref_store UNUSED,
> + int flags UNUSED,
> + struct strbuf *err UNUSED)
> {
> /* Nothing to do. */
> return 0;
> @@ -1706,8 +1706,8 @@ static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_s
>
> struct ref_storage_be refs_be_packed = {
> .name = "packed",
> - .init = packed_ref_store_create,
> - .init_db = packed_init_db,
> + .init = packed_ref_store_init,
> + .init_db = packed_ref_store_init_db,
> .transaction_prepare = packed_transaction_prepare,
> .transaction_finish = packed_transaction_finish,
> .transaction_abort = packed_transaction_abort,
> diff --git a/refs/packed-backend.h b/refs/packed-backend.h
> index 9dd8a344c3..09437ad13b 100644
> --- a/refs/packed-backend.h
> +++ b/refs/packed-backend.h
> @@ -13,9 +13,9 @@ struct ref_transaction;
> * even among packed refs.
> */
>
> -struct ref_store *packed_ref_store_create(struct repository *repo,
> - const char *gitdir,
> - unsigned int store_flags);
> +struct ref_store *packed_ref_store_init(struct repository *repo,
> + const char *gitdir,
> + unsigned int store_flags);
>
> /*
> * Lock the packed-refs file for writing. Flags is passed to
> --
> 2.45.1.190.g19fe900cfc.dirty
The rest of this patch looks good.
Attachment:
signature.asc
Description: PGP signature
