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@xxxxxxxxx> --- lockfile.c | 8 -------- lockfile.h | 1 - 2 files changed, 9 deletions(-) diff --git a/lockfile.c b/lockfile.c index a79679b..8d8d5ed 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 6d0a9bb..b4d29a3 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, -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html