From: Jonathan Nieder Date: Wed, 15 Oct 2014 00:55:21 GMT Subject: [PATCH 24/25] lockfile: remove unable_to_lock_error Message-ID: <20141015005521.GB32245@google.com> In-Reply-To: <20141015004522.GD32245@google.com> Date: Thu, 28 Aug 2014 16:41:34 -0700 The former caller uses unable_to_lock_message now. Signed-off-by: Jonathan Nieder Reviewed-by: Ronnie Sahlberg --- lockfile.c | 10 ---------- lockfile.h | 1 - 2 files changed, 11 deletions(-) diff --git a/lockfile.c b/lockfile.c index d098ade..4f16ee7 100644 --- a/lockfile.c +++ b/lockfile.c @@ -162,16 +162,6 @@ void unable_to_lock_message(const char *path, int err, struct strbuf *buf) absolute_path(path), strerror(err)); } -int unable_to_lock_error(const char *path, int err) -{ - struct strbuf buf = STRBUF_INIT; - - unable_to_lock_message(path, err, &buf); - error("%s", buf.buf); - strbuf_release(&buf); - return -1; -} - NORETURN void unable_to_lock_die(const char *path, int err) { struct strbuf buf = STRBUF_INIT; diff --git a/lockfile.h b/lockfile.h index dc066d1..cd2ec95 100644 --- a/lockfile.h +++ b/lockfile.h @@ -71,7 +71,6 @@ struct lock_file { #define LOCK_DIE_ON_ERROR 1 #define LOCK_NO_DEREF 2 -extern int unable_to_lock_error(const char *path, int err); extern void unable_to_lock_message(const char *path, int err, struct strbuf *buf); extern NORETURN void unable_to_lock_die(const char *path, int err); -- 2.1.0.rc2.206.gedb03e5