From 729ecb87bfbbaf9250837d8b8748503c5e97bfd6 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 7 Jun 2010 14:14:26 +0200
Subject: bbconfig: make it independent from printf functions
function old new delta
full_write2_str - 25 +25
full_write1_str - 25 +25
clear_main 21 20 -1
telnet_main 1488 1477 -11
getty_main 1932 1918 -14
full_write22_str 25 - -25
------------------------------------------------------------------------------
(add/remove: 2/1 grow/shrink: 0/3 up/down: 50/-51) Total: -1 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
libbb/appletlib.c | 7 -------
libbb/xfuncs.c | 10 ++++++++++
2 files changed, 10 insertions(+), 7 deletions(-)
(limited to 'libbb')
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 6267f2673..f3d530184 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -98,13 +98,6 @@ static const char *unpack_usage_messages(void)
#endif /* FEATURE_COMPRESS_USAGE */
-static void full_write2_str(const char *str)
-{
- // This uses stdio:
- //xwrite_str(STDERR_FILENO, str);
- write(STDERR_FILENO, str, strlen(str));
-}
-
void FAST_FUNC bb_show_usage(void)
{
if (ENABLE_SHOW_USAGE) {
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 6200fc600..1cd8d7c01 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -204,6 +204,16 @@ int FAST_FUNC bb_putchar_stderr(char ch)
return write(STDERR_FILENO, &ch, 1);
}
+ssize_t FAST_FUNC full_write1_str(const char *str)
+{
+ return full_write(STDOUT_FILENO, str, strlen(str));
+}
+
+ssize_t FAST_FUNC full_write2_str(const char *str)
+{
+ return full_write(STDERR_FILENO, str, strlen(str));
+}
+
static int wh_helper(int value, int def_val, const char *env_name, int *err)
{
if (value == 0) {
--
cgit v1.2.3