===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uuencode/uuencode.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/uuencode/uuencode.c	2018/12/31 09:23:08	1.14
+++ src/usr.bin/uuencode/uuencode.c	2019/03/10 20:49:24	1.15
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uuencode.c,v 1.14 2018/12/31 09:23:08 kn Exp $	*/
+/*	$OpenBSD: uuencode.c,v 1.15 2019/03/10 20:49:24 schwarze Exp $	*/
 /*	$FreeBSD: uuencode.c,v 1.18 2004/01/22 07:23:35 grehan Exp $	*/
 
 /*-
@@ -39,7 +39,6 @@
 #include <netinet/in.h>
 
 #include <err.h>
-#include <locale.h>
 #include <resolv.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,7 +47,7 @@
 
 void encode(void);
 void base64_encode(void);
-static void usage(void);
+static void __dead usage(void);
 
 FILE *output;
 int mode;
@@ -80,7 +79,6 @@
 		pmode = MODE_B64ENCODE;
 	}
 
-	setlocale(LC_ALL, "");
 	while ((ch = getopt(argc, argv, optstr[pmode])) != -1) {
 		switch (ch) {
 		case 'm':
@@ -89,7 +87,6 @@
 		case 'o':
 			outfile = optarg;
 			break;
-		case '?':
 		default:
 			usage();
 		}
@@ -117,7 +114,6 @@
 #define	RW	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
 		mode = RW & ~umask(RW);
 		break;
-	case 0:
 	default:
 		usage();
 	}
@@ -136,7 +132,7 @@
 		encode();
 	if (ferror(output))
 		errx(1, "write error");
-	exit(0);
+	return 0;
 }
 
 /* ENC is the basic 1 character encoding function to make a char printing */
@@ -219,7 +215,7 @@
 	(void)fprintf(output, "%c\nend\n", ENC('\0'));
 }
 
-static void
+static void __dead
 usage(void)
 {
 	switch (pmode) {