23 files changed, 23 insertions, 73 deletions
diff --git a/lib/libc/citrus/citrus_none.c b/lib/libc/citrus/citrus_none.c
index ac51aff381a..b09a567ae04 100644
--- a/lib/libc/citrus/citrus_none.c
+++ b/lib/libc/citrus/citrus_none.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: citrus_none.c,v 1.5 2013/03/07 18:12:31 stsp Exp $ */
+/*	$OpenBSD: citrus_none.c,v 1.6 2015/11/01 03:45:28 guenther Exp $ */
 /*	$NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $	*/
 
 /*-
@@ -56,7 +56,6 @@ wrapv(unsigned char ch)
 }
 
 size_t
-/*ARGSUSED*/
 _citrus_none_ctype_mbrtowc(wchar_t * __restrict pwc,
 			   const char * __restrict s, size_t n,
 			   void * __restrict pspriv)
@@ -75,14 +74,12 @@ _citrus_none_ctype_mbrtowc(wchar_t * __restrict pwc,
 }
 
 int
-/*ARGSUSED*/
 _citrus_none_ctype_mbsinit(const void * __restrict pspriv)
 {
 	return (1);  /* always initial state */
 }
 
 size_t
-/*ARGSUSED*/
 _citrus_none_ctype_mbsnrtowcs(wchar_t * __restrict dst,
 			      const char ** __restrict src,
 			      size_t nmc, size_t len,
@@ -107,7 +104,6 @@ _citrus_none_ctype_mbsnrtowcs(wchar_t * __restrict dst,
 }
 
 size_t
-/*ARGSUSED*/
 _citrus_none_ctype_wcrtomb(char * __restrict s,
 			   wchar_t wc, void * __restrict pspriv)
 {
@@ -127,7 +123,6 @@ _citrus_none_ctype_wcrtomb(char * __restrict s,
 }
 
 size_t
-/*ARGSUSED*/
 _citrus_none_ctype_wcsnrtombs(char * __restrict dst,
 			      const wchar_t ** __restrict src,
 			      size_t nwc, size_t len,
diff --git a/lib/libc/citrus/citrus_utf8.c b/lib/libc/citrus/citrus_utf8.c
index e1d83ced8a2..70ae39927b6 100644
--- a/lib/libc/citrus/citrus_utf8.c
+++ b/lib/libc/citrus/citrus_utf8.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: citrus_utf8.c,v 1.14 2015/10/13 02:17:46 bentley Exp $ */
+/*	$OpenBSD: citrus_utf8.c,v 1.15 2015/11/01 03:45:28 guenther Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins
@@ -51,7 +51,6 @@ struct _utf8_state {
 };
 
 size_t
-/*ARGSUSED*/
 _citrus_utf8_ctype_mbrtowc(wchar_t * __restrict pwc,
 			   const char * __restrict s, size_t n,
 			   void * __restrict pspriv)
@@ -183,7 +182,6 @@ _citrus_utf8_ctype_mbrtowc(wchar_t * __restrict pwc,
 }
 
 int
-/*ARGSUSED*/
 _citrus_utf8_ctype_mbsinit(const void * __restrict pspriv)
 {
 	return (pspriv == NULL ||
@@ -191,7 +189,6 @@ _citrus_utf8_ctype_mbsinit(const void * __restrict pspriv)
 }
 
 size_t
-/*ARGSUSED*/
 _citrus_utf8_ctype_mbsnrtowcs(wchar_t * __restrict dst,
 			      const char ** __restrict src,
 			      size_t nmc, size_t len,
@@ -272,7 +269,6 @@ _citrus_utf8_ctype_mbsnrtowcs(wchar_t * __restrict dst,
 }
 
 size_t
-/*ARGSUSED*/
 _citrus_utf8_ctype_wcrtomb(char * __restrict s,
 			   wchar_t wc, void * __restrict pspriv)
 {
@@ -334,7 +330,6 @@ _citrus_utf8_ctype_wcrtomb(char * __restrict s,
 }
 
 size_t
-/*ARGSUSED*/
 _citrus_utf8_ctype_wcsnrtombs(char * __restrict dst,
 			      const wchar_t ** __restrict src,
 			      size_t nwc, size_t len,
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
index 42d7ee99e47..7578e507da4 100644
--- a/lib/libc/db/hash/hash.c
+++ b/lib/libc/db/hash/hash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hash.c,v 1.26 2015/01/16 16:48:51 deraadt Exp $	*/
+/*	$OpenBSD: hash.c,v 1.27 2015/11/01 03:45:28 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -87,7 +87,6 @@ int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
 /************************** INTERFACE ROUTINES ***************************/
 /* OPEN/CLOSE */
 
-/* ARGSUSED */
 DB *
 __hash_open(const char *file, int flags, int mode,
     const HASHINFO *info,	/* Special directives for create */
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
index 9e44fb99276..ccb1b4fdbc4 100644
--- a/lib/libc/db/hash/ndbm.c
+++ b/lib/libc/db/hash/ndbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndbm.c,v 1.24 2015/09/12 15:20:52 guenther Exp $	*/
+/*	$OpenBSD: ndbm.c,v 1.25 2015/11/01 03:45:28 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -130,7 +130,6 @@ firstkey()
  *	DATUM on success
  *	NULL on failure
  */
-/* ARGSUSED */
 datum
 nextkey(datum key)
 {
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
index 772ded17dce..a19b2d62543 100644
--- a/lib/libc/db/mpool/mpool.c
+++ b/lib/libc/db/mpool/mpool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpool.c,v 1.20 2015/01/16 16:48:51 deraadt Exp $	*/
+/*	$OpenBSD: mpool.c,v 1.21 2015/11/01 03:45:28 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -51,7 +51,6 @@ static int  mpool_write(MPOOL *, BKT *);
  * mpool_open --
  *	Initialize a memory pool.
  */
-/* ARGSUSED */
 MPOOL *
 mpool_open(void *key, int fd, pgno_t pagesize, pgno_t maxcache)
 {
@@ -166,7 +165,6 @@ mpool_delete(MPOOL *mp, void *page)
  * mpool_get
  *	Get a page.
  */
-/* ARGSUSED */
 void *
 mpool_get(MPOOL *mp, pgno_t pgno,
     u_int flags)		/* XXX not used? */
@@ -261,7 +259,6 @@ mpool_get(MPOOL *mp, pgno_t pgno,
  * mpool_put
  *	Return a page.
  */
-/* ARGSUSED */
 int
 mpool_put(MPOOL *mp, void *page, u_int flags)
 {
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
index 3f581a38994..e042b9fe2f0 100644
--- a/lib/libc/gen/fts.c
+++ b/lib/libc/gen/fts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fts.c,v 1.52 2015/09/14 16:09:13 tedu Exp $	*/
+/*	$OpenBSD: fts.c,v 1.53 2015/11/01 03:45:29 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -449,7 +449,6 @@ DEF_WEAK(fts_read);
  * semantics to fts using fts_set.  An error return is allowed for similar
  * reasons.
  */
-/* ARGSUSED */
 int
 fts_set(FTS *sp, FTSENT *p, int instr)
 {
diff --git a/lib/libc/hash/helper.c b/lib/libc/hash/helper.c
index b5a938666e4..38008aedf22 100644
--- a/lib/libc/hash/helper.c
+++ b/lib/libc/hash/helper.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: helper.c,v 1.14 2015/09/11 09:18:27 guenther Exp $ */
+/*	$OpenBSD: helper.c,v 1.15 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2000 Poul-Henning Kamp <phk@FreeBSD.org>
@@ -35,7 +35,6 @@
 
 #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
 
-/* ARGSUSED */
 char *
 HASHEnd(HASH_CTX *ctx, char *buf)
 {
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
index a8cd0e60df0..5d468ff4c44 100644
--- a/lib/libc/net/rcmdsh.c
+++ b/lib/libc/net/rcmdsh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcmdsh.c,v 1.16 2015/10/23 04:45:32 guenther Exp $	*/ 
+/*	$OpenBSD: rcmdsh.c,v 1.17 2015/11/01 03:45:29 guenther Exp $	*/ 
 
 /*
  * Copyright (c) 2001, MagniComp
@@ -51,7 +51,6 @@
  * program in place of a direct rcmd(3) function call so as to
  * avoid having to be root.  Note that rport is ignored.
  */
-/* ARGSUSED */
 int
 rcmdsh(char **ahost, int rport, const char *locuser, const char *remuser,
     const char *cmd, char *rshprog)
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 68d20abf904..f02b753f8ac 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regcomp.c,v 1.26 2014/10/18 04:12:28 deraadt Exp $ */
+/*	$OpenBSD: regcomp.c,v 1.27 2015/11/01 03:45:29 guenther Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
  * Copyright (c) 1992, 1993, 1994
@@ -1201,7 +1201,6 @@ mcadd( struct parse *p, cset *cs, char *cp)
  * This would have to know the set of possibilities.  Implementation
  * is deferred.
  */
-/* ARGSUSED */
 static void
 mcinvert(struct parse *p, cset *cs)
 {
@@ -1214,7 +1213,6 @@ mcinvert(struct parse *p, cset *cs)
  * This would have to know the set of possibilities.  Implementation
  * is deferred.
  */
-/* ARGSUSED */
 static void
 mccase(struct parse *p, cset *cs)
 {
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index e75be186a26..be6fcc8186c 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regerror.c,v 1.13 2005/08/05 13:03:00 espie Exp $ */
+/*	$OpenBSD: regerror.c,v 1.14 2015/11/01 03:45:29 guenther Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994 Henry Spencer.
  * Copyright (c) 1992, 1993, 1994
@@ -74,7 +74,6 @@ static struct rerr {
  - regerror - the interface to error numbers
  = extern size_t regerror(int, const regex_t *, char *, size_t);
  */
-/* ARGSUSED */
 size_t
 regerror(int errcode, const regex_t *preg, char *errbuf, size_t errbuf_size)
 {
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 68f759e1b40..8ba7b71da27 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth_none.c,v 1.13 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: auth_none.c,v 1.14 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -95,7 +95,6 @@ authnone_create(void)
 }
 DEF_WEAK(authnone_create);
 
-/*ARGSUSED*/
 static bool_t
 authnone_marshal(AUTH *client, XDR *xdrs)
 {
@@ -107,13 +106,11 @@ authnone_marshal(AUTH *client, XDR *xdrs)
 	    ap->marshalled_client, ap->mcnt));
 }
 
-/*ARGSUSED*/
 static void 
 authnone_verf(struct __rpc_auth *none)
 {
 }
 
-/*ARGSUSED*/
 static bool_t
 authnone_validate(struct __rpc_auth *none, struct opaque_auth *noauth)
 {
@@ -121,7 +118,6 @@ authnone_validate(struct __rpc_auth *none, struct opaque_auth *noauth)
 	return (TRUE);
 }
 
-/*ARGSUSED*/
 static bool_t
 authnone_refresh(struct __rpc_auth *none)
 {
@@ -129,7 +125,6 @@ authnone_refresh(struct __rpc_auth *none)
 	return (FALSE);
 }
 
-/*ARGSUSED*/
 static void
 authnone_destroy(struct __rpc_auth *none)
 {
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index de2262ce747..1ee7f7a50cb 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth_unix.c,v 1.25 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: auth_unix.c,v 1.26 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -207,7 +207,6 @@ DEF_WEAK(authunix_create_default);
 /*
  * authunix operations
  */
-/* ARGSUSED */
 static void
 authunix_nextverf(AUTH *auth)
 {
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index ff9603e2615..92076ba97d7 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt_raw.c,v 1.19 2015/08/20 21:49:29 deraadt Exp $ */
+/*	$OpenBSD: clnt_raw.c,v 1.20 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -131,7 +131,6 @@ fail:
 	return (NULL);
 }
 
-/* ARGSUSED */
 static enum clnt_stat 
 clntraw_call(CLIENT *h, u_long proc, xdrproc_t xargs, caddr_t argsp,
     xdrproc_t xresults, caddr_t resultsp, struct timeval timeout)
@@ -208,13 +207,11 @@ call_again:
 	return (status);
 }
 
-/*ARGSUSED*/
 static void
 clntraw_geterr(CLIENT *clnt, struct rpc_err *err)
 {
 }
 
-/* ARGSUSED */
 static bool_t
 clntraw_freeres(CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
 {
@@ -231,20 +228,17 @@ clntraw_freeres(CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
 	return ((*xdr_res)(xdrs, res_ptr));
 }
 
-/*ARGSUSED*/
 static void
 clntraw_abort(CLIENT *clnt)
 {
 }
 
-/*ARGSUSED*/
 static bool_t
 clntraw_control(CLIENT *clnt, u_int i, void *v)
 {
 	return (FALSE);
 }
 
-/*ARGSUSED*/
 static void
 clntraw_destroy(CLIENT *clnt)
 {
diff --git a/lib/libc/rpc/clnt_tcp.c b/lib/libc/rpc/clnt_tcp.c
index ba4d33baef9..a42572bc988 100644
--- a/lib/libc/rpc/clnt_tcp.c
+++ b/lib/libc/rpc/clnt_tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt_tcp.c,v 1.28 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: clnt_tcp.c,v 1.29 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -334,7 +334,6 @@ clnttcp_freeres(CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
 	return ((*xdr_res)(xdrs, res_ptr));
 }
 
-/*ARGSUSED*/
 static void
 clnttcp_abort(CLIENT *clnt)
 {
diff --git a/lib/libc/rpc/clnt_udp.c b/lib/libc/rpc/clnt_udp.c
index 5d4654cdd70..0f34d4390d9 100644
--- a/lib/libc/rpc/clnt_udp.c
+++ b/lib/libc/rpc/clnt_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt_udp.c,v 1.31 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: clnt_udp.c,v 1.32 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -389,7 +389,6 @@ clntudp_freeres(CLIENT *cl, xdrproc_t xdr_res, caddr_t res_ptr)
 	return ((*xdr_res)(xdrs, res_ptr));
 }
 
-/*ARGSUSED*/
 static void 
 clntudp_abort(CLIENT *clnt)
 {
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 0bcec6365ef..e4e7cbf4f58 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc_auth_unix.c,v 1.12 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: svc_auth_unix.c,v 1.13 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -120,7 +120,6 @@ DEF_STRONG(_svcauth_unix);
  * Shorthand unix authenticator
  * Looks up longhand in a cache.
  */
-/*ARGSUSED*/
 enum auth_stat 
 _svcauth_short(struct svc_req *rqst, struct rpc_msg *msg)
 {
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index a0a1d054515..d573440e6bd 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc_raw.c,v 1.11 2015/08/20 21:49:29 deraadt Exp $ */
+/*	$OpenBSD: svc_raw.c,v 1.12 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -88,7 +88,6 @@ svcraw_create(void)
 	return (&srp->server);
 }
 
-/* ARGSUSED */
 static enum xprt_stat
 svcraw_stat(SVCXPRT *xprt)
 {
@@ -96,7 +95,6 @@ svcraw_stat(SVCXPRT *xprt)
 	return (XPRT_IDLE);
 }
 
-/* ARGSUSED */
 static bool_t
 svcraw_recv(SVCXPRT *xprt, struct rpc_msg *msg)
 {
@@ -113,7 +111,6 @@ svcraw_recv(SVCXPRT *xprt, struct rpc_msg *msg)
 	return (TRUE);
 }
 
-/* ARGSUSED */
 static bool_t
 svcraw_reply(SVCXPRT *xprt, struct rpc_msg *msg)
 {
@@ -131,7 +128,6 @@ svcraw_reply(SVCXPRT *xprt, struct rpc_msg *msg)
 	return (TRUE);
 }
 
-/* ARGSUSED */
 static bool_t
 svcraw_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
 {
@@ -142,7 +138,6 @@ svcraw_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
 	return ((*xdr_args)(&srp->xdr_stream, args_ptr));
 }
 
-/* ARGSUSED */
 static bool_t
 svcraw_freeargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
 { 
@@ -156,7 +151,6 @@ svcraw_freeargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
 	return ((*xdr_args)(xdrs, args_ptr));
 } 
 
-/* ARGSUSED */
 static void
 svcraw_destroy(SVCXPRT *xprt)
 {
diff --git a/lib/libc/rpc/svc_tcp.c b/lib/libc/rpc/svc_tcp.c
index 5cec3834d2c..8c2a3e0209f 100644
--- a/lib/libc/rpc/svc_tcp.c
+++ b/lib/libc/rpc/svc_tcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc_tcp.c,v 1.36 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: svc_tcp.c,v 1.37 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -229,7 +229,6 @@ makefd_xprt(int fd, u_int sendsize, u_int recvsize)
 	return (xprt);
 }
 
-/* ARGSUSED */
 static bool_t
 rendezvous_request(SVCXPRT *xprt, struct rpc_msg *ignored)
 {
@@ -291,7 +290,6 @@ rendezvous_request(SVCXPRT *xprt, struct rpc_msg *ignored)
 	return (FALSE); /* there is never an rpc msg to be processed */
 }
 
-/* ARGSUSED */
 static enum xprt_stat
 rendezvous_stat(SVCXPRT *xprt)
 {
diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c
index a1ca7e3acfa..da8d4d5af94 100644
--- a/lib/libc/rpc/svc_udp.c
+++ b/lib/libc/rpc/svc_udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc_udp.c,v 1.24 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: svc_udp.c,v 1.25 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -169,7 +169,6 @@ svcudp_create(int sock)
 }
 DEF_WEAK(svcudp_create);
 
-/* ARGSUSED */
 static enum xprt_stat
 svcudp_stat(SVCXPRT *xprt)
 {
diff --git a/lib/libc/rpc/xdr_mem.c b/lib/libc/rpc/xdr_mem.c
index cbb311d8b4a..c82642c8de7 100644
--- a/lib/libc/rpc/xdr_mem.c
+++ b/lib/libc/rpc/xdr_mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xdr_mem.c,v 1.16 2015/09/13 15:36:56 guenther Exp $ */
+/*	$OpenBSD: xdr_mem.c,v 1.17 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -99,7 +99,6 @@ xdrmem_create(XDR *xdrs, caddr_t addr, u_int size, enum xdr_op op)
 }
 DEF_WEAK(xdrmem_create);
 
-/*ARGSUSED*/
 static void
 xdrmem_destroy(XDR *xdrs)
 {
@@ -215,7 +214,6 @@ xdrmem_inline_aligned(XDR *xdrs, u_int len)
 	return (buf);
 }
 
-/* ARGSUSED */
 static int32_t *
 xdrmem_inline_unaligned(XDR *xdrs, u_int len)
 {
diff --git a/lib/libc/rpc/xdr_stdio.c b/lib/libc/rpc/xdr_stdio.c
index 8501f65b27a..db0ad4ba809 100644
--- a/lib/libc/rpc/xdr_stdio.c
+++ b/lib/libc/rpc/xdr_stdio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xdr_stdio.c,v 1.13 2010/09/01 14:43:34 millert Exp $ */
+/*	$OpenBSD: xdr_stdio.c,v 1.14 2015/11/01 03:45:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2010, Oracle America, Inc.
@@ -148,7 +148,6 @@ xdrstdio_setpos(XDR *xdrs, u_int pos)
 		FALSE : TRUE);
 }
 
-/* ARGSUSED */
 static int32_t *
 xdrstdio_inline(XDR *xdrs, u_int len)
 {
diff --git a/lib/libc/termios/tcsendbreak.c b/lib/libc/termios/tcsendbreak.c
index f9639e33122..f35838509f3 100644
--- a/lib/libc/termios/tcsendbreak.c
+++ b/lib/libc/termios/tcsendbreak.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcsendbreak.c,v 1.8 2014/10/10 00:39:38 millert Exp $ */
+/*	$OpenBSD: tcsendbreak.c,v 1.9 2015/11/01 03:45:29 guenther Exp $ */
 /*-
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,6 @@
 #include <termios.h>
 #include <time.h>
 
-/* ARGSUSED */
 int
 tcsendbreak(int fd, int len)
 {
diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c
index 8ac4433a31f..9960f8c74f8 100644
--- a/lib/libc/time/localtime.c
+++ b/lib/libc/time/localtime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: localtime.c,v 1.55 2015/10/24 18:13:18 guenther Exp $ */
+/*	$OpenBSD: localtime.c,v 1.56 2015/11/01 03:45:29 guenther Exp $ */
 /*
 ** This file is in the public domain, so clarified as of
 ** 1996-06-05 by Arthur David Olson.
@@ -1197,7 +1197,6 @@ DEF_WEAK(tzset);
 ** The unused offset argument is for the benefit of mktime variants.
 */
 
-/*ARGSUSED*/
 static struct tm *
 localsub(const time_t *timep, long offset, struct tm *tmp)
 {