===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uname/uname.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/uname/uname.c	2016/10/10 02:23:54	1.18
+++ src/usr.bin/uname/uname.c	2016/10/28 07:22:59	1.19
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uname.c,v 1.18 2016/10/10 02:23:54 gsoares Exp $	*/
+/*	$OpenBSD: uname.c,v 1.19 2016/10/28 07:22:59 schwarze Exp $	*/
 
 /*
  * Copyright (c) 1994 Winning Strategies, Inc.
@@ -35,12 +35,11 @@
 #include <sys/utsname.h>
 
 #include <err.h>
-#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-static void usage(void);
+static void __dead usage(void);
 
 #define	PRINT_SYSNAME		0x01
 #define	PRINT_NODENAME		0x02
@@ -58,8 +57,6 @@
 	int space = 0;
 	int print_mask = 0;
 
-	setlocale(LC_ALL, "");
-
 	if (pledge("stdio", NULL) == -1)
 		err(1, "pledge");
 
@@ -88,18 +85,14 @@
 			break;
 		default:
 			usage();
-			/* NOTREACHED */
 		}
 	}
 
-	if (optind != argc) {
+	if (optind != argc)
 		usage();
-		/* NOTREACHED */
-	}
 
-	if (!print_mask) {
+	if (!print_mask)
 		print_mask = PRINT_SYSNAME;
-	}
 
 	if (uname(&u) == -1)
 		err(1, NULL);
@@ -143,7 +136,7 @@
 	return 0;
 }
 
-static void
+static void __dead
 usage(void)
 {
 	fprintf(stderr, "usage: uname [-amnprsv]\n");