]> git.ipfire.org Git - thirdparty/git.git/commitdiff
packed-backend: remove stub BUG(...) functions
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Thu, 17 Mar 2022 17:27:18 +0000 (18:27 +0100)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Mar 2022 17:38:05 +0000 (10:38 -0700)
Remove the stub BUG(...) functions previously used by the "struct
ref_storage_be refs_be_packed" backend.

We never call any functions in the packed backend by using it as a
"normal" primary ref store, instead we'll always initialize a "files"
backend ref-store.

It will then via the "packed_ref_store" member of "struct
files_ref_store" call selected functions in the "packed" backend, and
we'll in addition call others via wrappers in refs.c.

So while these would arguably give us *slightly* more meaningful error
messages we'll NULL the missing members in the initializer anyway, so
we'll reliably get a segfault if we're ever changing the backend and
having it call something it doesn't have.

So there's no need for this verbose boilerplate, and as shown in a
subsequent commit it might even lead to some confusion about the
packed backend being a "real" backend. Let's make it clear that it's
not.

As an aside, this also fixes a warning emitted by SunCC in at least
versions 12.5 and 12.6 of Oracle Developer Studio:

    "refs/packed-backend.c", line 1599: warning: Function has no return statement : packed_create_symref
    "refs/packed-backend.c", line 1606: warning: Function has no return statement : packed_rename_ref)
    "refs/packed-backend.c", line 1613: warning: Function has no return statement : packed_copy_ref
    "refs/packed-backend.c", line 1648: warning: Function has no return statement : packed_create_reflog

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

index 03002451f15ec81d40bdb7c807d715edbf34e3e0..310c2a720269bbdae8a1e0ed16ba95288e0c4013 100644 (file)
@@ -1591,81 +1591,11 @@ static int packed_pack_refs(struct ref_store *ref_store, unsigned int flags)
        return 0;
 }
 
-static int packed_create_symref(struct ref_store *ref_store,
-                              const char *refname, const char *target,
-                              const char *logmsg)
-{
-       BUG("packed reference store does not support symrefs");
-}
-
-static int packed_rename_ref(struct ref_store *ref_store,
-                           const char *oldrefname, const char *newrefname,
-                           const char *logmsg)
-{
-       BUG("packed reference store does not support renaming references");
-}
-
-static int packed_copy_ref(struct ref_store *ref_store,
-                          const char *oldrefname, const char *newrefname,
-                          const char *logmsg)
-{
-       BUG("packed reference store does not support copying references");
-}
-
 static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_store)
 {
        return empty_ref_iterator_begin();
 }
 
-static int packed_for_each_reflog_ent(struct ref_store *ref_store,
-                                     const char *refname,
-                                     each_reflog_ent_fn fn, void *cb_data)
-{
-       BUG("packed reference store does not support reflogs");
-       return 0;
-}
-
-static int packed_for_each_reflog_ent_reverse(struct ref_store *ref_store,
-                                             const char *refname,
-                                             each_reflog_ent_fn fn,
-                                             void *cb_data)
-{
-       BUG("packed reference store does not support reflogs");
-       return 0;
-}
-
-static int packed_reflog_exists(struct ref_store *ref_store,
-                              const char *refname)
-{
-       BUG("packed reference store does not support reflogs");
-       return 0;
-}
-
-static int packed_create_reflog(struct ref_store *ref_store,
-                               const char *refname, struct strbuf *err)
-{
-       BUG("packed reference store does not support reflogs");
-}
-
-static int packed_delete_reflog(struct ref_store *ref_store,
-                              const char *refname)
-{
-       BUG("packed reference store does not support reflogs");
-       return 0;
-}
-
-static int packed_reflog_expire(struct ref_store *ref_store,
-                               const char *refname,
-                               unsigned int flags,
-                               reflog_expiry_prepare_fn prepare_fn,
-                               reflog_expiry_should_prune_fn should_prune_fn,
-                               reflog_expiry_cleanup_fn cleanup_fn,
-                               void *policy_cb_data)
-{
-       BUG("packed reference store does not support reflogs");
-       return 0;
-}
-
 struct ref_storage_be refs_be_packed = {
        .next = NULL,
        .name = "packed",
@@ -1677,20 +1607,20 @@ struct ref_storage_be refs_be_packed = {
        .initial_transaction_commit = packed_initial_transaction_commit,
 
        .pack_refs = packed_pack_refs,
-       .create_symref = packed_create_symref,
+       .create_symref = NULL,
        .delete_refs = packed_delete_refs,
-       .rename_ref = packed_rename_ref,
-       .copy_ref = packed_copy_ref,
+       .rename_ref = NULL,
+       .copy_ref = NULL,
 
        .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
+       .for_each_reflog_ent = NULL,
+       .for_each_reflog_ent_reverse = NULL,
+       .reflog_exists = NULL,
+       .create_reflog = NULL,
+       .delete_reflog = NULL,
+       .reflog_expire = NULL,
 };