diff options
author | Ron Yorston <rmy@pobox.com> | 2017-07-29 14:48:00 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-07-29 17:30:21 +0200 |
commit | 008fc9499ae63186589fbc81a5f849a2df652004 (patch) | |
tree | 7a95f175b72ec00bf747989ea34b5f6b39d8c657 | |
parent | 69be994de69d794f038f10a3e7a67519b2006581 (diff) | |
download | busybox-w32-008fc9499ae63186589fbc81a5f849a2df652004.tar.gz busybox-w32-008fc9499ae63186589fbc81a5f849a2df652004.tar.bz2 busybox-w32-008fc9499ae63186589fbc81a5f849a2df652004.zip |
libbb: remove vdprintf
Two reasons:
* it's only built for GNU C Library versions < 2 (released 1997)
* it isn't used anywhere in BusyBox
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | TODO | 2 | ||||
-rw-r--r-- | include/libbb.h | 3 | ||||
-rw-r--r-- | libbb/Kbuild.src | 1 | ||||
-rw-r--r-- | libbb/vdprintf.c | 21 |
4 files changed, 0 insertions, 27 deletions
@@ -224,8 +224,6 @@ Minor stuff: | |||
224 | --- | 224 | --- |
225 | support start-stop-daemon -d <chdir-path> | 225 | support start-stop-daemon -d <chdir-path> |
226 | --- | 226 | --- |
227 | vdprintf() -> similar sized functionality | ||
228 | --- | ||
229 | 227 | ||
230 | (TODO list after discussion 11.05.2009) | 228 | (TODO list after discussion 11.05.2009) |
231 | 229 | ||
diff --git a/include/libbb.h b/include/libbb.h index 6abf88218..9aba71949 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -167,9 +167,6 @@ | |||
167 | /* Some libc's forget to declare these, do it ourself */ | 167 | /* Some libc's forget to declare these, do it ourself */ |
168 | 168 | ||
169 | extern char **environ; | 169 | extern char **environ; |
170 | #if defined(__GLIBC__) && __GLIBC__ < 2 | ||
171 | int vdprintf(int d, const char *format, va_list ap); | ||
172 | #endif | ||
173 | /* klogctl is in libc's klog.h, but we cheat and not #include that */ | 170 | /* klogctl is in libc's klog.h, but we cheat and not #include that */ |
174 | int klogctl(int type, char *b, int len); | 171 | int klogctl(int type, char *b, int len); |
175 | #ifndef PATH_MAX | 172 | #ifndef PATH_MAX |
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src index 49493c501..458973f17 100644 --- a/libbb/Kbuild.src +++ b/libbb/Kbuild.src | |||
@@ -97,7 +97,6 @@ lib-y += time.o | |||
97 | lib-y += trim.o | 97 | lib-y += trim.o |
98 | lib-y += u_signal_names.o | 98 | lib-y += u_signal_names.o |
99 | lib-y += uuencode.o | 99 | lib-y += uuencode.o |
100 | lib-y += vdprintf.o | ||
101 | lib-y += verror_msg.o | 100 | lib-y += verror_msg.o |
102 | lib-y += vfork_daemon_rexec.o | 101 | lib-y += vfork_daemon_rexec.o |
103 | lib-y += warn_ignoring_args.o | 102 | lib-y += warn_ignoring_args.o |
diff --git a/libbb/vdprintf.c b/libbb/vdprintf.c deleted file mode 100644 index 05426873e..000000000 --- a/libbb/vdprintf.c +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Utility routines. | ||
4 | * | ||
5 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | ||
6 | * | ||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | ||
8 | */ | ||
9 | |||
10 | #include "libbb.h" | ||
11 | |||
12 | #if defined(__GLIBC__) && __GLIBC__ < 2 | ||
13 | int FAST_FUNC vdprintf(int d, const char *format, va_list ap) | ||
14 | { | ||
15 | char buf[8 * 1024]; | ||
16 | int len; | ||
17 | |||
18 | len = vsnprintf(buf, sizeof(buf), format, ap); | ||
19 | return write(d, buf, len); | ||
20 | } | ||
21 | #endif | ||