summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2015-11-01 01:05:31 +0000
committerderaadt <deraadt@openbsd.org>2015-11-01 01:05:31 +0000
commita2ff6c2a02cf9f98358f90fd6b7290b12b382f2f (patch)
treee24b11ab32ba3cc03bf851292e2463d1825c8c52
parentinetd needs pledge "unix" to bind AF_UNIX sockets (diff)
downloadwireguard-openbsd-a2ff6c2a02cf9f98358f90fd6b7290b12b382f2f.tar.xz
wireguard-openbsd-a2ff6c2a02cf9f98358f90fd6b7290b12b382f2f.zip
KNF; from Rob Pierce
-rw-r--r--usr.bin/nc/netcat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
index df0aed9e382..9e2b7e9eb7d 100644
--- a/usr.bin/nc/netcat.c
+++ b/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.140 2015/10/23 05:27:17 beck Exp $ */
+/* $OpenBSD: netcat.c,v 1.141 2015/11/01 01:05:31 deraadt Exp $ */
/*
* Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
* Copyright (c) 2015 Bob Beck. All rights reserved.
@@ -676,7 +676,6 @@ unix_bind(char *path, int flags)
void
tls_setup_client(struct tls *tls_ctx, int s, char *host)
-
{
int i;
@@ -696,6 +695,7 @@ tls_setup_client(struct tls *tls_ctx, int s, char *host)
strcmp(tls_expecthash, tls_peer_cert_hash(tls_ctx)) != 0)
errx(1, "peer certificate is not %s", tls_expecthash);
}
+
struct tls *
tls_setup_server(struct tls *tls_ctx, int connfd, char *host)
{
@@ -735,6 +735,7 @@ tls_setup_server(struct tls *tls_ctx, int connfd, char *host)
}
return NULL;
}
+
/*
* unix_connect()
* Returns a socket connected to a local unix socket. Returns -1 on failure.
@@ -1161,7 +1162,6 @@ drainbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
return n;
}
-
ssize_t
fillbuf(int fd, unsigned char *buf, size_t *bufpos, struct tls *tls)
{