More removal of "#if 0" content.

diff --git a/archival/dpkg.c b/archival/dpkg.c
index 32e5125..6ca59ac 100644 (file)
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1021,15 +1021,6 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                        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 :-)

diff --git a/archival/gunzip.c b/archival/gunzip.c
index 35449b0..ebbce41 100644 (file)
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -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>

diff --git a/archival/gzip.c b/archival/gzip.c
index aebe90e..486f78f 100644 (file)
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -144,15 +144,6 @@ typedef int file_t;                /* Do not use stdio */
 #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 */
 

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index ded1b6a..2421cad 100644 (file)
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -127,11 +127,6 @@ do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
        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");
        }
 }

diff --git a/coreutils/diff.c b/coreutils/diff.c
index 786e2a8..368efd3 100644 (file)
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -720,23 +720,6 @@ static void dump_unified_vec(FILE * f1, FILE * f2)
                        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 @@ static void dump_unified_vec(FILE * f1, FILE * f2)
                        fetch(ixnew, lowc, c - 1, f2, ' ');
                if (ch == 'c' || ch == 'a')
                        fetch(ixnew, c, d, f2, '+');
-#endif
                lowa = b + 1;
                lowc = d + 1;
        }

diff --git a/init/init.c b/init/init.c
index b3d1f6d..877b081 100644 (file)
--- a/init/init.c
+++ b/init/init.c
@@ -312,15 +312,6 @@ static void console_init(void)
 
        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 @@ static void new_init_action(int action, const char *command, const char *cons)
        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);
 }

diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 0051edb..d9e5451 100644 (file)
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -133,9 +133,6 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
 
        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) {

diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index 05b83d6..a09b5a6 100644 (file)
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -988,19 +988,6 @@ int __parsespent(void *data, char * line)
                                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) {