ref_transaction_commit(): remove local variables n and updates

These microoptimizations don't make a significant difference in speed.
And they cause problems if somebody ever wants to modify the function to
add updates to a transaction as part of processing it, as will happen
shortly.

Make the same changes in initial_ref_transaction_commit().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 80d346fd380fea91210b3706871b696bbc30c5b2..814e230fa323851d6def5fcd89b0bee7a9d0f8bc 100644 (file)
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3076,8 +3076,6 @@ int ref_transaction_commit(struct ref_transaction *transaction,
                           struct strbuf *err)
 {
        int ret = 0, i;
                           struct strbuf *err)
 {
        int ret = 0, i;

-       int n = transaction->nr;
-       struct ref_update **updates = transaction->updates;

        struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
        struct string_list_item *ref_to_delete;
        struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
        struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
        struct string_list_item *ref_to_delete;
        struct string_list affected_refnames = STRING_LIST_INIT_NODUP;


@@ -3087,14 +3085,15 @@ int ref_transaction_commit(struct ref_transaction *transaction,
        if (transaction->state != REF_TRANSACTION_OPEN)
                die("BUG: commit called for transaction that is not open");
 
        if (transaction->state != REF_TRANSACTION_OPEN)
                die("BUG: commit called for transaction that is not open");
 

-       if (!n) {
+       if (!transaction->nr) {

                transaction->state = REF_TRANSACTION_CLOSED;
                return 0;
        }
 
        /* Fail if a refname appears more than once in the transaction: */
                transaction->state = REF_TRANSACTION_CLOSED;
                return 0;
        }
 
        /* Fail if a refname appears more than once in the transaction: */

-       for (i = 0; i < n; i++)
-               string_list_append(&affected_refnames, updates[i]->refname);
+       for (i = 0; i < transaction->nr; i++)
+               string_list_append(&affected_refnames,
+                                  transaction->updates[i]->refname);

        string_list_sort(&affected_refnames);
        if (ref_update_reject_duplicates(&affected_refnames, err)) {
                ret = TRANSACTION_GENERIC_ERROR;
        string_list_sort(&affected_refnames);
        if (ref_update_reject_duplicates(&affected_refnames, err)) {
                ret = TRANSACTION_GENERIC_ERROR;


@@ -3107,8 +3106,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
         * lockfiles, ready to be activated. Only keep one lockfile
         * open at a time to avoid running out of file descriptors.
         */
         * lockfiles, ready to be activated. Only keep one lockfile
         * open at a time to avoid running out of file descriptors.
         */

-       for (i = 0; i < n; i++) {
-               struct ref_update *update = updates[i];
+       for (i = 0; i < transaction->nr; i++) {
+               struct ref_update *update = transaction->updates[i];

 
                if ((update->flags & REF_HAVE_NEW) &&
                    is_null_sha1(update->new_sha1))
 
                if ((update->flags & REF_HAVE_NEW) &&
                    is_null_sha1(update->new_sha1))


@@ -3178,8 +3177,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
        }
 
        /* Perform updates first so live commits remain referenced */
        }
 
        /* Perform updates first so live commits remain referenced */

-       for (i = 0; i < n; i++) {
-               struct ref_update *update = updates[i];
+       for (i = 0; i < transaction->nr; i++) {
+               struct ref_update *update = transaction->updates[i];

 
                if (update->flags & REF_NEEDS_COMMIT) {
                        if (commit_ref_update(update->lock,
 
                if (update->flags & REF_NEEDS_COMMIT) {
                        if (commit_ref_update(update->lock,


@@ -3197,8 +3196,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
        }
 
        /* Perform deletes now that updates are safely completed */
        }
 
        /* Perform deletes now that updates are safely completed */

-       for (i = 0; i < n; i++) {
-               struct ref_update *update = updates[i];
+       for (i = 0; i < transaction->nr; i++) {
+               struct ref_update *update = transaction->updates[i];

 
                if (update->flags & REF_DELETING) {
                        if (delete_ref_loose(update->lock, update->type, err)) {
 
                if (update->flags & REF_DELETING) {
                        if (delete_ref_loose(update->lock, update->type, err)) {


@@ -3223,9 +3222,9 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 cleanup:
        transaction->state = REF_TRANSACTION_CLOSED;
 
 cleanup:
        transaction->state = REF_TRANSACTION_CLOSED;
 

-       for (i = 0; i < n; i++)
-               if (updates[i]->lock)
-                       unlock_ref(updates[i]->lock);
+       for (i = 0; i < transaction->nr; i++)
+               if (transaction->updates[i]->lock)
+                       unlock_ref(transaction->updates[i]->lock);

        string_list_clear(&refs_to_delete, 0);
        string_list_clear(&affected_refnames, 0);
        return ret;
        string_list_clear(&refs_to_delete, 0);
        string_list_clear(&affected_refnames, 0);
        return ret;


@@ -3243,8 +3242,6 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
                                   struct strbuf *err)
 {
        int ret = 0, i;
                                   struct strbuf *err)
 {
        int ret = 0, i;

-       int n = transaction->nr;
-       struct ref_update **updates = transaction->updates;

        struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
 
        assert(err);
        struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
 
        assert(err);


@@ -3253,8 +3250,9 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
                die("BUG: commit called for transaction that is not open");
 
        /* Fail if a refname appears more than once in the transaction: */
                die("BUG: commit called for transaction that is not open");
 
        /* Fail if a refname appears more than once in the transaction: */

-       for (i = 0; i < n; i++)
-               string_list_append(&affected_refnames, updates[i]->refname);
+       for (i = 0; i < transaction->nr; i++)
+               string_list_append(&affected_refnames,
+                                  transaction->updates[i]->refname);

        string_list_sort(&affected_refnames);
        if (ref_update_reject_duplicates(&affected_refnames, err)) {
                ret = TRANSACTION_GENERIC_ERROR;
        string_list_sort(&affected_refnames);
        if (ref_update_reject_duplicates(&affected_refnames, err)) {
                ret = TRANSACTION_GENERIC_ERROR;


@@ -3276,8 +3274,8 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
        if (for_each_rawref(ref_present, &affected_refnames))
                die("BUG: initial ref transaction called with existing refs");
 
        if (for_each_rawref(ref_present, &affected_refnames))
                die("BUG: initial ref transaction called with existing refs");
 

-       for (i = 0; i < n; i++) {
-               struct ref_update *update = updates[i];
+       for (i = 0; i < transaction->nr; i++) {
+               struct ref_update *update = transaction->updates[i];

 
                if ((update->flags & REF_HAVE_OLD) &&
                    !is_null_sha1(update->old_sha1))
 
                if ((update->flags & REF_HAVE_OLD) &&
                    !is_null_sha1(update->old_sha1))


@@ -3297,8 +3295,8 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
                goto cleanup;
        }
 
                goto cleanup;
        }
 

-       for (i = 0; i < n; i++) {
-               struct ref_update *update = updates[i];
+       for (i = 0; i < transaction->nr; i++) {
+               struct ref_update *update = transaction->updates[i];

 
                if ((update->flags & REF_HAVE_NEW) &&
                    !is_null_sha1(update->new_sha1))
 
                if ((update->flags & REF_HAVE_NEW) &&
                    !is_null_sha1(update->new_sha1))