Re: [PATCH v2 34/43] refs.c: make struct ref_transaction generic

Alternate ref backends might need different data for transactions.  Make
struct ref_transaction an empty struct, and let backends define their
own structs which extend it.

Signed-off-by: David Turner <redacted>
---
 refs-be-files.c | 24 +++++++++++++++++-------
 refs.h          |  8 ++++++--
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/refs-be-files.c b/refs-be-files.c
index 0a76c8e..3f2d194 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c

@@ -3218,7 +3218,8 @@ enum ref_transaction_state {
  * consist of checks and updates to multiple references, carried out
  * as atomically as possible.  This structure is opaque to callers.
  */
-struct ref_transaction {
+struct files_ref_transaction {
+       struct ref_transaction base;
        struct ref_update **updates;
        size_t alloc;
        size_t nr;

@@ -3229,13 +3230,16 @@ static struct ref_transaction *files_transaction_begin(struct strbuf *err)
 {
        assert(err);

-       return xcalloc(1, sizeof(struct ref_transaction));
+       return xcalloc(1, sizeof(struct files_ref_transaction));
 }

-static void files_transaction_free(struct ref_transaction *transaction)
+static void files_transaction_free(struct ref_transaction *trans)
 {
        int i;

+       struct files_ref_transaction *transaction =
+               (struct files_ref_transaction *)trans;
+
        if (!transaction)
                return;

@@ -3247,7 +3251,7 @@ static void files_transaction_free(struct ref_transaction *transaction)
        free(transaction);
 }

-static struct ref_update *add_update(struct ref_transaction *transaction,
+static struct ref_update *add_update(struct files_ref_transaction *transaction,
                                     const char *refname)
 {
        size_t len = strlen(refname) + 1;

@@ -3259,7 +3263,7 @@ static struct ref_update *add_update(struct ref_transaction *transaction,
        return update;
 }

-static int files_transaction_update(struct ref_transaction *transaction,
+static int files_transaction_update(struct ref_transaction *trans,
                                  const char *refname,
                                  const unsigned char *new_sha1,
                                  const unsigned char *old_sha1,

@@ -3267,6 +3271,8 @@ static int files_transaction_update(struct ref_transaction *transaction,
                                  struct strbuf *err)
 {
        struct ref_update *update;
+       struct files_ref_transaction *transaction =
+               (struct files_ref_transaction *)trans;

        assert(err);

@@ -3350,10 +3356,12 @@ static int ref_update_reject_duplicates(struct string_list *refnames,
        return 0;
 }

-static int files_transaction_commit(struct ref_transaction *transaction,
+static int files_transaction_commit(struct ref_transaction *trans,
                                  struct strbuf *err)
 {
        int ret = 0, i;
+       struct files_ref_transaction *transaction =
+               (struct files_ref_transaction *)trans;
        int n = transaction->nr;
        struct ref_update **updates = transaction->updates;
        struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;

@@ -3517,10 +3525,12 @@ static int ref_present(const char *refname,
        return string_list_has_string(affected_refnames, refname);
 }

-static int files_initial_transaction_commit(struct ref_transaction *transaction,
+static int files_initial_transaction_commit(struct ref_transaction *trans,
                                            struct strbuf *err)
 {
        int ret = 0, i;
+       struct files_ref_transaction *transaction =
+               (struct files_ref_transaction *)trans;
        int n = transaction->nr;
        struct ref_update **updates = transaction->updates;
        struct string_list affected_refnames = STRING_LIST_INIT_NODUP;

diff --git a/refs.h b/refs.h
index 64dba64..02001ef 100644
--- a/refs.h
+++ b/refs.h

@@ -130,7 +130,7 @@ extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
  *
  * Calling sequence
  * ----------------
- * - Allocate and initialize a `struct ref_transaction` by calling
+ * - Allocate and initialize a transaction by calling
  *   `ref_transaction_begin()`.
  *
  * - List intended ref updates by calling functions like

@@ -156,7 +156,10 @@ extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
  * The message is appended to err without first clearing err.
  * err will not be '\n' terminated.
  */
-struct ref_transaction;
+
+struct ref_transaction {
+       /* ref backends should extend this */
+};

 /*
  * Bit values set in the flags argument passed to each_ref_fn():

@@ -629,6 +632,7 @@ typedef int (*reflog_expire_fn)(const char *refname, const unsigned char *sha1,
                                void *policy_cb_data);

 /* resolution functions */
+typedef void (*ref_transaction_free_fn)(struct ref_transaction *transaction);
 typedef const char *(*resolve_ref_unsafe_fn)(const char *ref,
                                             int resolve_flags,
                                             unsigned char *sha1, int *flags);
--

2.4.2.644.g97b850b-twtrsrc

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html