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.)

1 files changed, 1 insertions, 6 deletions

diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 6aae150..3ae8458 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -6,11 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include <sys/types.h>
-#include <netinet/in.h> /* For ntohl & htonl function */
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
 #include "busybox.h"
 #include "unarchive.h"
 
@@ -63,7 +58,7 @@ int rpm2cpio_main(int argc, char **argv)
 	if (argc == 1) {
 		rpm_fd = STDIN_FILENO;
 	} else {
-		rpm_fd = bb_xopen(argv[1], O_RDONLY);
+		rpm_fd = xopen(argv[1], O_RDONLY);
 	}
 
 	xread(rpm_fd, &lead, sizeof(struct rpm_lead));