[src/netbsd-7]: src/usr.bin/pkill Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d511a9e00b2a
branches:  netbsd-7
changeset: 798910:d511a9e00b2a
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jan 27 13:39:31 2015 +0000

description:
Pull up following revision(s) (requested by prlw1 in ticket #461):
        usr.bin/pkill/pkill.c: revision 1.30
Simplify code so that gcc 4.8 can understand it.
http://mail-index.netbsd.org/tech-userlevel/2015/01/06/msg008882.html

diffstat:

 usr.bin/pkill/pkill.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r bb0cf25709df -r d511a9e00b2a usr.bin/pkill/pkill.c
--- a/usr.bin/pkill/pkill.c     Tue Jan 27 08:18:02 2015 +0000
+++ b/usr.bin/pkill/pkill.c     Tue Jan 27 13:39:31 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $   */
+/*     $NetBSD: pkill.c,v 1.29.8.1 2015/01/27 13:39:31 martin Exp $    */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pkill.c,v 1.29 2013/01/02 10:36:07 dsl Exp $");
+__RCSID("$NetBSD: pkill.c,v 1.29.8.1 2015/01/27 13:39:31 martin Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -128,8 +128,8 @@
                action = grepact;
                pgrep = 1;
        } else if (strcmp(getprogname(), "prenice") == 0) {
+               action = reniceact;
                prenice = 1;
-
        } else {
                action = killact;
                p = argv[1];
@@ -171,7 +171,6 @@
                if (argc < 2)
                        usage();
 
-               action = reniceact;
                p = argv[1];
 
                i = (int)strtol(p, &q, 10);