summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Warner <james.warner@comcast.net>2013-09-12 12:12:12 -0500
committerJaromir Capik <jcapik@redhat.com>2013-09-17 20:27:02 +0200
commite6bbcdb4926e83ecee33ffa84307be8c7cf10091 (patch)
treef726275fa066595c6db375ece4099460dab87fe3
parente2242cb943c620599913db3a68ccba06fa07ac36 (diff)
downloadprocps-ng-e6bbcdb4926e83ecee33ffa84307be8c7cf10091.tar.gz
misc: correct additional errors from merge request #13
Additional errors resulting from merge request #13 are being addressed in this commit. They involve two cases of trailing whitespace and one xwarnx printf type arg. Reference(s): http://gitorious.org/procps/procps/merge_requests/13 . earlier build-sys fix commit e2242cb943c620599913db3a68ccba06fa07ac36 . original merge commit dd6f24dbed12e95235b3df49e550b5039e74e6d8 Signed-off-by: Jim Warner <james.warner@comcast.net>
-rw-r--r--pgrep.c2
-rw-r--r--skill.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/pgrep.c b/pgrep.c
index c7535f7..94a2cbe 100644
--- a/pgrep.c
+++ b/pgrep.c
@@ -499,7 +499,7 @@ static struct el * select_procs (int *num)
stderr);
exit (EXIT_FATAL);
}
-
+
memset(&task, 0, sizeof (task));
while(readproc(ptp, &task)) {
int match = 1;
diff --git a/skill.c b/skill.c
index ab83a03..01b29cb 100644
--- a/skill.c
+++ b/skill.c
@@ -640,14 +640,14 @@ static void skillsnice_parse(int argc,
case NS_OPTION:
ns_pid = atoi(optarg);
if (ns_pid == 0) {
- xwarnx(_("invalid pid number %i"), optarg);
+ xwarnx(_("invalid pid number %s"), optarg);
kill_usage(stderr);
}
if (ns_read(ns_pid, &ns_task)) {
xwarnx(_("error reading reference namespace "
"information"));
kill_usage(stderr);
- }
+ }
break;
case NSLIST_OPTION: