aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpjday <rpjday@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-01 14:52:12 +0000
committerrpjday <rpjday@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-01 14:52:12 +0000
commitb6a3fd07ec903f1b8a2221de3be5d767b5599342 (patch)
treed88d2f2f16e9bbb8bf03943d4d1e9dd4c717b24e
parent71fd5a388bd24a8125f3f1ebf61a7ae7986b26c4 (diff)
downloadbusybox-w32-b6a3fd07ec903f1b8a2221de3be5d767b5599342.tar.gz
busybox-w32-b6a3fd07ec903f1b8a2221de3be5d767b5599342.tar.bz2
busybox-w32-b6a3fd07ec903f1b8a2221de3be5d767b5599342.zip
More removal of "#if 0" content.
git-svn-id: svn://busybox.net/trunk/busybox@15571 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--archival/dpkg.c9
-rw-r--r--archival/gunzip.c20
-rw-r--r--archival/gzip.c9
-rw-r--r--console-tools/loadfont.c5
-rw-r--r--coreutils/diff.c18
-rw-r--r--init/init.c12
-rw-r--r--libbb/inet_common.c3
-rw-r--r--libpwdgrp/pwd_grp.c13
8 files changed, 0 insertions, 89 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 32e51257e..6ca59ac91 100644
--- 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)
1021 continue; 1021 continue;
1022 } 1022 }
1023 1023
1024#if 0
1025 /* This might be needed so we don't complain about
1026 * things which are broken but unrelated to the
1027 * packages that are currently being installed
1028 */
1029 if (state_status == search_name_hashtable("installed"))
1030 continue;
1031#endif
1032
1033 /* This code is tested only for EDGE_DEPENDS, since I 1024 /* This code is tested only for EDGE_DEPENDS, since I
1034 * have no suitable pre-depends available. There is no 1025 * have no suitable pre-depends available. There is no
1035 * reason that it shouldn't work though :-) 1026 * reason that it shouldn't work though :-)
diff --git a/archival/gunzip.c b/archival/gunzip.c
index 35449b04d..ebbce4112 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -40,26 +40,6 @@
40 * See the file algorithm.doc for the compression algorithms and file formats. 40 * See the file algorithm.doc for the compression algorithms and file formats.
41 */ 41 */
42 42
43#if 0
44static char *license_msg[] = {
45 " Copyright (C) 1992-1993 Jean-loup Gailly",
46 " This program is free software; you can redistribute it and/or modify",
47 " it under the terms of the GNU General Public License as published by",
48 " the Free Software Foundation; either version 2, or (at your option)",
49 " any later version.",
50 "",
51 " This program is distributed in the hope that it will be useful,",
52 " but WITHOUT ANY WARRANTY; without even the implied warranty of",
53 " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the",
54 " GNU General Public License for more details.",
55 "",
56 " You should have received a copy of the GNU General Public License",
57 " along with this program; if not, write to the Free Software",
58 " Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.",
59 0
60};
61#endif
62
63#include <stdlib.h> 43#include <stdlib.h>
64#include <string.h> 44#include <string.h>
65#include <unistd.h> 45#include <unistd.h>
diff --git a/archival/gzip.c b/archival/gzip.c
index aebe90ea6..486f78f88 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -144,15 +144,6 @@ typedef int file_t; /* Do not use stdio */
144#define put_byte(c) {outbuf[outcnt++]=(uch)(c); if (outcnt==OUTBUFSIZ)\ 144#define put_byte(c) {outbuf[outcnt++]=(uch)(c); if (outcnt==OUTBUFSIZ)\
145 flush_outbuf();} 145 flush_outbuf();}
146 146
147
148/* Output a 32 bit value to the bit stream, lsb first */
149#if 0
150#define put_long(n) { \
151 put_short((n) & 0xffff); \
152 put_short(((ulg)(n)) >> 16); \
153}
154#endif
155
156#define seekable() 0 /* force sequential output */ 147#define seekable() 0 /* force sequential output */
157#define translate_eol 0 /* no option -a yet */ 148#define translate_eol 0 /* no option -a yet */
158 149
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index ded1b6a95..2421cadcf 100644
--- 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)
127 ud.entry_ct = ct; 127 ud.entry_ct = ct;
128 ud.entries = up; 128 ud.entries = up;
129 if (ioctl(fd, PIO_UNIMAP, &ud)) { 129 if (ioctl(fd, PIO_UNIMAP, &ud)) {
130#if 0
131 if (errno == ENOMEM) {
132 /* change advice parameters */
133 }
134#endif
135 bb_perror_msg_and_die("PIO_UNIMAP"); 130 bb_perror_msg_and_die("PIO_UNIMAP");
136 } 131 }
137} 132}
diff --git a/coreutils/diff.c b/coreutils/diff.c
index 786e2a8ab..368efd383 100644
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -720,23 +720,6 @@ static void dump_unified_vec(FILE * f1, FILE * f2)
720 ch = 'c'; 720 ch = 'c';
721 else 721 else
722 ch = (a <= b) ? 'd' : 'a'; 722 ch = (a <= b) ? 'd' : 'a';
723#if 0
724 switch (ch) {
725 case 'c':
726 fetch(ixold, lowa, a - 1, f1, ' ');
727 fetch(ixold, a, b, f1, '-');
728 fetch(ixnew, c, d, f2, '+');
729 break;
730 case 'd':
731 fetch(ixold, lowa, a - 1, f1, ' ');
732 fetch(ixold, a, b, f1, '-');
733 break;
734 case 'a':
735 fetch(ixnew, lowc, c - 1, f2, ' ');
736 fetch(ixnew, c, d, f2, '+');
737 break;
738 }
739#else
740 if (ch == 'c' || ch == 'd') { 723 if (ch == 'c' || ch == 'd') {
741 fetch(ixold, lowa, a - 1, f1, ' '); 724 fetch(ixold, lowa, a - 1, f1, ' ');
742 fetch(ixold, a, b, f1, '-'); 725 fetch(ixold, a, b, f1, '-');
@@ -745,7 +728,6 @@ static void dump_unified_vec(FILE * f1, FILE * f2)
745 fetch(ixnew, lowc, c - 1, f2, ' '); 728 fetch(ixnew, lowc, c - 1, f2, ' ');
746 if (ch == 'c' || ch == 'a') 729 if (ch == 'c' || ch == 'a')
747 fetch(ixnew, c, d, f2, '+'); 730 fetch(ixnew, c, d, f2, '+');
748#endif
749 lowa = b + 1; 731 lowa = b + 1;
750 lowc = d + 1; 732 lowc = d + 1;
751 } 733 }
diff --git a/init/init.c b/init/init.c
index b3d1f6d36..877b08122 100644
--- a/init/init.c
+++ b/init/init.c
@@ -312,15 +312,6 @@ static void console_init(void)
312 312
313 if ((s = getenv("CONSOLE")) != NULL || (s = getenv("console")) != NULL) { 313 if ((s = getenv("CONSOLE")) != NULL || (s = getenv("console")) != NULL) {
314 safe_strncpy(console, s, sizeof(console)); 314 safe_strncpy(console, s, sizeof(console));
315#if 0 /* #cpu(sparc) */
316 /* sparc kernel supports console=tty[ab] parameter which is also
317 * passed to init, so catch it here */
318 /* remap tty[ab] to /dev/ttyS[01] */
319 if (strcmp(s, "ttya") == 0)
320 safe_strncpy(console, SC_0, sizeof(console));
321 else if (strcmp(s, "ttyb") == 0)
322 safe_strncpy(console, SC_1, sizeof(console));
323#endif
324 } else { 315 } else {
325 /* 2.2 kernels: identify the real console backend and try to use it */ 316 /* 2.2 kernels: identify the real console backend and try to use it */
326 if (ioctl(0, TIOCGSERIAL, &sr) == 0) { 317 if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
@@ -842,9 +833,6 @@ static void new_init_action(int action, const char *command, const char *cons)
842 strcpy(new_action->command, command); 833 strcpy(new_action->command, command);
843 new_action->action = action; 834 new_action->action = action;
844 strcpy(new_action->terminal, cons); 835 strcpy(new_action->terminal, cons);
845#if 0 /* calloc zeroed always */
846 new_action->pid = 0;
847#endif
848 messageD(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n", 836 messageD(LOG|CONSOLE, "command='%s' action='%d' terminal='%s'\n",
849 new_action->command, new_action->action, new_action->terminal); 837 new_action->command, new_action->action, new_action->terminal);
850} 838}
diff --git a/libbb/inet_common.c b/libbb/inet_common.c
index 0051edbdc..d9e545148 100644
--- 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,
133 133
134 if ((ad & (~netmask)) != 0 || (numeric & 0x4000)) 134 if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
135 host = 1; 135 host = 1;
136#if 0
137 INET_nn = NULL;
138#endif
139 pn = INET_nn; 136 pn = INET_nn;
140 while (pn != NULL) { 137 while (pn != NULL) {
141 if (pn->addr.sin_addr.s_addr == ad && pn->host == host) { 138 if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index 05b83d66d..a09b5a6c0 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -988,19 +988,6 @@ int __parsespent(void *data, char * line)
988 break; 988 break;
989 } 989 }
990 } else { 990 } else {
991#if 0
992 if (i==5) { /* Support for old format. */
993 while (isspace(*line)) ++line; /* glibc eats space here. */
994 if (!*line) {
995 ((struct spwd *) data)->sp_warn = -1;
996 ((struct spwd *) data)->sp_inact = -1;
997 ((struct spwd *) data)->sp_expire = -1;
998 ((struct spwd *) data)->sp_flag = ~0UL;
999 return 0;
1000 }
1001 }
1002#endif
1003
1004 *((long *) p) = (long) strtoul(line, &endptr, 10); 991 *((long *) p) = (long) strtoul(line, &endptr, 10);
1005 992
1006 if (endptr == line) { 993 if (endptr == line) {