summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenno <benno@openbsd.org>2017-01-26 04:45:46 +0000
committerbenno <benno@openbsd.org>2017-01-26 04:45:46 +0000
commit436bff808c27d61f247305f6cefa5e9851e727a6 (patch)
treefc02a9c7726b882cac90db7f4db52606ae66f5ec
parentRemove unused _REL variable (diff)
downloadwireguard-openbsd-436bff808c27d61f247305f6cefa5e9851e727a6.tar.xz
wireguard-openbsd-436bff808c27d61f247305f6cefa5e9851e727a6.zip
enable compiler warnings and fix them.
-rw-r--r--regress/sys/kern/unfdpass/Makefile5
-rw-r--r--regress/sys/kern/unfdpass/unfdpass.c9
2 files changed, 8 insertions, 6 deletions
diff --git a/regress/sys/kern/unfdpass/Makefile b/regress/sys/kern/unfdpass/Makefile
index 9eb5acd945c..2121de7d99e 100644
--- a/regress/sys/kern/unfdpass/Makefile
+++ b/regress/sys/kern/unfdpass/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.10 2011/07/06 19:48:10 matthew Exp $
+# $OpenBSD: Makefile,v 1.11 2017/01/26 04:45:46 benno Exp $
# $NetBSD: Makefile,v 1.3 1998/03/02 21:57:38 cgd Exp $
-PROG= unfdpass
+PROG= unfdpass
+WARNINGS= Yes
CLEANFILES+=file1 file2 file3 output test-sock
REGRESS_TARGETS=do-unfdpass1 do-unfdpass2 do-unfdpass3 do-unfdpass4
diff --git a/regress/sys/kern/unfdpass/unfdpass.c b/regress/sys/kern/unfdpass/unfdpass.c
index 22e909ce52b..839926eea26 100644
--- a/regress/sys/kern/unfdpass/unfdpass.c
+++ b/regress/sys/kern/unfdpass/unfdpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unfdpass.c,v 1.18 2015/01/19 00:22:30 guenther Exp $ */
+/* $OpenBSD: unfdpass.c,v 1.19 2017/01/26 04:45:46 benno Exp $ */
/* $NetBSD: unfdpass.c,v 1.3 1998/06/24 23:51:30 thorpej Exp $ */
/*-
@@ -60,7 +60,8 @@ int
main(int argc, char *argv[])
{
struct msghdr msg;
- int listensock, sock, pfd[2], fd, i;
+ int sock, pfd[2], fd, i;
+ int listensock = -1;
char fname[16], buf[64];
struct cmsghdr *cmp;
int *files = NULL;
@@ -98,7 +99,7 @@ main(int argc, char *argv[])
if ((fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) == -1)
err(1, "open %s", fname);
(void) snprintf(buf, sizeof buf, "This is file %d.\n", i + 1);
- if (write(fd, buf, strlen(buf)) != strlen(buf))
+ if (write(fd, buf, strlen(buf)) != (ssize_t) strlen(buf))
err(1, "write %s", fname);
(void) close(fd);
}
@@ -273,7 +274,7 @@ child(int sock, int type)
cmp->cmsg_type = SCM_RIGHTS;
/*
- * Open the files again, and pass them to the child over the socket.
+ * Open the files again, and pass them to the parent over the socket.
*/
files = (int *)CMSG_DATA(cmp);
for (i = 0; i < 3; i++) {