svn commit: trunk/busybox: e2fsprogs e2fsprogs/blkid e2fsprogs/ext2 etc...
rpjday at busybox.net
rpjday at busybox.net
Sat Jul 1 15:09:20 UTC 2006
Author: rpjday
Date: 2006-07-01 08:09:17 -0700 (Sat, 01 Jul 2006)
New Revision: 15573
Log:
Yet more "#if 0" content removed.
Modified:
trunk/busybox/e2fsprogs/blkid/read.c
trunk/busybox/e2fsprogs/ext2fs/closefs.c
trunk/busybox/e2fsprogs/ext2fs/icount.c
trunk/busybox/e2fsprogs/ext2fs/inode.c
trunk/busybox/e2fsprogs/fsck.c
trunk/busybox/e2fsprogs/mke2fs.c
trunk/busybox/e2fsprogs/util.c
trunk/busybox/scripts/objsizes
Changeset:
Modified: trunk/busybox/e2fsprogs/blkid/read.c
===================================================================
--- trunk/busybox/e2fsprogs/blkid/read.c 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/e2fsprogs/blkid/read.c 2006-07-01 15:09:17 UTC (rev 15573)
@@ -98,31 +98,6 @@
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.
*
Modified: trunk/busybox/e2fsprogs/ext2fs/closefs.c
===================================================================
--- trunk/busybox/e2fsprogs/ext2fs/closefs.c 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/e2fsprogs/ext2fs/closefs.c 2006-07-01 15:09:17 UTC (rev 15573)
@@ -151,10 +151,6 @@
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);
Modified: trunk/busybox/e2fsprogs/ext2fs/icount.c
===================================================================
--- trunk/busybox/e2fsprogs/ext2fs/icount.c 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/e2fsprogs/ext2fs/icount.c 2006-07-01 15:09:17 UTC (rev 15573)
@@ -112,10 +112,6 @@
}
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 @@
}
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 @@
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 @@
(highval - lowval);
mid = low + ((int) (range * (high-low)));
}
-#endif
if (ino == icount->list[mid].ino) {
icount->cursor = mid+1;
return &icount->list[mid];
Modified: trunk/busybox/e2fsprogs/ext2fs/inode.c
===================================================================
--- trunk/busybox/e2fsprogs/ext2fs/inode.c 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/e2fsprogs/ext2fs/inode.c 2006-07-01 15:09:17 UTC (rev 15573)
@@ -355,27 +355,6 @@
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)
{
Modified: trunk/busybox/e2fsprogs/fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/fsck.c 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/e2fsprogs/fsck.c 2006-07-01 15:09:17 UTC (rev 15573)
@@ -135,12 +135,6 @@
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 @@
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, ",");
}
Modified: trunk/busybox/e2fsprogs/mke2fs.c
===================================================================
--- trunk/busybox/e2fsprogs/mke2fs.c 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/e2fsprogs/mke2fs.c 2006-07-01 15:09:17 UTC (rev 15573)
@@ -828,9 +828,6 @@
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();
Modified: trunk/busybox/e2fsprogs/util.c
===================================================================
--- trunk/busybox/e2fsprogs/util.c 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/e2fsprogs/util.c 2006-07-01 15:09:17 UTC (rev 15573)
@@ -110,14 +110,7 @@
{
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;
Modified: trunk/busybox/scripts/objsizes
===================================================================
--- trunk/busybox/scripts/objsizes 2006-07-01 14:59:54 UTC (rev 15572)
+++ trunk/busybox/scripts/objsizes 2006-07-01 15:09:17 UTC (rev 15573)
@@ -4,5 +4,4 @@
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
More information about the busybox-cvs
mailing list