diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-10-01 12:28:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-01 13:38:38 -0700 |
| commit | e197c21807dacadc8305250baa0b9228819189d4 (patch) | |
| tree | 16d417a9dd52aa8a8d5172e329d3d721cca6f9f0 /lockfile.c | |
| parent | 565301e41670825ceedf75220f2918ae76831240 (diff) | |
| download | git-e197c21807dacadc8305250baa0b9228819189d4.tar.gz | |
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>
Diffstat (limited to 'lockfile.c')
| -rw-r--r-- | lockfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lockfile.c b/lockfile.c index 2a800cef33..f1ce1544d2 100644 --- a/lockfile.c +++ b/lockfile.c @@ -185,7 +185,7 @@ int unable_to_lock_error(const char *path, int err) 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; @@ -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); if (fd < 0 && (flags & LOCK_DIE_ON_ERROR)) - unable_to_lock_index_die(path, errno); + unable_to_lock_die(path, errno); 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); if (fd < 0) { if (flags & LOCK_DIE_ON_ERROR) - unable_to_lock_index_die(path, errno); + unable_to_lock_die(path, errno); return fd; } |