[git commit master 1/1] chrt: correct opt_complementary. Closes bug 2977

Denys Vlasenko vda.linux at googlemail.com
Sat Dec 18 01:59:09 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=96c8a6b5eade530f28ef73f72f7d188f71bbb1ec
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/chrt.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index c40277b..4477d08 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -54,7 +54,7 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
 	int policy = SCHED_RR;
 
 	/* at least 1 arg; only one policy accepted */
-	opt_complementary = "-1:r--fo:f--ro:r--fo";
+	opt_complementary = "-1:r--fo:f--ro:o--rf";
 	opt = getopt32(argv, "+mprfo");
 	if (opt & OPT_r)
 		policy = SCHED_RR;
@@ -90,13 +90,13 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
  print_rt_info:
 		pol = sched_getscheduler(pid);
 		if (pol < 0)
-			bb_perror_msg_and_die("can't %cet pid %d's policy", 'g', pid);
+			bb_perror_msg_and_die("can't %cet pid %d's policy", 'g', (int)pid);
 		printf("pid %d's %s scheduling policy: %s\n",
 				pid, current_new, policies[pol].name);
 		if (sched_getparam(pid, &sp))
-			bb_perror_msg_and_die("can't get pid %d's attributes", pid);
+			bb_perror_msg_and_die("can't get pid %d's attributes", (int)pid);
 		printf("pid %d's %s scheduling priority: %d\n",
-				pid, current_new, sp.sched_priority);
+				(int)pid, current_new, sp.sched_priority);
 		if (!*argv) {
 			/* Either it was just "-p <pid>",
 			 * or it was "-p <priority> <pid>" and we came here
@@ -115,7 +115,7 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
 	sp.sched_priority = xstrtou_range(priority, 0, policy != SCHED_OTHER ? 1 : 0, 99);
 
 	if (sched_setscheduler(pid, policy, &sp) < 0)
-		bb_perror_msg_and_die("can't %cet pid %d's policy", 's', pid);
+		bb_perror_msg_and_die("can't %cet pid %d's policy", 's', (int)pid);
 
 	if (!argv[0]) /* "-p <priority> <pid> [...]" */
 		goto print_rt_info;
-- 
1.7.2.2



More information about the busybox-cvs mailing list