[git commit] Use bb_error_msg instead of bb_info_msg in all commented-out debug printouts
Denys Vlasenko
vda.linux at googlemail.com
Wed Mar 30 14:04:37 UTC 2016
commit: https://git.busybox.net/busybox/commit/?id=76b680c7a8d5a99e46ab8d9cad49aed0cfc440a7
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
e2fsprogs/fsck.c | 2 +-
mailutils/sendmail.c | 2 +-
miscutils/beep.c | 2 +-
networking/udhcp/d6_packet.c | 2 +-
util-linux/fbset.c | 18 +++++++++---------
util-linux/mkfs_ext2.c | 8 ++++----
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index 627d2be..8d89179 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -345,7 +345,7 @@ static void load_fs_info(const char *filename)
// Loop through entries
while (getmntent_r(fstab, &mte, buf, sizeof(buf))) {
- //bb_info_msg("CREATE[%s][%s][%s][%s][%d]", mte.mnt_fsname, mte.mnt_dir,
+ //bb_error_msg("CREATE[%s][%s][%s][%s][%d]", mte.mnt_fsname, mte.mnt_dir,
// mte.mnt_type, mte.mnt_opts,
// mte.mnt_passno);
create_fs_device(mte.mnt_fsname, mte.mnt_dir,
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 4355e4d..5143fac 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -270,7 +270,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
// G.method = xstrdup(a+1);
}
// N.B. list == NULL here
- //bb_info_msg("OPT[%x] AU[%s], AP[%s], AM[%s], ARGV[%s]", opts, au, ap, am, *argv);
+ //bb_error_msg("OPT[%x] AU[%s], AP[%s], AM[%s], ARGV[%s]", opts, au, ap, am, *argv);
// connect to server
diff --git a/miscutils/beep.c b/miscutils/beep.c
index 910e03e..18b160c 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -88,7 +88,7 @@ int beep_main(int argc, char **argv)
bb_show_usage();
}
while (rep) {
-//bb_info_msg("rep[%d] freq=%d, length=%d, delay=%d", rep, freq, length, delay);
+//bb_error_msg("rep[%d] freq=%d, length=%d, delay=%d", rep, freq, length, delay);
xioctl(speaker, KIOCSOUND, (void*)(uintptr_t)tickrate_div_freq);
usleep(1000 * length);
ioctl(speaker, KIOCSOUND, (void*)0);
diff --git a/networking/udhcp/d6_packet.c b/networking/udhcp/d6_packet.c
index 79b2946..b340b5d 100644
--- a/networking/udhcp/d6_packet.c
+++ b/networking/udhcp/d6_packet.c
@@ -22,7 +22,7 @@ void FAST_FUNC d6_dump_packet(struct d6_packet *packet)
, packet->d6_xid32
);
//*bin2hex(buf, (void *) packet->chaddr, sizeof(packet->chaddr)) = '\0';
- //bb_info_msg(" chaddr %s", buf);
+ //bb_error_msg(" chaddr %s", buf);
}
#endif
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index ac0082f..09e96b7 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,
if (!p)
continue;
s = p + strlen(mode);
- //bb_info_msg("CHECK[%s][%s][%d]", mode, p-1, *s);
+ //bb_error_msg("CHECK[%s][%s][%d]", mode, p-1, *s);
/* exact match? */
if (((!*s || isspace(*s)) && '"' != s[-1]) /* end-of-token */
|| ('"' == *s && '"' == p[-1]) /* ends with " but starts with " too! */
) {
- //bb_info_msg("FOUND[%s][%s][%s][%d]", token[1], p, mode, isspace(*s));
+ //bb_error_msg("FOUND[%s][%s][%s][%d]", token[1], p, mode, isspace(*s));
break;
}
}
@@ -264,9 +264,9 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn,
while (config_read(parser, token, 2, 1, "# \t", PARSE_NORMAL)) {
int i;
-//bb_info_msg("???[%s][%s]", token[0], token[1]);
+//bb_error_msg("???[%s][%s]", token[0], token[1]);
if (strcmp(token[0], "endmode") == 0) {
-//bb_info_msg("OK[%s]", mode);
+//bb_error_msg("OK[%s]", mode);
return 1;
}
p = token[1];
@@ -294,7 +294,7 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn,
base->yres_virtual = base_yres_virtual;
base->bits_per_pixel = base_bits_per_pixel;
}
-//bb_info_msg("GEO[%s]", p);
+//bb_error_msg("GEO[%s]", p);
break;
case 1:
if (sizeof(int) == sizeof(base->xres)) {
@@ -321,13 +321,13 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn,
base->hsync_len = base_hsync_len;
base->vsync_len = base_vsync_len;
}
-//bb_info_msg("TIM[%s]", p);
+//bb_error_msg("TIM[%s]", p);
break;
case 2:
case 3: {
static const uint32_t syncs[] = {FB_VMODE_INTERLACED, FB_VMODE_DOUBLE};
ss(&base->vmode, syncs[i-2], p, "false");
-//bb_info_msg("VMODE[%s]", p);
+//bb_error_msg("VMODE[%s]", p);
break;
}
case 4:
@@ -335,12 +335,12 @@ static int read_mode_db(struct fb_var_screeninfo *base, const char *fn,
case 6: {
static const uint32_t syncs[] = {FB_SYNC_VERT_HIGH_ACT, FB_SYNC_HOR_HIGH_ACT, FB_SYNC_COMP_HIGH_ACT};
ss(&base->sync, syncs[i-4], p, "low");
-//bb_info_msg("SYNC[%s]", p);
+//bb_error_msg("SYNC[%s]", p);
break;
}
case 7:
ss(&base->sync, FB_SYNC_EXT, p, "false");
-//bb_info_msg("EXTSYNC[%s]", p);
+//bb_error_msg("EXTSYNC[%s]", p);
break;
case 8: {
int red_offset, red_length;
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 3258d7e..749f420 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
{
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;
memset(bitmap, 0xFF, i);
@@ -412,7 +412,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
// (a bit after 8M image size), but it works for two->three groups
// transition (at 16M).
if (remainder && (remainder < overhead + 50)) {
-//bb_info_msg("CHOP[%u]", remainder);
+//bb_error_msg("CHOP[%u]", remainder);
nblocks -= remainder;
goto retry;
}
@@ -568,7 +568,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
free_blocks = (n < blocks_per_group ? n : blocks_per_group) - overhead;
// 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
overhead,
@@ -647,7 +647,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
n = FETCH_LE32(inode->i_block[0]) + 1;
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);
More information about the busybox-cvs
mailing list