From d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 3 Aug 2006 15:41:12 +0000 Subject: Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.) --- coreutils/cmp.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'coreutils/cmp.c') diff --git a/coreutils/cmp.c b/coreutils/cmp.c index 016158b..a569eb3 100644 --- a/coreutils/cmp.c +++ b/coreutils/cmp.c @@ -21,9 +21,6 @@ * in the '-l' case. */ -#include -#include -#include #include "busybox.h" static FILE *cmp_xfopen_input(const char *filename) @@ -105,12 +102,12 @@ int cmp_main(int argc, char **argv) c1 = c2; } if (c1 == EOF) { - bb_xferror(fp1, filename1); + xferror(fp1, filename1); fmt = fmt_eof; /* Well, no error, so it must really be EOF. */ outfile = stderr; /* There may have been output to stdout (option -l), so * make sure we fflush before writing to stderr. */ - bb_xfflush_stdout(); + xfflush_stdout(); } if (opt_flags != OPT_s) { if (opt_flags == OPT_l) { @@ -129,8 +126,8 @@ int cmp_main(int argc, char **argv) } } while (c1 != EOF); - bb_xferror(fp1, filename1); - bb_xferror(fp2, filename2); + xferror(fp1, filename1); + xferror(fp2, filename2); bb_fflush_stdout_and_exit(exit_val); } -- cgit v1.1