066e76bef

Denys Vlasenko

2016-03-30

SUCCESS Duration: 264s

Subject

Replace a few more bb_info_msg's by bb_error_msg or printf

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

loginutils/chpasswd.c+1 -1

@@ -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);

loginutils/passwd.c+1 -1

@@ -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:

miscutils/devfsd.c+1 -1

@@ -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)

miscutils/flash_eraseall.c+1 -1

@@ -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) {

networking/inetd.c+4 -4

@@ -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. */

networking/traceroute.c+1 -1

@@ -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

networking/tunctl.c+1 -1

@@ -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;
	}

util-linux/mkfs_ext2.c+1 -1

@@ -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);
	}