kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Brandon Casey 2008-01-16 13:14:30 -06:00 committed by Junio C Hamano
parent 4ed7cd3ab0
commit b531394d58
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
refs.c
View File

@ -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) void unlock_ref(struct ref_lock *lock)
{ {
/* Do not free lock->lk -- atexit() still looks at them */ /* 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 || if (write_in_full(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 ||
write_in_full(lock->lock_fd, &term, 1) != 1 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); error("Couldn't write %s", lock->lk->filename);
unlock_ref(lock); unlock_ref(lock);
return -1; return -1;
@ -1180,12 +1196,11 @@ int write_ref_sha1(struct ref_lock *lock,
!strcmp(head_ref, lock->ref_name)) !strcmp(head_ref, lock->ref_name))
log_ref_write("HEAD", lock->old_sha1, sha1, logmsg); 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); error("Couldn't set %s", lock->ref_name);
unlock_ref(lock); unlock_ref(lock);
return -1; return -1;
} }
lock->lock_fd = -1;
unlock_ref(lock); unlock_ref(lock);
return 0; return 0;
} }