svn commit: trunk/busybox: archival console-tools coreutils init li etc...

rpjday at busybox.net rpjday at busybox.net
Sat Jul 1 14:52:16 UTC 2006


Author: rpjday
Date: 2006-07-01 07:52:12 -0700 (Sat, 01 Jul 2006)
New Revision: 15571

Log:
More removal of "#if 0" content.


Modified:
   trunk/busybox/archival/dpkg.c
   trunk/busybox/archival/gunzip.c
   trunk/busybox/archival/gzip.c
   trunk/busybox/console-tools/loadfont.c
   trunk/busybox/coreutils/diff.c
   trunk/busybox/init/init.c
   trunk/busybox/libbb/inet_common.c
   trunk/busybox/libpwdgrp/pwd_grp.c


Changeset:
Modified: trunk/busybox/archival/dpkg.c
===================================================================
--- trunk/busybox/archival/dpkg.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/archival/dpkg.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -1021,15 +1021,6 @@
 			continue;
 		}
 
-#if 0
-		/* This might be needed so we don't complain about
-		 * things which are broken but unrelated to the
-		 * packages that are currently being installed
-		 */
-		if (state_status == search_name_hashtable("installed"))
-			continue;
-#endif
-
 		/* This code is tested only for EDGE_DEPENDS, since I
 		 * have no suitable pre-depends available. There is no
 		 * reason that it shouldn't work though :-)

Modified: trunk/busybox/archival/gunzip.c
===================================================================
--- trunk/busybox/archival/gunzip.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/archival/gunzip.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -40,26 +40,6 @@
  * See the file algorithm.doc for the compression algorithms and file formats.
  */
 
-#if 0
-static char *license_msg[] = {
-	"   Copyright (C) 1992-1993 Jean-loup Gailly",
-	"   This program is free software; you can redistribute it and/or modify",
-	"   it under the terms of the GNU General Public License as published by",
-	"   the Free Software Foundation; either version 2, or (at your option)",
-	"   any later version.",
-	"",
-	"   This program is distributed in the hope that it will be useful,",
-	"   but WITHOUT ANY WARRANTY; without even the implied warranty of",
-	"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
-	"   GNU General Public License for more details.",
-	"",
-	"   You should have received a copy of the GNU General Public License",
-	"   along with this program; if not, write to the Free Software",
-	"   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.",
-	0
-};
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

Modified: trunk/busybox/archival/gzip.c
===================================================================
--- trunk/busybox/archival/gzip.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/archival/gzip.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -144,15 +144,6 @@
 #define put_byte(c) {outbuf[outcnt++]=(uch)(c); if (outcnt==OUTBUFSIZ)\
    flush_outbuf();}
 
-
-/* Output a 32 bit value to the bit stream, lsb first */
-#if 0
-#define put_long(n) { \
-    put_short((n) & 0xffff); \
-    put_short(((ulg)(n)) >> 16); \
-}
-#endif
-
 #define seekable()    0	/* force sequential output */
 #define translate_eol 0	/* no option -a yet */
 

Modified: trunk/busybox/console-tools/loadfont.c
===================================================================
--- trunk/busybox/console-tools/loadfont.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/console-tools/loadfont.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -127,11 +127,6 @@
 	ud.entry_ct = ct;
 	ud.entries = up;
 	if (ioctl(fd, PIO_UNIMAP, &ud)) {
-#if 0
-		if (errno == ENOMEM) {
-			/* change advice parameters */
-		}
-#endif
 		bb_perror_msg_and_die("PIO_UNIMAP");
 	}
 }

Modified: trunk/busybox/coreutils/diff.c
===================================================================
--- trunk/busybox/coreutils/diff.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/coreutils/diff.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -720,23 +720,6 @@
 			ch = 'c';
 		else
 			ch = (a <= b) ? 'd' : 'a';
-#if 0
-		switch (ch) {
-		case 'c':
-			fetch(ixold, lowa, a - 1, f1, ' ');
-			fetch(ixold, a, b, f1, '-');
-			fetch(ixnew, c, d, f2, '+');
-			break;
-		case 'd':
-			fetch(ixold, lowa, a - 1, f1, ' ');
-			fetch(ixold, a, b, f1, '-');
-			break;
-		case 'a':
-			fetch(ixnew, lowc, c - 1, f2, ' ');
-			fetch(ixnew, c, d, f2, '+');
-			break;
-		}
-#else
 		if (ch == 'c' || ch == 'd') {
 			fetch(ixold, lowa, a - 1, f1, ' ');
 			fetch(ixold, a, b, f1, '-');
@@ -745,7 +728,6 @@
 			fetch(ixnew, lowc, c - 1, f2, ' ');
 		if (ch == 'c' || ch == 'a')
 			fetch(ixnew, c, d, f2, '+');
-#endif
 		lowa = b + 1;
 		lowc = d + 1;
 	}

Modified: trunk/busybox/init/init.c
===================================================================
--- trunk/busybox/init/init.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/init/init.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -312,15 +312,6 @@
 
 	if ((s = getenv("CONSOLE")) != NULL || (s = getenv("console")) != NULL) {
 		safe_strncpy(console, s, sizeof(console));
-#if 0 /* #cpu(sparc) */
-	/* sparc kernel supports console=tty[ab] parameter which is also
-	 * passed to init, so catch it here */
-		/* remap tty[ab] to /dev/ttyS[01] */
-		if (strcmp(s, "ttya") == 0)
-			safe_strncpy(console, SC_0, sizeof(console));
-		else if (strcmp(s, "ttyb") == 0)
-			safe_strncpy(console, SC_1, sizeof(console));
-#endif
 	} else {
 		/* 2.2 kernels: identify the real console backend and try to use it */
 		if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
@@ -842,9 +833,6 @@
 	strcpy(new_action->command, command);
 	new_action->action = action;
 	strcpy(new_action->terminal, cons);
-#if 0   /* calloc zeroed always */
-	new_action->pid = 0;
-#endif
 	messageD(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
 		new_action->command, new_action->action, new_action->terminal);
 }

Modified: trunk/busybox/libbb/inet_common.c
===================================================================
--- trunk/busybox/libbb/inet_common.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/libbb/inet_common.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -133,9 +133,6 @@
 
 	if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
 		host = 1;
-#if 0
-	INET_nn = NULL;
-#endif
 	pn = INET_nn;
 	while (pn != NULL) {
 		if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {

Modified: trunk/busybox/libpwdgrp/pwd_grp.c
===================================================================
--- trunk/busybox/libpwdgrp/pwd_grp.c	2006-07-01 14:34:33 UTC (rev 15570)
+++ trunk/busybox/libpwdgrp/pwd_grp.c	2006-07-01 14:52:12 UTC (rev 15571)
@@ -988,19 +988,6 @@
 				break;
 			}
 		} else {
-#if 0
-			if (i==5) {			/* Support for old format. */
-				while (isspace(*line)) ++line; /* glibc eats space here. */
-				if (!*line) {
-					((struct spwd *) data)->sp_warn = -1;
-					((struct spwd *) data)->sp_inact = -1;
-					((struct spwd *) data)->sp_expire = -1;
-					((struct spwd *) data)->sp_flag = ~0UL;
-					return 0;
-				}
-			}
-#endif
-
 			*((long *) p) = (long) strtoul(line, &endptr, 10);
 
 			if (endptr == line) {




More information about the busybox-cvs mailing list