From 3f104e9ea11ed819cdae798619a3d2bf96a838f7 Mon Sep 17 00:00:00 2001
From: gad <gad@FreeBSD.org>
Date: Tue, 1 Jun 2004 18:12:04 +0000
Subject: Make a few style-istic improvements to the previous commits.

Noticed by:	bde
---
 bin/ps/ps.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'bin/ps/ps.c')

diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 90c28af..52ecbed 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -140,7 +140,7 @@ static const char *
 		    KINFO *, char *, int);
 static void	 free_list(struct listinfo *);
 static void	 init_list(struct listinfo *, addelem_rtn, int, const char *);
-static char	*kludge_oldps_options(const char *opts, char *, const char *);
+static char	*kludge_oldps_options(const char *, char *, const char *);
 static int	 pscomp(const void *, const void *);
 static void	 saveuser(KINFO *);
 static void	 scanvars(void);
@@ -678,20 +678,20 @@ addelem_pid(struct listinfo *inf, const char *elem)
 		warnx("Invalid (zero-length) process id");
 		optfatal = 1;
 		return (0);		/* Do not add this value. */
-	} else {
-		errno = 0;
-		tempid = strtol(elem, &endp, 10);
-		if (*endp != '\0' || tempid < 0 || elem == endp) {
-			warnx("Invalid %s: %s", inf->lname, elem);
-			errno = ERANGE;
-		} else if (errno != 0 || tempid > BSD_PID_MAX) {
-			warnx("%s too large: %s", inf->lname, elem);
-			errno = ERANGE;
-		}
-		if (errno == ERANGE) {
-			optfatal = 1;
-			return (0);	/* Do not add this value. */
-		}
+	}
+
+	errno = 0;
+	tempid = strtol(elem, &endp, 10);
+	if (*endp != '\0' || tempid < 0 || elem == endp) {
+		warnx("Invalid %s: %s", inf->lname, elem);
+		errno = ERANGE;
+	} else if (errno != 0 || tempid > BSD_PID_MAX) {
+		warnx("%s too large: %s", inf->lname, elem);
+		errno = ERANGE;
+	}
+	if (errno == ERANGE) {
+		optfatal = 1;
+		return (0);		/* Do not add this value. */
 	}
 
 	if (inf->count >= inf->maxcount)
@@ -791,7 +791,6 @@ add_list(struct listinfo *inf, const char *argp)
 
 	if (*argp == 0)
 		    inf->addelem(inf, elemcopy);
-
 	while (*argp != '\0') {
 		while (*argp != '\0' && strchr(W_SEP, *argp) != NULL)
 			argp++;
-- 
cgit v1.1