From 7f08b09a0eb33ea585604af3210f9103ffcdab9f Mon Sep 17 00:00:00 2001
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 25 Jun 2018 11:44:53 +0000
Subject: [PATCH] rup: compile with WARNS=6

---
 usr.bin/rup/Makefile | 3 ++-
 usr.bin/rup/rup.c    | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 54e114ee158f..4df0528284f8 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -2,7 +2,8 @@
 
 PROG=	rup
 
-WARNS?=	3
 LIBADD=	rpcsvc
 
+NO_WCAST_ALIGN=	# Size is explicitly handled
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 5f4f2b45e8bf..c0cd5f8243ae 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 #define HOST_WIDTH 15
 
-struct host_list {
+static struct host_list {
 	struct host_list *next;
 	struct in_addr addr;
 } *hosts;
@@ -93,7 +93,7 @@ remember_host(struct in_addr addr)
 }
 
 static bool_t
-rstat_reply(caddr_t replyp, struct sockaddr_in *raddrp)
+rstat_reply(statstime *host_stat, struct sockaddr_in *raddrp)
 {
 	struct tm *tmp_time;
 	struct tm host_time;
@@ -102,7 +102,6 @@ rstat_reply(caddr_t replyp, struct sockaddr_in *raddrp)
 	char hours_buf[16];
 	struct hostent *hp;
 	char *host;
-	statstime *host_stat = (statstime *)replyp;
 	time_t tmp_time_t;
 
 	if (search_host(raddrp->sin_addr))
@@ -207,7 +206,7 @@ onehost(char *host)
 	}
 
 	addr.sin_addr.s_addr = *(int *)hp->h_addr;
-	rstat_reply((caddr_t)&host_stat, &addr);
+	rstat_reply(&host_stat, &addr);
 	clnt_destroy(rstat_clnt);
 	return (0);
 }
@@ -242,7 +241,6 @@ main(int argc, char *argv[])
 		switch (ch) {
 		default:
 			usage();
-			/*NOTREACHED*/
 		}
 
 	setlinebuf(stdout);