Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/util-linux/mkfs_ext2.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/util-linux/mkfs_ext2.c (modified) (5 diffs)

branches/3.3/mindi-busybox/util-linux/mkfs_ext2.c

@@ -117 +117 @@
     uint32_t i;
 
-//bb_info_msg("ALLOC: [%u][%u][%u]: [%u-%u]:=[%x],[%x]", blocksize, start, end, start/8, blocksize - end/8 - 1, (1 << (start & 7)) - 1, (uint8_t)(0xFF00 >> (end & 7)));
+//bb_error_msg("ALLOC: [%u][%u][%u]: [%u-%u]:=[%x],[%x]", blocksize, start, end, start/8, blocksize - end/8 - 1, (1 << (start & 7)) - 1, (uint8_t)(0xFF00 >> (end & 7)));
     memset(bitmap, 0, blocksize);
     i = start / 8;
@@ -152 +152 @@
 static void PUT(uint64_t off, void *buf, uint32_t size)
 {
-//  bb_info_msg("PUT[%llu]:[%u]", off, size);
+    //bb_error_msg("PUT[%llu]:[%u]", off, size);
     xlseek(fd, off, SEEK_SET);
     xwrite(fd, buf, size);
@@ -413 +413 @@
         // transition (at 16M).
         if (remainder && (remainder < overhead + 50)) {
-//bb_info_msg("CHOP[%u]", remainder);
+//bb_error_msg("CHOP[%u]", remainder);
             nblocks -= remainder;
             goto retry;
@@ -569 +569 @@
 
         // mark preallocated blocks as allocated
-//bb_info_msg("ALLOC: [%u][%u][%u]", blocksize, overhead, blocks_per_group - (free_blocks + overhead));
+//bb_error_msg("ALLOC: [%u][%u][%u]", blocksize, overhead, blocks_per_group - (free_blocks + overhead));
         allocate(buf, blocksize,
             // reserve "overhead" blocks
@@ -648 +648 @@
     for (i = 0; i < lost_and_found_blocks; ++i)
         STORE_LE(inode->i_block[i], i + n); // use next block
-//bb_info_msg("LAST BLOCK USED[%u]", i + n);
+//bb_error_msg("LAST BLOCK USED[%u]", i + n);
     PUT(((uint64_t)FETCH_LE32(gd[0].bg_inode_table) * blocksize) + (EXT2_GOOD_OLD_FIRST_INO-1) * inodesize,
                 buf, inodesize);