aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-03-30 18:41:23 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2016-03-30 18:41:23 +0200
commit8f2e99c813dcac25faf58162ed18848a02888ff6 (patch)
treeb8e0371701511e7600aad1874c0871148331a36f /libbb
parent80f0f1d712fb3ab236e1fc8b37dfa7a9224d7849 (diff)
downloadbusybox-w32-8f2e99c813dcac25faf58162ed18848a02888ff6.tar.gz
busybox-w32-8f2e99c813dcac25faf58162ed18848a02888ff6.tar.bz2
busybox-w32-8f2e99c813dcac25faf58162ed18848a02888ff6.zip
udhcp: get rid of bb_info_msg()
function old new delta udhcpd_main 1501 1531 +30 d6_recv_raw_packet 251 264 +13 perform_d6_release 188 198 +10 udhcpc6_main 2443 2449 +6 udhcp_recv_raw_packet 582 588 +6 udhcp_recv_kernel_packet 132 138 +6 send_d6_renew 140 146 +6 d6_recv_kernel_packet 118 124 +6 send_renew 77 82 +5 send_discover 85 90 +5 send_decline 84 89 +5 send_d6_select 97 102 +5 send_d6_discover 174 179 +5 perform_release 167 172 +5 count_lines 72 74 +2 udhcpc_main 2836 2837 +1 bb_info_msg 125 - -125 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 17/4 up/down: 117/-180) Total: -63 bytes text data bss dec hex filename 924935 906 17160 943001 e6399 busybox_old 924736 906 17160 942802 e62d2 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/Kbuild.src1
-rw-r--r--libbb/info_msg.c62
2 files changed, 0 insertions, 63 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 7fb687227..b08ce1158 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -46,7 +46,6 @@ lib-y += get_volsize.o
46lib-y += herror_msg.o 46lib-y += herror_msg.o
47lib-y += human_readable.o 47lib-y += human_readable.o
48lib-y += inet_common.o 48lib-y += inet_common.o
49lib-y += info_msg.o
50lib-y += inode_hash.o 49lib-y += inode_hash.o
51lib-y += isdirectory.o 50lib-y += isdirectory.o
52lib-y += kernel_version.o 51lib-y += kernel_version.o
diff --git a/libbb/info_msg.c b/libbb/info_msg.c
deleted file mode 100644
index 56ca2efd4..000000000
--- a/libbb/info_msg.c
+++ /dev/null
@@ -1,62 +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#if ENABLE_FEATURE_SYSLOG
12# include <syslog.h>
13#endif
14
15void FAST_FUNC bb_info_msg(const char *s, ...)
16{
17#ifdef THIS_ONE_DOESNT_DO_SINGLE_WRITE
18 va_list p;
19 /* va_copy is used because it is not portable
20 * to use va_list p twice */
21 va_list p2;
22
23 va_start(p, s);
24 va_copy(p2, p);
25 if (logmode & LOGMODE_STDIO) {
26 vprintf(s, p);
27 fputs(msg_eol, stdout);
28 }
29# if ENABLE_FEATURE_SYSLOG
30 if (logmode & LOGMODE_SYSLOG)
31 vsyslog(LOG_INFO, s, p2);
32# endif
33 va_end(p2);
34 va_end(p);
35#else
36 int used;
37 char *msg;
38 va_list p;
39
40 if (logmode == 0)
41 return;
42
43 va_start(p, s);
44 used = vasprintf(&msg, s, p);
45 va_end(p);
46 if (used < 0)
47 return;
48
49# if ENABLE_FEATURE_SYSLOG
50 if (logmode & LOGMODE_SYSLOG)
51 syslog(LOG_INFO, "%s", msg);
52# endif
53 if (logmode & LOGMODE_STDIO) {
54 fflush_all();
55 /* used = strlen(msg); - must be true already */
56 msg[used++] = '\n';
57 full_write(STDOUT_FILENO, msg, used);
58 }
59
60 free(msg);
61#endif
62}