diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-03-30 16:04:37 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-03-30 16:04:37 +0200 |
commit | 76b680c7a8d5a99e46ab8d9cad49aed0cfc440a7 (patch) | |
tree | 00713ce6c4e20b87ecea9777fcaa5fe5c898dd8c /util-linux | |
parent | 610c4c385b38280c7bde7a48d95ec019cbfe1ab4 (diff) | |
download | busybox-w32-76b680c7a8d5a99e46ab8d9cad49aed0cfc440a7.tar.gz busybox-w32-76b680c7a8d5a99e46ab8d9cad49aed0cfc440a7.tar.bz2 busybox-w32-76b680c7a8d5a99e46ab8d9cad49aed0cfc440a7.zip |
Use bb_error_msg instead of bb_info_msg in all commented-out debug printouts
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fbset.c | 18 | ||||
-rw-r--r-- | util-linux/mkfs_ext2.c | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index ac0082f70..09e96b763 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
@@ -248,12 +248,12 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn, | |||
248 | if (!p) | 248 | if (!p) |
249 | continue; | 249 | continue; |
250 | s = p + strlen(mode); | 250 | s = p + strlen(mode); |
251 | //bb_info_msg("CHECK[%s][%s][%d]", mode, p-1, *s); | 251 | //bb_error_msg("CHECK[%s][%s][%d]", mode, p-1, *s); |
252 | /* exact match? */ | 252 | /* exact match? */ |
253 | if (((!*s || isspace(*s)) && '"' != s[-1]) /* end-of-token */ | 253 | if (((!*s || isspace(*s)) && '"' != s[-1]) /* end-of-token */ |
254 | || ('"' == *s && '"' == p[-1]) /* ends with " but starts with " too! */ | 254 | || ('"' == *s && '"' == p[-1]) /* ends with " but starts with " too! */ |
255 | ) { | 255 | ) { |
256 | //bb_info_msg("FOUND[%s][%s][%s][%d]", token[1], p, mode, isspace(*s)); | 256 | //bb_error_msg("FOUND[%s][%s][%s][%d]", token[1], p, mode, isspace(*s)); |
257 | break; | 257 | break; |
258 | } | 258 | } |
259 | } | 259 | } |
@@ -264,9 +264,9 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn, | |||
264 | while (config_read(parser, token, 2, 1, "# \t", PARSE_NORMAL)) { | 264 | while (config_read(parser, token, 2, 1, "# \t", PARSE_NORMAL)) { |
265 | int i; | 265 | int i; |
266 | 266 | ||
267 | //bb_info_msg("???[%s][%s]", token[0], token[1]); | 267 | //bb_error_msg("???[%s][%s]", token[0], token[1]); |
268 | if (strcmp(token[0], "endmode") == 0) { | 268 | if (strcmp(token[0], "endmode") == 0) { |
269 | //bb_info_msg("OK[%s]", mode); | 269 | //bb_error_msg("OK[%s]", mode); |
270 | return 1; | 270 | return 1; |
271 | } | 271 | } |
272 | p = token[1]; | 272 | p = token[1]; |
@@ -294,7 +294,7 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn, | |||
294 | base->yres_virtual = base_yres_virtual; | 294 | base->yres_virtual = base_yres_virtual; |
295 | base->bits_per_pixel = base_bits_per_pixel; | 295 | base->bits_per_pixel = base_bits_per_pixel; |
296 | } | 296 | } |
297 | //bb_info_msg("GEO[%s]", p); | 297 | //bb_error_msg("GEO[%s]", p); |
298 | break; | 298 | break; |
299 | case 1: | 299 | case 1: |
300 | if (sizeof(int) == sizeof(base->xres)) { | 300 | if (sizeof(int) == sizeof(base->xres)) { |
@@ -321,13 +321,13 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn, | |||
321 | base->hsync_len = base_hsync_len; | 321 | base->hsync_len = base_hsync_len; |
322 | base->vsync_len = base_vsync_len; | 322 | base->vsync_len = base_vsync_len; |
323 | } | 323 | } |
324 | //bb_info_msg("TIM[%s]", p); | 324 | //bb_error_msg("TIM[%s]", p); |
325 | break; | 325 | break; |
326 | case 2: | 326 | case 2: |
327 | case 3: { | 327 | case 3: { |
328 | static const uint32_t syncs[] = {FB_VMODE_INTERLACED, FB_VMODE_DOUBLE}; | 328 | static const uint32_t syncs[] = {FB_VMODE_INTERLACED, FB_VMODE_DOUBLE}; |
329 | ss(&base->vmode, syncs[i-2], p, "false"); | 329 | ss(&base->vmode, syncs[i-2], p, "false"); |
330 | //bb_info_msg("VMODE[%s]", p); | 330 | //bb_error_msg("VMODE[%s]", p); |
331 | break; | 331 | break; |
332 | } | 332 | } |
333 | case 4: | 333 | case 4: |
@@ -335,12 +335,12 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn, | |||
335 | case 6: { | 335 | case 6: { |
336 | static const uint32_t syncs[] = {FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT, FB_SYNC_COMP_HIGH_ACT}; | 336 | static const uint32_t syncs[] = {FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT, FB_SYNC_COMP_HIGH_ACT}; |
337 | ss(&base->sync, syncs[i-4], p, "low"); | 337 | ss(&base->sync, syncs[i-4], p, "low"); |
338 | //bb_info_msg("SYNC[%s]", p); | 338 | //bb_error_msg("SYNC[%s]", p); |
339 | break; | 339 | break; |
340 | } | 340 | } |
341 | case 7: | 341 | case 7: |
342 | ss(&base->sync, FB_SYNC_EXT, p, "false"); | 342 | ss(&base->sync, FB_SYNC_EXT, p, "false"); |
343 | //bb_info_msg("EXTSYNC[%s]", p); | 343 | //bb_error_msg("EXTSYNC[%s]", p); |
344 | break; | 344 | break; |
345 | case 8: { | 345 | case 8: { |
346 | int red_offset, red_length; | 346 | int red_offset, red_length; |
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index 3258d7eee..749f42068 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c | |||
@@ -116,7 +116,7 @@ static void allocate(uint8_t *bitmap, uint32_t blocksize, uint32_t start, uint32 | |||
116 | { | 116 | { |
117 | uint32_t i; | 117 | uint32_t i; |
118 | 118 | ||
119 | //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))); | 119 | //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))); |
120 | memset(bitmap, 0, blocksize); | 120 | memset(bitmap, 0, blocksize); |
121 | i = start / 8; | 121 | i = start / 8; |
122 | memset(bitmap, 0xFF, i); | 122 | memset(bitmap, 0xFF, i); |
@@ -412,7 +412,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) | |||
412 | // (a bit after 8M image size), but it works for two->three groups | 412 | // (a bit after 8M image size), but it works for two->three groups |
413 | // transition (at 16M). | 413 | // transition (at 16M). |
414 | if (remainder && (remainder < overhead + 50)) { | 414 | if (remainder && (remainder < overhead + 50)) { |
415 | //bb_info_msg("CHOP[%u]", remainder); | 415 | //bb_error_msg("CHOP[%u]", remainder); |
416 | nblocks -= remainder; | 416 | nblocks -= remainder; |
417 | goto retry; | 417 | goto retry; |
418 | } | 418 | } |
@@ -568,7 +568,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) | |||
568 | free_blocks = (n < blocks_per_group ? n : blocks_per_group) - overhead; | 568 | free_blocks = (n < blocks_per_group ? n : blocks_per_group) - overhead; |
569 | 569 | ||
570 | // mark preallocated blocks as allocated | 570 | // mark preallocated blocks as allocated |
571 | //bb_info_msg("ALLOC: [%u][%u][%u]", blocksize, overhead, blocks_per_group - (free_blocks + overhead)); | 571 | //bb_error_msg("ALLOC: [%u][%u][%u]", blocksize, overhead, blocks_per_group - (free_blocks + overhead)); |
572 | allocate(buf, blocksize, | 572 | allocate(buf, blocksize, |
573 | // reserve "overhead" blocks | 573 | // reserve "overhead" blocks |
574 | overhead, | 574 | overhead, |
@@ -647,7 +647,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) | |||
647 | n = FETCH_LE32(inode->i_block[0]) + 1; | 647 | n = FETCH_LE32(inode->i_block[0]) + 1; |
648 | for (i = 0; i < lost_and_found_blocks; ++i) | 648 | for (i = 0; i < lost_and_found_blocks; ++i) |
649 | STORE_LE(inode->i_block[i], i + n); // use next block | 649 | STORE_LE(inode->i_block[i], i + n); // use next block |
650 | //bb_info_msg("LAST BLOCK USED[%u]", i + n); | 650 | //bb_error_msg("LAST BLOCK USED[%u]", i + n); |
651 | PUT(((uint64_t)FETCH_LE32(gd[0].bg_inode_table) * blocksize) + (EXT2_GOOD_OLD_FIRST_INO-1) * inodesize, | 651 | PUT(((uint64_t)FETCH_LE32(gd[0].bg_inode_table) * blocksize) + (EXT2_GOOD_OLD_FIRST_INO-1) * inodesize, |
652 | buf, inodesize); | 652 | buf, inodesize); |
653 | 653 | ||