From f0ed376eda5d5c25d270e5100a881fb2d801bee6 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Thu, 26 Oct 2006 23:21:47 +0000
Subject: remove bb_printf and the like

---
 libbb/Kbuild                   | 1 -
 libbb/fflush_stdout_and_exit.c | 6 ++----
 libbb/getopt32.c               | 2 +-
 libbb/xfuncs.c                 | 6 +++---
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'libbb')

diff --git a/libbb/Kbuild b/libbb/Kbuild
index 3b16f5c45..0dd8c2be4 100644
--- a/libbb/Kbuild
+++ b/libbb/Kbuild
@@ -54,7 +54,6 @@ lib-$(CONFIG_DEVFSD) += xregcomp.o
 
 lib-y += messages.o
 lib-y += xfuncs.o
-lib-y += printf.o
 lib-y += xatol.o
 lib-y += safe_strtol.o
 lib-y += bb_pwd.o
diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c
index 6df8dde13..456ce9513 100644
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -11,11 +11,9 @@
  * in an error state.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <libbb.h>
+#include "libbb.h"
 
-void bb_fflush_stdout_and_exit(int retval)
+void fflush_stdout_and_exit(int retval)
 {
 	if (fflush(stdout)) {
 		retval = xfunc_error_retval;
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 967729a1b..f442933a3 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -143,7 +143,7 @@ const char *opt_complementary
         	while (my_b) { dosomething_with(my_b->data); my_b = my_b->link; }
         if (my_b)        // but llist is stored if -b is specified
         	free_llist(my_b);
-        if (verbose_level) bb_printf("verbose level is %d\n", verbose_level);
+        if (verbose_level) printf("verbose level is %d\n", verbose_level);
 
 Special characters:
 
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 0a6d90de5..c5e18c312 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -130,7 +130,7 @@ off_t xlseek(int fd, off_t offset, int whence)
 }
 
 // Die with supplied error message if this FILE * has ferror set.
-void xferror(FILE *fp, const char *fn)
+void die_if_ferror(FILE *fp, const char *fn)
 {
 	if (ferror(fp)) {
 		bb_error_msg_and_die("%s", fn);
@@ -138,9 +138,9 @@ void xferror(FILE *fp, const char *fn)
 }
 
 // Die with an error message if stdout has ferror set.
-void xferror_stdout(void)
+void die_if_ferror_stdout(void)
 {
-	xferror(stdout, bb_msg_standard_output);
+	die_if_ferror(stdout, bb_msg_standard_output);
 }
 
 // Die with an error message if we have trouble flushing stdout.
-- 
cgit v1.2.3