[Midnightbsd-cvs] src [11418] trunk/usr.bin/sort/sort.c: cleanup vars

[laffer1 at midnightbsd.org]

Revision: 11418
          http://svnweb.midnightbsd.org/src/?rev=11418
Author:   laffer1
Date:     2018-07-06 22:37:52 -0400 (Fri, 06 Jul 2018)
Log Message:
-----------
cleanup vars

Modified Paths:
--------------
    trunk/usr.bin/sort/sort.c

Modified: trunk/usr.bin/sort/sort.c
===================================================================
--- trunk/usr.bin/sort/sort.c	2018-07-07 02:36:47 UTC (rev 11417)
+++ trunk/usr.bin/sort/sort.c	2018-07-07 02:37:52 UTC (rev 11418)
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: stable/10/usr.bin/sort/sort.c 281535 2015-04-14 18:57:50Z pfg $");
+__FBSDID("$FreeBSD: stable/10/usr.bin/sort/sort.c 309862 2016-12-12 00:47:12Z delphij $");
 
 #include <sys/stat.h>
 #include <sys/sysctl.h>
@@ -210,14 +210,10 @@
 static void
 usage(bool opt_err)
 {
-	struct option *o;
 	FILE *out;
 
-	out = stdout;
-	o = &(long_options[0]);
+	out = opt_err ? stderr : stdout;
 
-	if (opt_err)
-		out = stderr;
 	fprintf(out, getstr(12), getprogname());
 	if (opt_err)
 		exit(2);
@@ -272,8 +268,6 @@
 {
 	long pages, psize;
 
-	pages = psize = 0;
-
 #if defined(SORT_THREADS)
 	ncpu = 1;
 #endif
@@ -281,7 +275,7 @@
 	pages = sysconf(_SC_PHYS_PAGES);
 	if (pages < 1) {
 		perror("sysconf pages");
-		psize = 1;
+		pages = 1;
 	}
 	psize = sysconf(_SC_PAGESIZE);
 	if (psize < 1) {