From 7ccb65f3a4f5c84d010978d450df57d3c1b13297 Mon Sep 17 00:00:00 2001
From: "\"Robert P. J. Day\"" <rpjday@mindspring.com>
Date: Sat, 1 Jul 2006 15:09:17 +0000
Subject: [PATCH] Yet more "#if 0" content removed.

---
 e2fsprogs/blkid/read.c     | 25 -------------------------
 e2fsprogs/ext2fs/closefs.c |  4 ----
 e2fsprogs/ext2fs/icount.c  | 14 --------------
 e2fsprogs/ext2fs/inode.c   | 21 ---------------------
 e2fsprogs/fsck.c           |  9 ---------
 e2fsprogs/mke2fs.c         |  3 ---
 e2fsprogs/util.c           |  7 -------
 scripts/objsizes           |  3 +--
 8 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c
index 5f7422b0c..a2a8bb59e 100644
--- a/e2fsprogs/blkid/read.c
+++ b/e2fsprogs/blkid/read.c
@@ -98,31 +98,6 @@ static char *strip_line(char *line)
 	return line;
 }
 
-#if 0
-static char *parse_word(char **buf)
-{
-	char *word, *next;
-
-	word = *buf;
-	if (*word == '\0')
-		return NULL;
-
-	word = skip_over_blank(word);
-	next = skip_over_word(word);
-	if (*next) {
-		char *end = next - 1;
-		if (*end == '"' || *end == '\'')
-			*end = '\0';
-		*next++ = '\0';
-	}
-	*buf = next;
-
-	if (*word == '"' || *word == '\'')
-		word++;
-	return word;
-}
-#endif
-
 /*
  * Start parsing a new line from the cache.
  *
diff --git a/e2fsprogs/ext2fs/closefs.c b/e2fsprogs/ext2fs/closefs.c
index 481d1c575..40a697496 100644
--- a/e2fsprogs/ext2fs/closefs.c
+++ b/e2fsprogs/ext2fs/closefs.c
@@ -151,10 +151,6 @@ static errcode_t write_primary_superblock(ext2_filsys fs,
 			if (old_super[check_idx] == new_super[check_idx])
 				break;
 		size = 2 * (check_idx - write_idx);
-#if 0
-		printf("Writing %d bytes starting at %d\n",
-		       size, write_idx*2);
-#endif
 		retval = io_channel_write_byte(fs->io,
 			       SUPERBLOCK_OFFSET + (2 * write_idx), size,
 					       new_super + write_idx);
diff --git a/e2fsprogs/ext2fs/icount.c b/e2fsprogs/ext2fs/icount.c
index 7ae2a5c0f..7d0d63c91 100644
--- a/e2fsprogs/ext2fs/icount.c
+++ b/e2fsprogs/ext2fs/icount.c
@@ -112,10 +112,6 @@ errcode_t ext2fs_create_icount2(ext2_filsys fs, int flags, unsigned int size,
 	}
 
 	bytes = (size_t) (icount->size * sizeof(struct ext2_icount_el));
-#if 0
-	printf("Icount allocated %d entries, %d bytes.\n",
-	       icount->size, bytes);
-#endif
 	retval = ext2fs_get_mem(bytes, &icount->list);
 	if (retval)
 		goto errout;
@@ -172,9 +168,6 @@ static struct ext2_icount_el *insert_icount_el(ext2_icount_t icount,
 		}
 		if (new_size < (icount->size + 100))
 			new_size = icount->size + 100;
-#if 0
-		printf("Reallocating icount %d entries...\n", new_size);
-#endif
 		retval = ext2fs_resize_mem((size_t) icount->size *
 					   sizeof(struct ext2_icount_el),
 					   (size_t) new_size *
@@ -224,15 +217,9 @@ static struct ext2_icount_el *get_icount_el(ext2_icount_t icount,
 		icount->cursor = 0;
 	if (ino == icount->list[icount->cursor].ino)
 		return &icount->list[icount->cursor++];
-#if 0
-	printf("Non-cursor get_icount_el: %u\n", ino);
-#endif
 	low = 0;
 	high = (int) icount->count-1;
 	while (low <= high) {
-#if 0
-		mid = (low+high)/2;
-#else
 		if (low == high)
 			mid = low;
 		else {
@@ -249,7 +236,6 @@ static struct ext2_icount_el *get_icount_el(ext2_icount_t icount,
 					(highval - lowval);
 			mid = low + ((int) (range * (high-low)));
 		}
-#endif
 		if (ino == icount->list[mid].ino) {
 			icount->cursor = mid+1;
 			return &icount->list[mid];
diff --git a/e2fsprogs/ext2fs/inode.c b/e2fsprogs/ext2fs/inode.c
index 8608dc88b..88da4e02e 100644
--- a/e2fsprogs/ext2fs/inode.c
+++ b/e2fsprogs/ext2fs/inode.c
@@ -355,27 +355,6 @@ static errcode_t get_next_blocks(ext2_inode_scan scan)
 	return 0;
 }
 
-#if 0
-/*
- * Returns 1 if the entire inode_buffer has a non-zero size and
- * contains all zeros.  (Not just deleted inodes, since that means
- * that part of the inode table was used at one point; we want all
- * zeros, which means that the inode table is pristine.)
- */
-static inline int is_empty_scan(ext2_inode_scan scan)
-{
-	int	i;
-
-	if (scan->bytes_left == 0)
-		return 0;
-
-	for (i=0; i < scan->bytes_left; i++)
-		if (scan->ptr[i])
-			return 0;
-	return 1;
-}
-#endif
-
 errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
 				     struct ext2_inode *inode, int bufsize)
 {
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index adf34c44d..54e8597d4 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -135,12 +135,6 @@ static char *base_device(const char *device)
 		goto errout;
 	cp += 5;
 
-#if 0	/* this is for old stuff no one uses anymore ? */
-	/* Skip over /dev/dsk/... */
-	if (strncmp(cp, "dsk/", 4) == 0)
-		cp += 4;
-#endif
-
 	/*
 	 * For md devices, we treat them all as if they were all
 	 * on one disk, since we don't know how to parallelize them.
@@ -918,9 +912,6 @@ static void compile_fs_type(char *fs_type, struct fs_type_compile *cmp)
 				bb_error_msg_and_die("%s", fs_type_syntax_error);
 			}
 		}
-#if 0
-		printf("Adding %s to list (type %d).\n", s, cmp->type[num]);
-#endif
 		cmp->list[num++] = string_copy(s);
 		s = strtok(NULL, ",");
 	}
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index 0ecbd0551..22e4d2578 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -828,9 +828,6 @@ static int PRS(int argc, char *argv[])
 	param.s_rev_level = 1;  /* Create revision 1 filesystems now */
 	param.s_feature_incompat |= EXT2_FEATURE_INCOMPAT_FILETYPE;
 	param.s_feature_ro_compat |= EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
-#if 0
-	param.s_feature_compat |= EXT2_FEATURE_COMPAT_DIR_INDEX;
-#endif
 
 #ifdef __linux__
 	linux_version_code = get_linux_version_code();
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c
index 537021df7..151af3211 100644
--- a/e2fsprogs/util.c
+++ b/e2fsprogs/util.c
@@ -110,14 +110,7 @@ void parse_journal_opts(char **journal_device, int *journal_flags,
 {
 	char *buf, *token, *next, *p, *arg;
 	int journal_usage = 0;
-#if 0
-	int	len;
-	len = strlen(opts);
-	buf = xmalloc(len+1);
-	strcpy(buf, opts);
-#else
 	buf = bb_xstrdup(opts);
-#endif
 	for (token = buf; token && *token; token = next) {
 		p = strchr(token, ',');
 		next = 0;
diff --git a/scripts/objsizes b/scripts/objsizes
index 291285f03..ec9928238 100755
--- a/scripts/objsizes
+++ b/scripts/objsizes
@@ -4,5 +4,4 @@ printf "%9s %11s %9s %9s %s\n" "text+data" text+rodata rwdata bss filename
 find -name '*.o' | sed 's:^\./::' | xargs size | grep '^ *[0-9]' \
 | while read text data bss dec hex filename; do
     printf "%9d %11d %9d %9d %s\n" $((text+data)) $text $data $bss "$filename"
-done \
-| sort
+done