From d3857c1992074c9aa2682ee16e4181021b6576c2 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 9 Feb 2017 20:37:58 +0000 Subject: [PATCH] Mark help as static+dead. Don't use __attribute__. XXX needs a lot more static love. Uses mktemp and doesn't link. --- usr.bin/nc/netcat.c | 6 +++--- usr.bin/nc/socks.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c index cb9ee01f00ff..1fcfc774274a 100644 --- a/usr.bin/nc/netcat.c +++ b/usr.bin/nc/netcat.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: netcat.c,v 1.3 2017/02/09 17:27:30 christos Exp $"); +__RCSID("$NetBSD: netcat.c,v 1.4 2017/02/09 20:37:58 joerg Exp $"); /* * Re-written nc(1) for OpenBSD. Original implementation by @@ -129,11 +129,11 @@ int minttl = -1; void atelnet(int, unsigned char *, unsigned int); void build_ports(char *); -void help(void); +static void help(void) __dead; int local_listen(char *, char *, struct addrinfo); struct tls; void readwrite(int, struct tls *); -void fdpass(int nfd) __attribute__((noreturn)); +void fdpass(int nfd) __dead; int remote_connect(const char *, const char *, struct addrinfo); int timeout_connect(int, const struct sockaddr *, socklen_t); int socks_connect(const char *, const char *, struct addrinfo, diff --git a/usr.bin/nc/socks.c b/usr.bin/nc/socks.c index 44c6abae55a7..75c9066bb4e5 100644 --- a/usr.bin/nc/socks.c +++ b/usr.bin/nc/socks.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: socks.c,v 1.2 2017/02/06 16:03:40 christos Exp $"); +__RCSID("$NetBSD: socks.c,v 1.3 2017/02/09 20:37:58 joerg Exp $"); #include #include @@ -185,7 +185,7 @@ socks5_strerror(int e) int socks_connect(const char *host, const char *port, - struct addrinfo hints __attribute__ ((__unused__)), + struct addrinfo hints __unused, const char *proxyhost, const char *proxyport, struct addrinfo proxyhints, int socksv, const char *proxyuser) {