aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2016-03-30 16:20:28 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2016-03-30 16:20:28 +0200
commit066e76befe5d39fc3451846af94cbba96747186c (patch)
treef809b807a88c8a281c3cb02c7df2ab4c83b902cb
parent76b680c7a8d5a99e46ab8d9cad49aed0cfc440a7 (diff)
downloadbusybox-066e76befe5d39fc3451846af94cbba96747186c.tar.gz
busybox-066e76befe5d39fc3451846af94cbba96747186c.tar.bz2
Replace a few more bb_info_msg's by bb_error_msg or printf
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--loginutils/chpasswd.c2
-rw-r--r--loginutils/passwd.c2
-rw-r--r--miscutils/devfsd.c2
-rw-r--r--miscutils/flash_eraseall.c2
-rw-r--r--networking/inetd.c8
-rw-r--r--networking/traceroute.c2
-rw-r--r--networking/tunctl.c2
-rw-r--r--util-linux/mkfs_ext2.c2
8 files changed, 11 insertions, 11 deletions
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
index a022a42d6..2d268be67 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -105,7 +105,7 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
if (rc < 0)
bb_error_msg_and_die("an error occurred updating password for %s", name);
if (rc)
- bb_info_msg("Password for '%s' changed", name);
+ bb_error_msg("password for '%s' changed", name);
logmode = LOGMODE_STDIO;
free(name);
free(free_me);
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 73726d3e0..52b66ca50 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -230,7 +230,7 @@ int passwd_main(int argc UNUSED_PARAM, char **argv)
/* LOGMODE_BOTH */
if (rc < 0)
bb_error_msg_and_die("can't update password file %s", filename);
- bb_info_msg("Password for %s changed by %s", name, myname);
+ bb_error_msg("password for %s changed by %s", name, myname);
/*if (ENABLE_FEATURE_CLEAN_UP) free(newp); - can't, it may be non-malloced */
skip:
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 9256567cc..6217918da 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -284,7 +284,7 @@ static const char bb_msg_variable_not_found[] ALIGN1 = "variable: %s not found";
/* Busybox stuff */
#if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG
-#define info_logger(p, fmt, args...) bb_info_msg(fmt, ## args)
+#define info_logger(p, fmt, args...) bb_error_msg(fmt, ## args)
#define msg_logger(p, fmt, args...) bb_error_msg(fmt, ## args)
#define msg_logger_and_die(p, fmt, args...) bb_error_msg_and_die(fmt, ## args)
#define error_logger(p, fmt, args...) bb_perror_msg(fmt, ## args)
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index bf9b739a1..d95d214d9 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -147,7 +147,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
ret = ioctl(fd, MEMGETBADBLOCK, &offset);
if (ret > 0) {
if (!(flags & OPTION_Q))
- bb_info_msg("\nSkipping bad block at 0x%08x", erase.start);
+ printf("\nSkipping bad block at 0x%08x\n", erase.start);
continue;
}
if (ret < 0) {
diff --git a/networking/inetd.c b/networking/inetd.c
index 243165a07..4f6673b12 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -834,10 +834,10 @@ static NOINLINE servtab_t *parse_one_line(void)
goto parse_err;
}
-// bb_info_msg(
-// "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]",
-// sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no,
-// sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program);
+ //bb_error_msg(
+ // "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]",
+ // sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no,
+ // sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program);
/* check if the hostname specifier is a comma separated list
* of hostnames. we'll make new entries for each address. */
diff --git a/networking/traceroute.c b/networking/traceroute.c
index 642110c54..eee4f8873 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -497,7 +497,7 @@ send_probe(int seq, int ttl)
res = xsendto(sndsock, out, len, &dest_lsa->u.sa, dest_lsa->len);
if (res != len)
- bb_info_msg("sent %d octets, ret=%d", len, res);
+ bb_error_msg("sent %d octets, ret=%d", len, res);
}
#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 3a0870eb5..941e8bbd3 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -82,7 +82,7 @@ int tunctl_main(int argc UNUSED_PARAM, char **argv)
// delete?
if (opts & OPT_d) {
IOCTL(fd, TUNSETPERSIST, (void *)(uintptr_t)0);
- bb_info_msg("Set '%s' %spersistent", ifr.ifr_name, "non");
+ printf("Set '%s' nonpersistent\n", ifr.ifr_name);
return EXIT_SUCCESS;
}
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 749f42068..f91a0b4bf 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -151,7 +151,7 @@ static uint32_t has_super(uint32_t x)
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);
}