From d35ef0f66643f2bc43bd7070df0356e0b064b755 Mon Sep 17 00:00:00 2001
From: "\"Robert P. J. Day\"" <rpjday@mindspring.com>
Date: Sat, 1 Jul 2006 14:59:54 +0000
Subject: [PATCH] More removal of "#if 0" content.

---
 networking/arping.c   | 12 ----------
 networking/ifupdown.c |  4 ----
 networking/ip.c       | 52 -------------------------------------------
 networking/ping6.c    |  6 -----
 networking/route.c    |  4 ----
 networking/telnet.c   | 15 -------------
 6 files changed, 93 deletions(-)

diff --git a/networking/arping.c b/networking/arping.c
index e12fa508b..6cb607612 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -52,18 +52,6 @@ static int req_recv;
 
 #define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
 			   ((tv1).tv_usec-(tv2).tv_usec)/1000 )
-#if 0
-static void set_signal(int signo, void (*handler) (void))
-{
-	struct sigaction sa;
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_handler = (void (*)(int)) handler;
-	sa.sa_flags = SA_RESTART;
-	sigaction(signo, &sa, NULL);
-}
-#endif
-
 static int send_pack(int sock, struct in_addr *src_addr,
 					 struct in_addr *dst_addr, struct sockaddr_ll *ME,
 					 struct sockaddr_ll *HE)
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index ff47e60c9..8ee488364 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -43,11 +43,7 @@
 #define MAX_INTERFACE_LENGTH 10
 #endif
 
-#if 0
-#define debug_noise(fmt, args...) printf(fmt, ## args)
-#else
 #define debug_noise(fmt, args...)
-#endif
 
 /* Forward declaration */
 struct interface_defn_t;
diff --git a/networking/ip.c b/networking/ip.c
index bba70890d..d44cc0d60 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -25,58 +25,6 @@
 
 #include "busybox.h"
 
-#if 0
-int preferred_family = AF_UNSPEC;
-int oneline = 0;
-char * _SL_ = NULL;
-
-void ip_parse_common_args(int *argcp, char ***argvp)
-{
-	int argc = *argcp;
-	char **argv = *argvp;
-
-	while (argc > 1) {
-		char *opt = argv[1];
-
-		if (strcmp(opt,"--") == 0) {
-			argc--; argv++;
-			break;
-		}
-
-		if (opt[0] != '-')
-			break;
-
-		if (opt[1] == '-')
-			opt++;
-
-		if (matches(opt, "-family") == 0) {
-			argc--;
-			argv++;
-			if (strcmp(argv[1], "inet") == 0)
-				preferred_family = AF_INET;
-			else if (strcmp(argv[1], "inet6") == 0)
-				preferred_family = AF_INET6;
-			else if (strcmp(argv[1], "link") == 0)
-				preferred_family = AF_PACKET;
-			else
-				invarg(bb_msg_invalid_arg, argv[1], "-family");
-		} else if (strcmp(opt, "-4") == 0) {
-			preferred_family = AF_INET;
-		} else if (strcmp(opt, "-6") == 0) {
-			preferred_family = AF_INET6;
-		} else if (strcmp(opt, "-0") == 0) {
-			preferred_family = AF_PACKET;
-		} else if (matches(opt, "-oneline") == 0) {
-			++oneline;
-		} else {
-			bb_show_usage();
-		}
-		argc--;	argv++;
-	}
-	_SL_ = oneline ? "\\" : "\n" ;
-}
-#endif
-
 int ip_main(int argc, char **argv)
 {
 	int ret = EXIT_FAILURE;
diff --git a/networking/ping6.c b/networking/ping6.c
index c15ea5c4a..f7cb268d2 100644
--- a/networking/ping6.c
+++ b/networking/ping6.c
@@ -351,12 +351,6 @@ static void ping(const char *host)
 		struct icmp6_filter filt;
 		if (!(options & O_VERBOSE)) {
 			ICMP6_FILTER_SETBLOCKALL(&filt);
-#if 0
-			if ((options & F_FQDN) || (options & F_FQDNOLD) ||
-				(options & F_NODEADDR) || (options & F_SUPTYPES))
-				ICMP6_FILTER_SETPASS(ICMP6_NI_REPLY, &filt);
-			else
-#endif
 				ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filt);
 		} else {
 			ICMP6_FILTER_SETPASSALL(&filt);
diff --git a/networking/route.c b/networking/route.c
index 062ba8a13..d90578615 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -628,11 +628,7 @@ static void INET6_displayroutes(int noresolve)
 			snaddr6.sin6_family = AF_INET6;
 			INET6_rresolve(naddr6, sizeof(naddr6),
 						   (struct sockaddr_in6 *) &snaddr6,
-#if 0
-						   (noresolve | 0x8000) /* Default instead of *. */
-#else
 						   0x0fff /* Apparently, upstream never resolves. */
-#endif
 						   );
 
 			if (!r) {			/* 1st pass */
diff --git a/networking/telnet.c b/networking/telnet.c
index c835c7a45..59268c6de 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -34,10 +34,6 @@
 #include <netinet/in.h>
 #include "busybox.h"
 
-#if 0
-enum { DOTRACE = 1 };
-#endif
-
 #ifdef DOTRACE
 #include <arpa/inet.h> /* for inet_ntoa()... */
 #define TRACE(x, y) do { if (x) printf y; } while (0)
@@ -311,17 +307,6 @@ static void putiac2(byte wwdd, byte c)
 	putiac(c);
 }
 
-#if 0
-static void putiac1(byte c)
-{
-	if (G.iaclen + 2 > IACBUFSIZE)
-		iacflush();
-
-	putiac(IAC);
-	putiac(c);
-}
-#endif
-
 #ifdef CONFIG_FEATURE_TELNET_TTYPE
 static void putiac_subopt(byte c, char *str)
 {