From c1dc6f79c42d83b3c883edac3778538cf97df82e Mon Sep 17 00:00:00 2001
From: ngie <ngie@FreeBSD.org>
Date: Sat, 11 Apr 2015 07:35:30 +0000
Subject: [PATCH] Fix more warnings I didn't catch in the first go-around

MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
---
 tools/regression/sockets/reconnect/Makefile    | 1 -
 tools/regression/sockets/reconnect/reconnect.c | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile
index edd6b47669e7..285d075bca4b 100644
--- a/tools/regression/sockets/reconnect/Makefile
+++ b/tools/regression/sockets/reconnect/Makefile
@@ -4,6 +4,5 @@
 
 PROG=	reconnect
 MAN=
-WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/reconnect/reconnect.c b/tools/regression/sockets/reconnect/reconnect.c
index 52811b3293d9..f483cb519442 100644
--- a/tools/regression/sockets/reconnect/reconnect.c
+++ b/tools/regression/sockets/reconnect/reconnect.c
@@ -50,7 +50,7 @@ static char uds_name2[] = "reconnect.XXXXXXXX";
 
 #define	sstosa(ss)	((struct sockaddr *)(ss))
 
-void
+static void
 prepare_ifsun(struct sockaddr_un *ifsun, const char *path)
 {
 
@@ -99,10 +99,8 @@ void
 cleanup(void)
 {
 
-    if (uds_name1 != NULL)
-        unlink(uds_name1);
-    if (uds_name2 != NULL)
-        unlink(uds_name2);
+    unlink(uds_name1);
+    unlink(uds_name2);
 }
 
 int