aboutsummaryrefslogtreecommitdiff
path: root/libbb/verror_msg.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-07-04 17:16:44 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-07-04 17:16:44 +0200
commit7e1bb4bc5c1e2724a00bb4ef18925c8ed6f44886 (patch)
treebee78ed7ec0f371025dfd5dcdf9de21f14029c60 /libbb/verror_msg.c
parent926031b7640bf5aad2ffcd54b096911743a47d97 (diff)
downloadbusybox-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/verror_msg.c')
-rw-r--r--libbb/verror_msg.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/libbb/verror_msg.c b/libbb/verror_msg.c
index 613432906..c5fbc380c 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -76,12 +76,9 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
76 free(msg); 76 free(msg);
77} 77}
78 78
79
80#ifdef VERSION_WITH_WRITEV 79#ifdef VERSION_WITH_WRITEV
81
82/* Code size is approximately the same, but currently it's the only user 80/* Code size is approximately the same, but currently it's the only user
83 * of writev in entire bbox. __libc_writev in uclibc is ~50 bytes. */ 81 * of writev in entire bbox. __libc_writev in uclibc is ~50 bytes. */
84
85void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr) 82void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
86{ 83{
87 int strerr_len, msgeol_len; 84 int strerr_len, msgeol_len;
@@ -139,3 +136,23 @@ void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
139 free(msgc); 136 free(msgc);
140} 137}
141#endif 138#endif
139
140
141void FAST_FUNC bb_error_msg_and_die(const char *s, ...)
142{
143 va_list p;
144
145 va_start(p, s);
146 bb_verror_msg(s, p, NULL);
147 va_end(p);
148 xfunc_die();
149}
150
151void FAST_FUNC bb_error_msg(const char *s, ...)
152{
153 va_list p;
154
155 va_start(p, s);
156 bb_verror_msg(s, p, NULL);
157 va_end(p);
158}