 @@ -1,14 +1,14 @@
-/*	$NetBSD: flock.c,v 1.8 2013/10/29 16:02:15 christos Exp $	*/
+/*	$NetBSD: flock.c,v 1.9 2014/01/07 02:07:08 joerg Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Christos Zoulas.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: flock.c,v 1.8 2013/10/29 16:02:15 christos Exp $");
+__RCSID("$NetBSD: flock.c,v 1.9 2014/01/07 02:07:08 joerg Exp $");
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <unistd.h>
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
 #include <paths.h>
 #include <time.h>
 @@ -53,27 +53,27 @@ static struct option flock_longopts[] =
 	{ "close",		no_argument,		0, 'o' },
 	{ "shared",		no_argument,		0, 's' },
 	{ "exclusive",		no_argument,		0, 'x' },
 	{ "unlock",		no_argument,		0, 'u' },
 	{ "verbose",		no_argument,		0, 'v' },
 	{ "command",		required_argument,	0, 'c' },
 	{ "wait",		required_argument,	0, 'w' },
 	{ "timeout",		required_argument,	0, 'w' },
 	{ NULL,			0,			0, 0   },
 };
 static sig_atomic_t timeout_expired;
-static __dead void
+static __dead __printflike(1, 2) void
 usage(const char *fmt, ...)
+{
 	if (fmt) {
 		va_list ap;
 		va_start(ap, fmt);
 		fprintf(stderr, "%s: ", getprogname());
 		vfprintf(stderr, fmt, ap);
 		fputc('\n', stderr);
 		va_end(ap);
+	}
 	fprintf(stderr, "Usage: %s [-dnosvx] [-w timeout] lockfile|lockdir "
 	    "[-c command]|command ...\n\t%s [-dnsuvx] [-w timeout] lockfd\n",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ssl.h,v 1.1 2012/12/21 18:07:36 christos Exp $	*/
+/*	$NetBSD: ssl.h,v 1.2 2014/01/07 02:07:08 joerg Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,28 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifdef WITH_SSL
 #define FETCH struct fetch_connect
 struct fetch_connect;
-int fetch_printf(struct fetch_connect *, const char *fmt, ...);
+int fetch_printf(struct fetch_connect *, const char *fmt, ...)
     __printflike(2, 3);
 int fetch_fileno(struct fetch_connect *);
 int fetch_error(struct fetch_connect *);
 int fetch_flush(struct fetch_connect *);
 struct fetch_connect *fetch_open(const char *, const char *);
 struct fetch_connect *fetch_fdopen(int, const char *);
 int fetch_close(struct fetch_connect *);
 ssize_t fetch_read(void *, size_t, size_t, struct fetch_connect *);
 char *fetch_getln(char *, int, struct fetch_connect *);
 int fetch_getline(struct fetch_connect *, char *, size_t, const char **);
 void fetch_set_ssl(struct fetch_connect *, void *);
 void *fetch_start_ssl(int);
 #else	/* !WITH_SSL */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: units.c,v 1.24 2013/01/06 00:19:13 wiz Exp $	*/
+/*	$NetBSD: units.c,v 1.25 2014/01/07 02:07:09 joerg Exp $	*/
 /*
  * units.c   Copyright (c) 1993 by Adrian Mariano (adrian@cam.cornell.edu)
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
  * Disclaimer:  This software is provided by the author "as is".  The author
  * shall not be liable for any damages caused in any way by this software.
 @@ -95,27 +95,27 @@ static const char *lookupunit(const char
 static char *
 dupstr(const char *str)
+{
 	char *ret;
 	ret = strdup(str);
 	if (!ret)
 		err(3, "Memory allocation error");
 	return (ret);
+}
-static void
+static __printflike(1, 2) void
 mywarnx(const char *fmt, ...)
+{
 	va_list args;
 	va_start(args, fmt);
 	if (errprefix) {
 		/* warn to stdout, with errprefix prepended */
 		printf("%s", errprefix);
 		vprintf(fmt, args);
 		printf("%s", "\n");
 	} else {
 		/* warn to stderr */
 		vwarnx(fmt, args);