diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-03-30 16:20:28 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-03-30 16:20:28 +0200 |
commit | 066e76befe5d39fc3451846af94cbba96747186c (patch) | |
tree | f809b807a88c8a281c3cb02c7df2ab4c83b902cb | |
parent | 76b680c7a8d5a99e46ab8d9cad49aed0cfc440a7 (diff) | |
download | busybox-w32-066e76befe5d39fc3451846af94cbba96747186c.tar.gz busybox-w32-066e76befe5d39fc3451846af94cbba96747186c.tar.bz2 busybox-w32-066e76befe5d39fc3451846af94cbba96747186c.zip |
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.c | 2 | ||||
-rw-r--r-- | loginutils/passwd.c | 2 | ||||
-rw-r--r-- | miscutils/devfsd.c | 2 | ||||
-rw-r--r-- | miscutils/flash_eraseall.c | 2 | ||||
-rw-r--r-- | networking/inetd.c | 8 | ||||
-rw-r--r-- | networking/traceroute.c | 2 | ||||
-rw-r--r-- | networking/tunctl.c | 2 | ||||
-rw-r--r-- | util-linux/mkfs_ext2.c | 2 |
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) | |||
105 | if (rc < 0) | 105 | if (rc < 0) |
106 | bb_error_msg_and_die("an error occurred updating password for %s", name); | 106 | bb_error_msg_and_die("an error occurred updating password for %s", name); |
107 | if (rc) | 107 | if (rc) |
108 | bb_info_msg("Password for '%s' changed", name); | 108 | bb_error_msg("password for '%s' changed", name); |
109 | logmode = LOGMODE_STDIO; | 109 | logmode = LOGMODE_STDIO; |
110 | free(name); | 110 | free(name); |
111 | free(free_me); | 111 | 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) | |||
230 | /* LOGMODE_BOTH */ | 230 | /* LOGMODE_BOTH */ |
231 | if (rc < 0) | 231 | if (rc < 0) |
232 | bb_error_msg_and_die("can't update password file %s", filename); | 232 | bb_error_msg_and_die("can't update password file %s", filename); |
233 | bb_info_msg("Password for %s changed by %s", name, myname); | 233 | bb_error_msg("password for %s changed by %s", name, myname); |
234 | 234 | ||
235 | /*if (ENABLE_FEATURE_CLEAN_UP) free(newp); - can't, it may be non-malloced */ | 235 | /*if (ENABLE_FEATURE_CLEAN_UP) free(newp); - can't, it may be non-malloced */ |
236 | skip: | 236 | 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"; | |||
284 | 284 | ||
285 | /* Busybox stuff */ | 285 | /* Busybox stuff */ |
286 | #if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG | 286 | #if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG |
287 | #define info_logger(p, fmt, args...) bb_info_msg(fmt, ## args) | 287 | #define info_logger(p, fmt, args...) bb_error_msg(fmt, ## args) |
288 | #define msg_logger(p, fmt, args...) bb_error_msg(fmt, ## args) | 288 | #define msg_logger(p, fmt, args...) bb_error_msg(fmt, ## args) |
289 | #define msg_logger_and_die(p, fmt, args...) bb_error_msg_and_die(fmt, ## args) | 289 | #define msg_logger_and_die(p, fmt, args...) bb_error_msg_and_die(fmt, ## args) |
290 | #define error_logger(p, fmt, args...) bb_perror_msg(fmt, ## args) | 290 | #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) | |||
147 | ret = ioctl(fd, MEMGETBADBLOCK, &offset); | 147 | ret = ioctl(fd, MEMGETBADBLOCK, &offset); |
148 | if (ret > 0) { | 148 | if (ret > 0) { |
149 | if (!(flags & OPTION_Q)) | 149 | if (!(flags & OPTION_Q)) |
150 | bb_info_msg("\nSkipping bad block at 0x%08x", erase.start); | 150 | printf("\nSkipping bad block at 0x%08x\n", erase.start); |
151 | continue; | 151 | continue; |
152 | } | 152 | } |
153 | if (ret < 0) { | 153 | 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) | |||
834 | goto parse_err; | 834 | goto parse_err; |
835 | } | 835 | } |
836 | 836 | ||
837 | // bb_info_msg( | 837 | //bb_error_msg( |
838 | // "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]", | 838 | // "ENTRY[%s][%s][%s][%d][%d][%d][%d][%d][%s][%s][%s]", |
839 | // sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no, | 839 | // sep->se_local_hostname, sep->se_service, sep->se_proto, sep->se_wait, sep->se_proto_no, |
840 | // sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program); | 840 | // sep->se_max, sep->se_count, sep->se_time, sep->se_user, sep->se_group, sep->se_program); |
841 | 841 | ||
842 | /* check if the hostname specifier is a comma separated list | 842 | /* check if the hostname specifier is a comma separated list |
843 | * of hostnames. we'll make new entries for each address. */ | 843 | * 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) | |||
497 | 497 | ||
498 | res = xsendto(sndsock, out, len, &dest_lsa->u.sa, dest_lsa->len); | 498 | res = xsendto(sndsock, out, len, &dest_lsa->u.sa, dest_lsa->len); |
499 | if (res != len) | 499 | if (res != len) |
500 | bb_info_msg("sent %d octets, ret=%d", len, res); | 500 | bb_error_msg("sent %d octets, ret=%d", len, res); |
501 | } | 501 | } |
502 | 502 | ||
503 | #if ENABLE_FEATURE_TRACEROUTE_VERBOSE | 503 | #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) | |||
82 | // delete? | 82 | // delete? |
83 | if (opts & OPT_d) { | 83 | if (opts & OPT_d) { |
84 | IOCTL(fd, TUNSETPERSIST, (void *)(uintptr_t)0); | 84 | IOCTL(fd, TUNSETPERSIST, (void *)(uintptr_t)0); |
85 | bb_info_msg("Set '%s' %spersistent", ifr.ifr_name, "non"); | 85 | printf("Set '%s' nonpersistent\n", ifr.ifr_name); |
86 | return EXIT_SUCCESS; | 86 | return EXIT_SUCCESS; |
87 | } | 87 | } |
88 | 88 | ||
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) | |||
151 | 151 | ||
152 | static void PUT(uint64_t off, void *buf, uint32_t size) | 152 | static void PUT(uint64_t off, void *buf, uint32_t size) |
153 | { | 153 | { |
154 | // bb_info_msg("PUT[%llu]:[%u]", off, size); | 154 | //bb_error_msg("PUT[%llu]:[%u]", off, size); |
155 | xlseek(fd, off, SEEK_SET); | 155 | xlseek(fd, off, SEEK_SET); |
156 | xwrite(fd, buf, size); | 156 | xwrite(fd, buf, size); |
157 | } | 157 | } |