refs.c: remove lock_fd from struct ref_lock

The 'lock_fd' is the same as 'lk->fd'. No need to store it twice so remove
it.

No functional changes intended.

Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 47e4e5380a1e0fc04f8b81837c51c023f35871cf..4f495bd7625b613bf20d45d3ad574b9c423faaea 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -11,7 +11,6 @@ struct ref_lock {
        char *orig_ref_name;
        struct lock_file *lk;
        unsigned char old_sha1[20];
        char *orig_ref_name;
        struct lock_file *lk;
        unsigned char old_sha1[20];

-       int lock_fd;

 };
 
 /*
 };
 
 /*


@@ -2284,7 +2283,6 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
        int attempts_remaining = 3;
 
        lock = xcalloc(1, sizeof(struct ref_lock));
        int attempts_remaining = 3;
 
        lock = xcalloc(1, sizeof(struct ref_lock));

-       lock->lock_fd = -1;

 
        if (mustexist)
                resolve_flags |= RESOLVE_REF_READING;
 
        if (mustexist)
                resolve_flags |= RESOLVE_REF_READING;


@@ -2356,8 +2354,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
                goto error_return;
        }
 
                goto error_return;
        }
 

-       lock->lock_fd = hold_lock_file_for_update(lock->lk, ref_file, lflags);
-       if (lock->lock_fd < 0) {
+       if (hold_lock_file_for_update(lock->lk, ref_file, lflags) < 0) {

                last_errno = errno;
                if (errno == ENOENT && --attempts_remaining > 0)
                        /*
                last_errno = errno;
                if (errno == ENOENT && --attempts_remaining > 0)
                        /*


@@ -2868,7 +2865,6 @@ static int close_ref(struct ref_lock *lock)
 {
        if (close_lock_file(lock->lk))
                return -1;
 {
        if (close_lock_file(lock->lk))
                return -1;

-       lock->lock_fd = -1;

        return 0;
 }
 
        return 0;
 }
 


@@ -2876,7 +2872,6 @@ static int commit_ref(struct ref_lock *lock)
 {
        if (commit_lock_file(lock->lk))
                return -1;
 {
        if (commit_lock_file(lock->lk))
                return -1;

-       lock->lock_fd = -1;

        return 0;
 }
 
        return 0;
 }
 


@@ -3046,8 +3041,8 @@ static int write_ref_sha1(struct ref_lock *lock,
                errno = EINVAL;
                return -1;
        }
                errno = EINVAL;
                return -1;
        }

-       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->lk->fd, sha1_to_hex(sha1), 40) != 40 ||
+           write_in_full(lock->lk->fd, &term, 1) != 1 ||

            close_ref(lock) < 0) {
                int save_errno = errno;
                error("Couldn't write %s", lock->lk->filename.buf);
            close_ref(lock) < 0) {
                int save_errno = errno;
                error("Couldn't write %s", lock->lk->filename.buf);


@@ -4084,9 +4079,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
                        status |= error("couldn't write %s: %s", log_file,
                                        strerror(errno));
                } else if (update &&
                        status |= error("couldn't write %s: %s", log_file,
                                        strerror(errno));
                } else if (update &&

-                       (write_in_full(lock->lock_fd,
+                          (write_in_full(lock->lk->fd,

                                sha1_to_hex(cb.last_kept_sha1), 40) != 40 ||
                                sha1_to_hex(cb.last_kept_sha1), 40) != 40 ||

-                        write_str_in_full(lock->lock_fd, "\n") != 1 ||
+                        write_str_in_full(lock->lk->fd, "\n") != 1 ||

                         close_ref(lock) < 0)) {
                        status |= error("couldn't write %s",
                                        lock->lk->filename.buf);
                         close_ref(lock) < 0)) {
                        status |= error("couldn't write %s",
                                        lock->lk->filename.buf);