From d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
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.)
---
 miscutils/rx.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'miscutils/rx.c')

diff --git a/miscutils/rx.c b/miscutils/rx.c
index 41673b60e..4cc4913e6 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -21,18 +21,6 @@
  */
 
 #include "busybox.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <termios.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
 
 #define SOH 0x01
 #define STX 0x02
@@ -274,8 +262,8 @@ int rx_main(int argc, char **argv)
 			bb_show_usage();
 
 	fn = argv[1];
-	ttyfd = bb_xopen3(CURRENT_TTY, O_RDWR, 0);
-	filefd = bb_xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666);
+	ttyfd = xopen3(CURRENT_TTY, O_RDWR, 0);
+	filefd = xopen3(fn, O_RDWR|O_CREAT|O_TRUNC, 0666);
 
 	if (tcgetattr(ttyfd, &tty) < 0)
 			bb_error_msg_and_die("%s: tcgetattr failed: %m\n", argv[0]);
-- 
cgit v1.2.3