Browse Source

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>
maint
Jonathan Nieder 11 years ago committed by Junio C Hamano
parent
commit
fb43bd1cd1
  1. 10
      lockfile.c
  2. 1
      lockfile.h

10
lockfile.c

@ -162,16 +162,6 @@ void unable_to_lock_message(const char *path, int err, struct strbuf *buf) @@ -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;

1
lockfile.h

@ -71,7 +71,6 @@ struct lock_file { @@ -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);

Loading…
Cancel
Save