refs: use designated initializers for "struct ref_storage_be"

Change the definition of the three refs backends we currently carry to
use designated initializers.

The "= NULL" assignments being retained here are redundant, and could
be removed, but let's keep them for clarity. All of these backends
define almost all fields, so we're not saving much in terms of line
count by omitting these, but e.g. for "refs_be_debug" it's immediately
apparent that we're omitting "init" when comparing its assignment to
the others.

This is a follow-up to similar work merged in bd4232fac33 (Merge
branch 'ab/struct-init', 2021-07-16), a4b9fb6a5cf (Merge branch
'ab/designated-initializers-more', 2021-10-18) and a30321b9eae (Merge
branch 'ab/designated-initializers' into
ab/designated-initializers-more, 2021-09-27).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs/debug.c b/refs/debug.c
index c590d377200c637687797f60e16b71f44e3d7a30..b03a83258be94dda8f3f3be82c70d41165619819 100644 (file)
--- a/refs/debug.c
+++ b/refs/debug.c
@@ -418,30 +418,30 @@ static int debug_reflog_expire(struct ref_store *ref_store, const char *refname,
 }
 
 struct ref_storage_be refs_be_debug = {
-       NULL,
-       "debug",
-       NULL,
-       debug_init_db,
-       debug_transaction_prepare,
-       debug_transaction_finish,
-       debug_transaction_abort,
-       debug_initial_transaction_commit,
-
-       debug_pack_refs,
-       debug_create_symref,
-       debug_delete_refs,
-       debug_rename_ref,
-       debug_copy_ref,
-
-       debug_ref_iterator_begin,
-       debug_read_raw_ref,
-       NULL,
-
-       debug_reflog_iterator_begin,
-       debug_for_each_reflog_ent,
-       debug_for_each_reflog_ent_reverse,
-       debug_reflog_exists,
-       debug_create_reflog,
-       debug_delete_reflog,
-       debug_reflog_expire,
+       .next = NULL,
+       .name = "debug",
+       .init = NULL,
+       .init_db = debug_init_db,
+       .transaction_prepare = debug_transaction_prepare,
+       .transaction_finish = debug_transaction_finish,
+       .transaction_abort = debug_transaction_abort,
+       .initial_transaction_commit = debug_initial_transaction_commit,
+
+       .pack_refs = debug_pack_refs,
+       .create_symref = debug_create_symref,
+       .delete_refs = debug_delete_refs,
+       .rename_ref = debug_rename_ref,
+       .copy_ref = debug_copy_ref,
+
+       .iterator_begin = debug_ref_iterator_begin,
+       .read_raw_ref = debug_read_raw_ref,
+       .read_symbolic_ref = NULL,
+
+       .reflog_iterator_begin = debug_reflog_iterator_begin,
+       .for_each_reflog_ent = debug_for_each_reflog_ent,
+       .for_each_reflog_ent_reverse = debug_for_each_reflog_ent_reverse,
+       .reflog_exists = debug_reflog_exists,
+       .create_reflog = debug_create_reflog,
+       .delete_reflog = debug_delete_reflog,
+       .reflog_expire = debug_reflog_expire,
 };

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 0457ecdb42dac658673519779f55f3d08ef50beb..f95552f926334ffa2104276b648d3bbfafb02847 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3291,30 +3291,30 @@ static int files_init_db(struct ref_store *ref_store, struct strbuf *err)
 }
 
 struct ref_storage_be refs_be_files = {
-       NULL,
-       "files",
-       files_ref_store_create,
-       files_init_db,
-       files_transaction_prepare,
-       files_transaction_finish,
-       files_transaction_abort,
-       files_initial_transaction_commit,
-
-       files_pack_refs,
-       files_create_symref,
-       files_delete_refs,
-       files_rename_ref,
-       files_copy_ref,
-
-       files_ref_iterator_begin,
-       files_read_raw_ref,
-       files_read_symbolic_ref,
-
-       files_reflog_iterator_begin,
-       files_for_each_reflog_ent,
-       files_for_each_reflog_ent_reverse,
-       files_reflog_exists,
-       files_create_reflog,
-       files_delete_reflog,
-       files_reflog_expire
+       .next = NULL,
+       .name = "files",
+       .init = files_ref_store_create,
+       .init_db = files_init_db,
+       .transaction_prepare = files_transaction_prepare,
+       .transaction_finish = files_transaction_finish,
+       .transaction_abort = files_transaction_abort,
+       .initial_transaction_commit = files_initial_transaction_commit,
+
+       .pack_refs = files_pack_refs,
+       .create_symref = files_create_symref,
+       .delete_refs = files_delete_refs,
+       .rename_ref = files_rename_ref,
+       .copy_ref = files_copy_ref,
+
+       .iterator_begin = files_ref_iterator_begin,
+       .read_raw_ref = files_read_raw_ref,
+       .read_symbolic_ref = files_read_symbolic_ref,
+
+       .reflog_iterator_begin = files_reflog_iterator_begin,
+       .for_each_reflog_ent = files_for_each_reflog_ent,
+       .for_each_reflog_ent_reverse = files_for_each_reflog_ent_reverse,
+       .reflog_exists = files_reflog_exists,
+       .create_reflog = files_create_reflog,
+       .delete_reflog = files_delete_reflog,
+       .reflog_expire = files_reflog_expire
 };

diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index f56e2cc635b1824f12537d1a99dbf148909cd9ef..47f01fa5c98617ac3213601aea57f3888a8c1ffc 100644 (file)
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -1667,30 +1667,30 @@ static int packed_reflog_expire(struct ref_store *ref_store,
 }
 
 struct ref_storage_be refs_be_packed = {
-       NULL,
-       "packed",
-       packed_ref_store_create,
-       packed_init_db,
-       packed_transaction_prepare,
-       packed_transaction_finish,
-       packed_transaction_abort,
-       packed_initial_transaction_commit,
-
-       packed_pack_refs,
-       packed_create_symref,
-       packed_delete_refs,
-       packed_rename_ref,
-       packed_copy_ref,
-
-       packed_ref_iterator_begin,
-       packed_read_raw_ref,
-       NULL,
-
-       packed_reflog_iterator_begin,
-       packed_for_each_reflog_ent,
-       packed_for_each_reflog_ent_reverse,
-       packed_reflog_exists,
-       packed_create_reflog,
-       packed_delete_reflog,
-       packed_reflog_expire
+       .next = NULL,
+       .name = "packed",
+       .init = packed_ref_store_create,
+       .init_db = packed_init_db,
+       .transaction_prepare = packed_transaction_prepare,
+       .transaction_finish = packed_transaction_finish,
+       .transaction_abort = packed_transaction_abort,
+       .initial_transaction_commit = packed_initial_transaction_commit,
+
+       .pack_refs = packed_pack_refs,
+       .create_symref = packed_create_symref,
+       .delete_refs = packed_delete_refs,
+       .rename_ref = packed_rename_ref,
+       .copy_ref = packed_copy_ref,
+
+       .iterator_begin = packed_ref_iterator_begin,
+       .read_raw_ref = packed_read_raw_ref,
+       .read_symbolic_ref = NULL,
+
+       .reflog_iterator_begin = packed_reflog_iterator_begin,
+       .for_each_reflog_ent = packed_for_each_reflog_ent,
+       .for_each_reflog_ent_reverse = packed_for_each_reflog_ent_reverse,
+       .reflog_exists = packed_reflog_exists,
+       .create_reflog = packed_create_reflog,
+       .delete_reflog = packed_delete_reflog,
+       .reflog_expire = packed_reflog_expire
 };