summaryrefslogtreecommitdiff
path: root/libbb/perror_msg.c
diff options
context:
space:
mode:
authorDenys Vlasenko2010-07-04 17:16:44 +0200
committerDenys Vlasenko2010-07-04 17:16:44 +0200
commit7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886 (patch)
treebee78ed7ec0f371025dfd5dcdf9de21f14029c60 /libbb/perror_msg.c
parent926031b7640bf5aad2ffcd54b096911743a47d97 (diff)
downloadbusybox-7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886.zip
busybox-7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886.tar.gz
libbb: reduce number of *error_msg[_and_die].c files by four
No code changes. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/perror_msg.c')
-rw-r--r--libbb/perror_msg.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c
index 6c8e1b5..cbba805 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 "<error message>: 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);
+}