]> granicus.if.org Git - procps-ng/commitdiff
misc: correct additional errors from merge request #13
authorJim Warner <james.warner@comcast.net>
Thu, 12 Sep 2013 17:12:12 +0000 (12:12 -0500)
committerJaromir Capik <jcapik@redhat.com>
Tue, 17 Sep 2013 18:27:02 +0000 (20:27 +0200)
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>
pgrep.c
skill.c

diff --git a/pgrep.c b/pgrep.c
index c7535f77a881dacee7b7a488f0a43bbe63795cbc..94a2cbe16a0ac23536d088df61fb5c69f579096e 100644 (file)
--- 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 ab83a0304285f2132269a650d31a50dced15c605..01b29cb030632a3d11fe380a72e6a26e7b687cbf 100644 (file)
--- 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: