summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2014-12-02 21:26:54 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-03 14:44:59 -0800
commitbd3c760bf47b68b5361fd6c602984015e4057d4c (patch)
tree810ba14a7739792b810eb37170b0cebc76018c6d
parentcb37fcc67be1743c2cdc0be4b1b6c924da9a91de (diff)
downloadgit-bd3c760bf47b68b5361fd6c602984015e4057d4c.tar.gz
lockfile: remove unused function 'unable_to_lock_die'
The old callers now use the message passed back by hold_lock_file_for_update / hold_lock_file_for_append instead of trying to interpret errno. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--lockfile.c8
-rw-r--r--lockfile.h1
2 files changed, 0 insertions, 9 deletions
diff --git a/lockfile.c b/lockfile.c
index a79679bdc5..8d8d5ed4b2 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -170,14 +170,6 @@ void unable_to_lock_message(const char *path, int flags, int err,
}
}
-NORETURN void unable_to_lock_die(const char *path, int flags, int err)
-{
- struct strbuf buf = STRBUF_INIT;
-
- unable_to_lock_message(path, flags, err, &buf);
- die("%s", buf.buf);
-}
-
int hold_lock_file_for_update(struct lock_file *lk, const char *path,
int flags, struct strbuf *err)
{
diff --git a/lockfile.h b/lockfile.h
index 6d0a9bbe5b..b4d29a3930 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -73,7 +73,6 @@ struct lock_file {
extern void unable_to_lock_message(const char *path, int, int err,
struct strbuf *buf);
-extern NORETURN void unable_to_lock_die(const char *path, int, int err);
extern int hold_lock_file_for_update(struct lock_file *, const char *path,
int, struct strbuf *err);
extern int hold_lock_file_for_append(struct lock_file *, const char *path,