diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-04 17:16:44 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-04 17:16:44 +0200 |
| commit | 7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886 (patch) | |
| tree | bee78ed7ec0f371025dfd5dcdf9de21f14029c60 /libbb/perror_msg.c | |
| parent | 926031b7640bf5aad2ffcd54b096911743a47d97 (diff) | |
| download | busybox-w32-7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886.tar.gz busybox-w32-7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886.tar.bz2 busybox-w32-7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886.zip | |
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.c | 17 |
1 files changed, 16 insertions, 1 deletions
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 @@ | |||
| 6 | * | 6 | * |
| 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
| 8 | */ | 8 | */ |
| 9 | |||
| 10 | #include "libbb.h" | 9 | #include "libbb.h" |
| 11 | 10 | ||
| 12 | void FAST_FUNC bb_perror_msg(const char *s, ...) | 11 | void FAST_FUNC bb_perror_msg(const char *s, ...) |
| @@ -19,7 +18,23 @@ void FAST_FUNC bb_perror_msg(const char *s, ...) | |||
| 19 | va_end(p); | 18 | va_end(p); |
| 20 | } | 19 | } |
| 21 | 20 | ||
| 21 | void FAST_FUNC bb_perror_msg_and_die(const char *s, ...) | ||
| 22 | { | ||
| 23 | va_list p; | ||
| 24 | |||
| 25 | va_start(p, s); | ||
| 26 | /* Guard against "<error message>: Success" */ | ||
| 27 | bb_verror_msg(s, p, errno ? strerror(errno) : NULL); | ||
| 28 | va_end(p); | ||
| 29 | xfunc_die(); | ||
| 30 | } | ||
| 31 | |||
| 22 | void FAST_FUNC bb_simple_perror_msg(const char *s) | 32 | void FAST_FUNC bb_simple_perror_msg(const char *s) |
| 23 | { | 33 | { |
| 24 | bb_perror_msg("%s", s); | 34 | bb_perror_msg("%s", s); |
| 25 | } | 35 | } |
| 36 | |||
| 37 | void FAST_FUNC bb_simple_perror_msg_and_die(const char *s) | ||
| 38 | { | ||
| 39 | bb_perror_msg_and_die("%s", s); | ||
| 40 | } | ||