refs.c: rework ref_locks by abstracting from underlying struct lock_file

Instead of calling close_lock_file() and commit_lock_file() directly,
which take a struct lock_file argument, add two new functions:
close_ref() and commit_ref(), which handle calling the previous
lock_file functions and modifying the ref_lock structure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 8a42d39fd7ad11948aaa7f84cbf0b1c8fc4d4a9d..67d2a502afb60050f0ce750c21ae1a42fa5cb803 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -1018,6 +1018,22 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg)
        return 1;
 }
 
        return 1;
 }
 

+static int close_ref(struct ref_lock *lock)
+{
+       if (close_lock_file(lock->lk))
+               return -1;
+       lock->lock_fd = -1;
+       return 0;
+}
+
+static int commit_ref(struct ref_lock *lock)
+{
+       if (commit_lock_file(lock->lk))
+               return -1;
+       lock->lock_fd = -1;
+       return 0;
+}
+

 void unlock_ref(struct ref_lock *lock)
 {
        /* Do not free lock->lk -- atexit() still looks at them */
 void unlock_ref(struct ref_lock *lock)
 {
        /* Do not free lock->lk -- atexit() still looks at them */


@@ -1147,7 +1163,7 @@ int write_ref_sha1(struct ref_lock *lock,
        }
        if (write_in_full(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 ||
            write_in_full(lock->lock_fd, &term, 1) != 1
        }
        if (write_in_full(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 ||
            write_in_full(lock->lock_fd, &term, 1) != 1

-               || close_lock_file(lock->lk) < 0) {
+               || close_ref(lock) < 0) {

                error("Couldn't write %s", lock->lk->filename);
                unlock_ref(lock);
                return -1;
                error("Couldn't write %s", lock->lk->filename);
                unlock_ref(lock);
                return -1;


@@ -1180,12 +1196,11 @@ int write_ref_sha1(struct ref_lock *lock,
                    !strcmp(head_ref, lock->ref_name))
                        log_ref_write("HEAD", lock->old_sha1, sha1, logmsg);
        }
                    !strcmp(head_ref, lock->ref_name))
                        log_ref_write("HEAD", lock->old_sha1, sha1, logmsg);
        }

-       if (commit_lock_file(lock->lk)) {
+       if (commit_ref(lock)) {

                error("Couldn't set %s", lock->ref_name);
                unlock_ref(lock);
                return -1;
        }
                error("Couldn't set %s", lock->ref_name);
                unlock_ref(lock);
                return -1;
        }

-       lock->lock_fd = -1;

        unlock_ref(lock);
        return 0;
 }
        unlock_ref(lock);
        return 0;
 }