mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 01:16:08 +02:00
Code

unable_to_lock_die(): rename function from unable_to_lock_index_die() 

This function is used for other things besides the index, so rename it
accordingly.

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2014-10-01 12:28:05 +02:00 committed by Junio C Hamano
parent 565301e416
commit e197c21807
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/update-index.c
View File

@ -942,7 +942,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
if (newfd < 0) { if (newfd < 0) {
if (refresh_args.flags & REFRESH_QUIET) if (refresh_args.flags & REFRESH_QUIET)
exit(128); exit(128);
unable_to_lock_index_die(get_index_file(), lock_error); unable_to_lock_die(get_index_file(), lock_error);
} }
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
die("Unable to write new index file"); die("Unable to write new index file");

2
cache.h
View File

@ -582,7 +582,7 @@ struct lock_file {
extern int unable_to_lock_error(const char *path, int err); extern int unable_to_lock_error(const char *path, int err);
extern void unable_to_lock_message(const char *path, int err, extern void unable_to_lock_message(const char *path, int err,
struct strbuf *buf); struct strbuf *buf);
extern NORETURN void unable_to_lock_index_die(const char *path, int err); extern NORETURN void unable_to_lock_die(const char *path, int err);
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int); extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
extern int hold_lock_file_for_append(struct lock_file *, const char *path, int); extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
extern int commit_lock_file(struct lock_file *); extern int commit_lock_file(struct lock_file *);

6
lockfile.c
View File

@ -185,7 +185,7 @@ int unable_to_lock_error(const char *path, int err)
return -1; return -1;
} }
NORETURN void unable_to_lock_index_die(const char *path, int err) NORETURN void unable_to_lock_die(const char *path, int err)
{ {
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
@ -198,7 +198,7 @@ int hold_lock_file_for_update(struct lock_file *lk, const char *path, int flags)
{ {
int fd = lock_file(lk, path, flags); int fd = lock_file(lk, path, flags);
if (fd < 0 && (flags & LOCK_DIE_ON_ERROR)) if (fd < 0 && (flags & LOCK_DIE_ON_ERROR))
unable_to_lock_index_die(path, errno); unable_to_lock_die(path, errno);
return fd; return fd;
} }
@ -209,7 +209,7 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
fd = lock_file(lk, path, flags); fd = lock_file(lk, path, flags);
if (fd < 0) { if (fd < 0) {
if (flags & LOCK_DIE_ON_ERROR) if (flags & LOCK_DIE_ON_ERROR)
unable_to_lock_index_die(path, errno); unable_to_lock_die(path, errno);
return fd; return fd;
} }

2
refs.c
View File

@ -2225,7 +2225,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname,
*/ */
goto retry; goto retry;
else else
unable_to_lock_index_die(ref_file, errno); unable_to_lock_die(ref_file, errno);
} }
return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock; return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock;