From 7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 4 Jul 2010 17:16:44 +0200 Subject: libbb: reduce number of *error_msg[_and_die].c files by four No code changes. Signed-off-by: Denys Vlasenko --- libbb/perror_msg.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'libbb/perror_msg.c') diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c index 6c8e1b51e..cbba805fb 100644 --- a/libbb/perror_msg.c +++ b/libbb/perror_msg.c @@ -6,7 +6,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ - #include "libbb.h" void FAST_FUNC bb_perror_msg(const char *s, ...) @@ -19,7 +18,23 @@ void FAST_FUNC bb_perror_msg(const char *s, ...) va_end(p); } +void FAST_FUNC bb_perror_msg_and_die(const char *s, ...) +{ + va_list p; + + va_start(p, s); + /* Guard against ": Success" */ + bb_verror_msg(s, p, errno ? strerror(errno) : NULL); + va_end(p); + xfunc_die(); +} + void FAST_FUNC bb_simple_perror_msg(const char *s) { bb_perror_msg("%s", s); } + +void FAST_FUNC bb_simple_perror_msg_and_die(const char *s) +{ + bb_perror_msg_and_die("%s", s); +} -- cgit v1.2.3