aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/ext2fs
diff options
context:
space:
mode:
author"Robert P. J. Day" <rpjday@mindspring.com>2006-07-01 15:09:17 +0000
committer"Robert P. J. Day" <rpjday@mindspring.com>2006-07-01 15:09:17 +0000
commit7ccb65f3a4f5c84d010978d450df57d3c1b13297 (patch)
tree1a8ad50d798ce0a176c20b817d53ffaead21b14c /e2fsprogs/ext2fs
parentd35ef0f66643f2bc43bd7070df0356e0b064b755 (diff)
downloadbusybox-w32-7ccb65f3a4f5c84d010978d450df57d3c1b13297.tar.gz
busybox-w32-7ccb65f3a4f5c84d010978d450df57d3c1b13297.tar.bz2
busybox-w32-7ccb65f3a4f5c84d010978d450df57d3c1b13297.zip
Yet more "#if 0" content removed.
Diffstat (limited to 'e2fsprogs/ext2fs')
-rw-r--r--e2fsprogs/ext2fs/closefs.c4
-rw-r--r--e2fsprogs/ext2fs/icount.c14
-rw-r--r--e2fsprogs/ext2fs/inode.c21
3 files changed, 0 insertions, 39 deletions
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,
151 if (old_super[check_idx] == new_super[check_idx]) 151 if (old_super[check_idx] == new_super[check_idx])
152 break; 152 break;
153 size = 2 * (check_idx - write_idx); 153 size = 2 * (check_idx - write_idx);
154#if 0
155 printf("Writing %d bytes starting at %d\n",
156 size, write_idx*2);
157#endif
158 retval = io_channel_write_byte(fs->io, 154 retval = io_channel_write_byte(fs->io,
159 SUPERBLOCK_OFFSET + (2 * write_idx), size, 155 SUPERBLOCK_OFFSET + (2 * write_idx), size,
160 new_super + write_idx); 156 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,
112 } 112 }
113 113
114 bytes = (size_t) (icount->size * sizeof(struct ext2_icount_el)); 114 bytes = (size_t) (icount->size * sizeof(struct ext2_icount_el));
115#if 0
116 printf("Icount allocated %d entries, %d bytes.\n",
117 icount->size, bytes);
118#endif
119 retval = ext2fs_get_mem(bytes, &icount->list); 115 retval = ext2fs_get_mem(bytes, &icount->list);
120 if (retval) 116 if (retval)
121 goto errout; 117 goto errout;
@@ -172,9 +168,6 @@ static struct ext2_icount_el *insert_icount_el(ext2_icount_t icount,
172 } 168 }
173 if (new_size < (icount->size + 100)) 169 if (new_size < (icount->size + 100))
174 new_size = icount->size + 100; 170 new_size = icount->size + 100;
175#if 0
176 printf("Reallocating icount %d entries...\n", new_size);
177#endif
178 retval = ext2fs_resize_mem((size_t) icount->size * 171 retval = ext2fs_resize_mem((size_t) icount->size *
179 sizeof(struct ext2_icount_el), 172 sizeof(struct ext2_icount_el),
180 (size_t) new_size * 173 (size_t) new_size *
@@ -224,15 +217,9 @@ static struct ext2_icount_el *get_icount_el(ext2_icount_t icount,
224 icount->cursor = 0; 217 icount->cursor = 0;
225 if (ino == icount->list[icount->cursor].ino) 218 if (ino == icount->list[icount->cursor].ino)
226 return &icount->list[icount->cursor++]; 219 return &icount->list[icount->cursor++];
227#if 0
228 printf("Non-cursor get_icount_el: %u\n", ino);
229#endif
230 low = 0; 220 low = 0;
231 high = (int) icount->count-1; 221 high = (int) icount->count-1;
232 while (low <= high) { 222 while (low <= high) {
233#if 0
234 mid = (low+high)/2;
235#else
236 if (low == high) 223 if (low == high)
237 mid = low; 224 mid = low;
238 else { 225 else {
@@ -249,7 +236,6 @@ static struct ext2_icount_el *get_icount_el(ext2_icount_t icount,
249 (highval - lowval); 236 (highval - lowval);
250 mid = low + ((int) (range * (high-low))); 237 mid = low + ((int) (range * (high-low)));
251 } 238 }
252#endif
253 if (ino == icount->list[mid].ino) { 239 if (ino == icount->list[mid].ino) {
254 icount->cursor = mid+1; 240 icount->cursor = mid+1;
255 return &icount->list[mid]; 241 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)
355 return 0; 355 return 0;
356} 356}
357 357
358#if 0
359/*
360 * Returns 1 if the entire inode_buffer has a non-zero size and
361 * contains all zeros. (Not just deleted inodes, since that means
362 * that part of the inode table was used at one point; we want all
363 * zeros, which means that the inode table is pristine.)
364 */
365static inline int is_empty_scan(ext2_inode_scan scan)
366{
367 int i;
368
369 if (scan->bytes_left == 0)
370 return 0;
371
372 for (i=0; i < scan->bytes_left; i++)
373 if (scan->ptr[i])
374 return 0;
375 return 1;
376}
377#endif
378
379errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino, 358errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
380 struct ext2_inode *inode, int bufsize) 359 struct ext2_inode *inode, int bufsize)
381{ 360{