summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2014-08-28 16:41:34 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-15 10:47:27 -0700
commitfb43bd1cd187bcd29312df3b0394a457d524906d (patch)
tree167849a847b24867c23cab7718238cbc60f8ba9f
parentrefs.c: do not permit err == NULL (diff)
downloadtgif-fb43bd1cd187bcd29312df3b0394a457d524906d.tar.xz
lockfile: remove unable_to_lock_error
The former caller uses unable_to_lock_message now. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Ronnie Sahlberg <sahlberg@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--lockfile.c10
-rw-r--r--lockfile.h1
2 files changed, 0 insertions, 11 deletions
diff --git a/lockfile.c b/lockfile.c
index d098adebf1..4f16ee78ce 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 dc066d1783..cd2ec95d30 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);