Module Name: src
Committed By: joerg
Date: Thu Mar 15 02:02:24 UTC 2012
Modified Files:
src/bin/expr: expr.y
src/bin/sh: error.c error.h exec.h output.h trap.h
src/bin/test: test.c
src/lib/libpuffs: opdump.c
src/lib/lua/gpio: gpio.c
src/lib/lua/sqlite: sqlite.c
src/libexec/fingerd: fingerd.c
src/libexec/identd: identd.c identd.h
src/sbin/dkscan_bsdlabel: dkscan_util.h
src/sbin/fdisk: fdisk.c
src/sbin/sysctl: sysctl.c
src/sys/ddb: db_output.h
src/sys/rump/include/rump: rumpuser.h
src/tests: h_macros.h
src/tests/fs/ffs: t_quota2_1.c t_quota2_remount.c
src/tests/kernel: gen_t_subr_prf
src/tests/lib/libc/ssp: h_vsnprintf.c h_vsprintf.c
src/tests/lib/libc/stdlib: t_getenv_thread.c
src/tests/modules: t_modctl.c
src/usr.bin/bthset: bthset.c
src/usr.bin/getent: getent.c
src/usr.bin/m4: extern.h
src/usr.bin/su: su_pam.c
src/usr.sbin/cpuctl: cpuctl.h
src/usr.sbin/envstat: config_lex.l config_yacc.y
src/usr.sbin/ldpd: ldp_errors.c ldp_errors.h mpls_routes.c
src/usr.sbin/mtree: spec.c
src/usr.sbin/powerd: powerd.c
src/usr.sbin/ypserv/ypserv: ypserv.c
Log Message:
Add __printflike attribution to use vprintf and friends with an argument
as format string.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/bin/expr/expr.y
cvs rdiff -u -r1.37 -r1.38 src/bin/sh/error.c
cvs rdiff -u -r1.18 -r1.19 src/bin/sh/error.h
cvs rdiff -u -r1.22 -r1.23 src/bin/sh/exec.h
cvs rdiff -u -r1.23 -r1.24 src/bin/sh/output.h
cvs rdiff -u -r1.19 -r1.20 src/bin/sh/trap.h
cvs rdiff -u -r1.38 -r1.39 src/bin/test/test.c
cvs rdiff -u -r1.35 -r1.36 src/lib/libpuffs/opdump.c
cvs rdiff -u -r1.6 -r1.7 src/lib/lua/gpio/gpio.c
cvs rdiff -u -r1.3 -r1.4 src/lib/lua/sqlite/sqlite.c
cvs rdiff -u -r1.26 -r1.27 src/libexec/fingerd/fingerd.c
cvs rdiff -u -r1.33 -r1.34 src/libexec/identd/identd.c
cvs rdiff -u -r1.8 -r1.9 src/libexec/identd/identd.h
cvs rdiff -u -r1.3 -r1.4 src/sbin/dkscan_bsdlabel/dkscan_util.h
cvs rdiff -u -r1.138 -r1.139 src/sbin/fdisk/fdisk.c
cvs rdiff -u -r1.141 -r1.142 src/sbin/sysctl/sysctl.c
cvs rdiff -u -r1.20 -r1.21 src/sys/ddb/db_output.h
cvs rdiff -u -r1.71 -r1.72 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.7 -r1.8 src/tests/h_macros.h
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/ffs/t_quota2_1.c \
src/tests/fs/ffs/t_quota2_remount.c
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/gen_t_subr_prf
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/ssp/h_vsnprintf.c \
src/tests/lib/libc/ssp/h_vsprintf.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/stdlib/t_getenv_thread.c
cvs rdiff -u -r1.7 -r1.8 src/tests/modules/t_modctl.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/bthset/bthset.c
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/getent/getent.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/m4/extern.h
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/su/su_pam.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/cpuctl/cpuctl.h
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/envstat/config_lex.l
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/envstat/config_yacc.y
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/ldpd/ldp_errors.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/ldpd/ldp_errors.h
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ldpd/mpls_routes.c
cvs rdiff -u -r1.79 -r1.80 src/usr.sbin/mtree/spec.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/powerd/powerd.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/ypserv/ypserv/ypserv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/expr/expr.y
diff -u src/bin/expr/expr.y:1.37 src/bin/expr/expr.y:1.38
--- src/bin/expr/expr.y:1.37 Thu Aug 25 01:11:47 2011
+++ src/bin/expr/expr.y Thu Mar 15 02:02:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: expr.y,v 1.37 2011/08/25 01:11:47 joerg Exp $ */
+/* $NetBSD: expr.y,v 1.38 2012/03/15 02:02:20 joerg Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
%{
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: expr.y,v 1.37 2011/08/25 01:11:47 joerg Exp $");
+__RCSID("$NetBSD: expr.y,v 1.38 2012/03/15 02:02:20 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -430,7 +430,7 @@ yylex(void)
/*
* Print error message and exit with error 2 (syntax error).
*/
-static void
+static __printflike(1, 2) void
yyerror(const char *fmt, ...)
{
va_list arg;
Index: src/bin/sh/error.c
diff -u src/bin/sh/error.c:1.37 src/bin/sh/error.c:1.38
--- src/bin/sh/error.c:1.37 Thu Oct 16 14:36:40 2008
+++ src/bin/sh/error.c Thu Mar 15 02:02:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: error.c,v 1.37 2008/10/16 14:36:40 dholland Exp $ */
+/* $NetBSD: error.c,v 1.38 2012/03/15 02:02:20 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: error.c,v 1.37 2008/10/16 14:36:40 dholland Exp $");
+__RCSID("$NetBSD: error.c,v 1.38 2012/03/15 02:02:20 joerg Exp $");
#endif
#endif /* not lint */
@@ -120,7 +120,7 @@ onint(void)
/* NOTREACHED */
}
-static void
+static __printflike(2, 0) void
exvwarning(int sv_errno, const char *msg, va_list ap)
{
/* Partially emulate line buffered output so that:
@@ -151,7 +151,7 @@ exvwarning(int sv_errno, const char *msg
* is not NULL then error prints an error message using printf style
* formatting. It then raises the error exception.
*/
-static void
+static __printflike(2, 0) void
exverror(int cond, const char *msg, va_list ap)
{
CLEAR_PENDING_INT;
Index: src/bin/sh/error.h
diff -u src/bin/sh/error.h:1.18 src/bin/sh/error.h:1.19
--- src/bin/sh/error.h:1.18 Tue Aug 23 09:59:20 2011
+++ src/bin/sh/error.h Thu Mar 15 02:02:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: error.h,v 1.18 2011/08/23 09:59:20 christos Exp $ */
+/* $NetBSD: error.h,v 1.19 2012/03/15 02:02:20 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -89,33 +89,23 @@ extern volatile int intpending;
#define int_pending() intpending
#if ! defined(SHELL_BUILTIN)
-void exraise(int) __attribute__((__noreturn__));
+void exraise(int) __dead;
void onint(void);
-void error(const char *, ...) __attribute__((__noreturn__))
- __attribute__((__format__(__printf__, 1, 2)));
-void exerror(int, const char *, ...) __attribute__((__noreturn__))
- __attribute__((__format__(__printf__, 2, 3)));
+void error(const char *, ...) __dead __printflike(1, 2);
+void exerror(int, const char *, ...) __dead __printflike(2, 3);
const char *errmsg(int, int);
#endif /* ! SHELL_BUILTIN */
-void sh_err(int, const char *, ...) __attribute__((__noreturn__))
- __attribute__((__format__(__printf__, 2, 3)));
-void sh_verr(int, const char *, va_list) __attribute__((__noreturn__))
- __attribute__((__format__(__printf__, 2, 0)));
-void sh_errx(int, const char *, ...) __attribute__((__noreturn__))
- __attribute__((__format__(__printf__, 2, 3)));
-void sh_verrx(int, const char *, va_list) __attribute__((__noreturn__))
- __attribute__((__format__(__printf__, 2, 0)));
-void sh_warn(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
-void sh_vwarn(const char *, va_list)
- __attribute__((__format__(__printf__, 1, 0)));
-void sh_warnx(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
-void sh_vwarnx(const char *, va_list)
- __attribute__((__format__(__printf__, 1, 0)));
+void sh_err(int, const char *, ...) __dead __printflike(2, 3);
+void sh_verr(int, const char *, va_list) __dead __printflike(2, 0);
+void sh_errx(int, const char *, ...) __dead __printflike(2, 3);
+void sh_verrx(int, const char *, va_list) __dead __printflike(2, 0);
+void sh_warn(const char *, ...) __printflike(1, 2);
+void sh_vwarn(const char *, va_list) __printflike(1, 0);
+void sh_warnx(const char *, ...) __printflike(1, 2);
+void sh_vwarnx(const char *, va_list) __printflike(1, 0);
-void sh_exit(int) __attribute__((__noreturn__));
+void sh_exit(int) __dead;
/*
Index: src/bin/sh/exec.h
diff -u src/bin/sh/exec.h:1.22 src/bin/sh/exec.h:1.23
--- src/bin/sh/exec.h:1.22 Sat Jun 18 21:18:46 2011
+++ src/bin/sh/exec.h Thu Mar 15 02:02:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.h,v 1.22 2011/06/18 21:18:46 christos Exp $ */
+/* $NetBSD: exec.h,v 1.23 2012/03/15 02:02:20 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -61,8 +61,7 @@ struct cmdentry {
extern const char *pathopt; /* set by padvance */
-void shellexec(char **, char **, const char *, int, int)
- __attribute__((__noreturn__));
+void shellexec(char **, char **, const char *, int, int) __dead;
char *padvance(const char **, const char *);
void find_command(char *, struct cmdentry *, int, const char *);
int (*find_builtin(char *))(int, char **);
Index: src/bin/sh/output.h
diff -u src/bin/sh/output.h:1.23 src/bin/sh/output.h:1.24
--- src/bin/sh/output.h:1.23 Tue Aug 23 09:59:20 2011
+++ src/bin/sh/output.h Thu Mar 15 02:02:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: output.h,v 1.23 2011/08/23 09:59:20 christos Exp $ */
+/* $NetBSD: output.h,v 1.24 2012/03/15 02:02:20 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -66,18 +66,13 @@ void emptyoutbuf(struct output *);
void flushall(void);
void flushout(struct output *);
void freestdout(void);
-void outfmt(struct output *, const char *, ...)
- __attribute__((__format__(__printf__, 2, 3)));
-void out1fmt(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+void outfmt(struct output *, const char *, ...) __printflike(2, 3);
+void out1fmt(const char *, ...) __printflike(1, 2);
#ifdef DEBUG
-void debugprintf(const char *, ...)
- __attribute__((__format__(__printf__, 1, 2)));
+void debugprintf(const char *, ...) __printflike(1, 2);
#endif
-void fmtstr(char *, size_t, const char *, ...)
- __attribute__((__format__(__printf__, 3, 4)));
-void doformat(struct output *, const char *, va_list)
- __attribute__((__format__(__printf__, 2, 0)));
+void fmtstr(char *, size_t, const char *, ...) __printflike(3, 4);
+void doformat(struct output *, const char *, va_list) __printflike(2, 0);
int xwrite(int, char *, int);
int xioctl(int, unsigned long, char *);
Index: src/bin/sh/trap.h
diff -u src/bin/sh/trap.h:1.19 src/bin/sh/trap.h:1.20
--- src/bin/sh/trap.h:1.19 Sat Jun 18 21:18:46 2011
+++ src/bin/sh/trap.h Thu Mar 15 02:02:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.h,v 1.19 2011/06/18 21:18:46 christos Exp $ */
+/* $NetBSD: trap.h,v 1.20 2012/03/15 02:02:20 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,4 +42,4 @@ void ignoresig(int, int);
void onsig(int);
void dotrap(void);
void setinteractive(int);
-void exitshell(int) __attribute__((__noreturn__));
+void exitshell(int) __dead;
Index: src/bin/test/test.c
diff -u src/bin/test/test.c:1.38 src/bin/test/test.c:1.39
--- src/bin/test/test.c:1.38 Mon Aug 29 14:51:19 2011
+++ src/bin/test/test.c Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: test.c,v 1.38 2011/08/29 14:51:19 joerg Exp $ */
+/* $NetBSD: test.c,v 1.39 2012/03/15 02:02:21 joerg Exp $ */
/*
* test(1); version 7-like -- author Erik Baalbergen
@@ -12,7 +12,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: test.c,v 1.38 2011/08/29 14:51:19 joerg Exp $");
+__RCSID("$NetBSD: test.c,v 1.39 2012/03/15 02:02:21 joerg Exp $");
#endif
#include <sys/stat.h>
@@ -172,10 +172,10 @@ static int olderf(const char *, const ch
static int equalf(const char *, const char *);
#if defined(SHELL)
-extern void error(const char *, ...) __dead;
+extern void error(const char *, ...) __dead __printflike(1, 2);
extern void *ckmalloc(size_t);
#else
-static void error(const char *, ...) __dead;
+static void error(const char *, ...) __dead __printflike(1, 2);
static void
error(const char *msg, ...)
Index: src/lib/libpuffs/opdump.c
diff -u src/lib/libpuffs/opdump.c:1.35 src/lib/libpuffs/opdump.c:1.36
--- src/lib/libpuffs/opdump.c:1.35 Fri Aug 20 16:35:05 2010
+++ src/lib/libpuffs/opdump.c Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: opdump.c,v 1.35 2010/08/20 16:35:05 pooka Exp $ */
+/* $NetBSD: opdump.c,v 1.36 2012/03/15 02:02:21 joerg Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: opdump.c,v 1.35 2010/08/20 16:35:05 pooka Exp $");
+__RCSID("$NetBSD: opdump.c,v 1.36 2012/03/15 02:02:21 joerg Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -148,7 +148,7 @@ const char *puffsdump_flush_revmap[] = {
};
size_t puffsdump_flush_count = __arraycount(puffsdump_flush_revmap);
-static void
+static __printflike(1, 2) void
mydprintf(const char *fmt, ...)
{
va_list ap;
Index: src/lib/lua/gpio/gpio.c
diff -u src/lib/lua/gpio/gpio.c:1.6 src/lib/lua/gpio/gpio.c:1.7
--- src/lib/lua/gpio/gpio.c:1.6 Sun Nov 13 16:56:15 2011
+++ src/lib/lua/gpio/gpio.c Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.6 2011/11/13 16:56:15 mbalmer Exp $ */
+/* $NetBSD: gpio.c,v 1.7 2012/03/15 02:02:21 joerg Exp $ */
/*
* Copyright (c) 2011 Marc Balmer <[email protected]>
@@ -45,7 +45,7 @@
#define GPIO_METATABLE "GPIO object methods"
-static void
+static __printflike(2, 3) void
gpio_error(lua_State *L, const char *fmt, ...)
{
va_list ap;
Index: src/lib/lua/sqlite/sqlite.c
diff -u src/lib/lua/sqlite/sqlite.c:1.3 src/lib/lua/sqlite/sqlite.c:1.4
--- src/lib/lua/sqlite/sqlite.c:1.3 Sat Oct 15 12:58:20 2011
+++ src/lib/lua/sqlite/sqlite.c Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sqlite.c,v 1.3 2011/10/15 12:58:20 mbalmer Exp $ */
+/* $NetBSD: sqlite.c,v 1.4 2012/03/15 02:02:21 joerg Exp $ */
/*
* Copyright (c) 2011 Marc Balmer <[email protected]>
@@ -42,7 +42,7 @@
int luaopen_sqlite(lua_State*);
-static void
+static __printflike(2, 3) void
sqlite_error(lua_State *L, const char *fmt, ...)
{
va_list ap;
Index: src/libexec/fingerd/fingerd.c
diff -u src/libexec/fingerd/fingerd.c:1.26 src/libexec/fingerd/fingerd.c:1.27
--- src/libexec/fingerd/fingerd.c:1.26 Sat Aug 27 15:08:58 2011
+++ src/libexec/fingerd/fingerd.c Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fingerd.c,v 1.26 2011/08/27 15:08:58 joerg Exp $ */
+/* $NetBSD: fingerd.c,v 1.27 2012/03/15 02:02:21 joerg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: fingerd.c,v 1.26 2011/08/27 15:08:58 joerg Exp $");
+__RCSID("$NetBSD: fingerd.c,v 1.27 2012/03/15 02:02:21 joerg Exp $");
#endif
#endif /* not lint */
@@ -58,7 +58,7 @@ __RCSID("$NetBSD: fingerd.c,v 1.26 2011/
#include <string.h>
#include "pathnames.h"
-__dead static void my_err(const char *, ...);
+__dead static void my_err(const char *, ...) __printflike(1, 2);
int
main(int argc, char *argv[])
Index: src/libexec/identd/identd.c
diff -u src/libexec/identd/identd.c:1.33 src/libexec/identd/identd.c:1.34
--- src/libexec/identd/identd.c:1.33 Mon Aug 29 20:41:06 2011
+++ src/libexec/identd/identd.c Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: identd.c,v 1.33 2011/08/29 20:41:06 joerg Exp $ */
+/* $NetBSD: identd.c,v 1.34 2012/03/15 02:02:21 joerg Exp $ */
/*
* identd.c - TCP/IP Ident protocol server.
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: identd.c,v 1.33 2011/08/29 20:41:06 joerg Exp $");
+__RCSID("$NetBSD: identd.c,v 1.34 2012/03/15 02:02:21 joerg Exp $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -63,7 +63,7 @@ static void random_string(char *, size_
static int change_format(const char *, struct passwd *, char *, size_t);
__dead static void timeout_handler(int);
__dead static void fatal(const char *);
-__dead static void die(const char *, ...);
+__dead static void die(const char *, ...) __printflike(1, 2);
static int bflag, eflag, fflag, iflag, Iflag;
static int lflag, Lflag, nflag, Nflag, rflag;
Index: src/libexec/identd/identd.h
diff -u src/libexec/identd/identd.h:1.8 src/libexec/identd/identd.h:1.9
--- src/libexec/identd/identd.h:1.8 Sun Apr 3 22:15:32 2005
+++ src/libexec/identd/identd.h Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: identd.h,v 1.8 2005/04/03 22:15:32 peter Exp $ */
+/* $NetBSD: identd.h,v 1.9 2012/03/15 02:02:21 joerg Exp $ */
/*
* identd.h - TCP/IP Ident protocol server.
@@ -14,7 +14,7 @@
#define satosin6(sa) ((struct sockaddr_in6 *)(sa))
#define in_hosteq(s,t) ((s).s_addr == (t).s_addr)
-void maybe_syslog(int, const char *, ...);
+void maybe_syslog(int, const char *, ...) __printflike(2, 3);
#ifdef WITH_PF
int pf_natlookup(struct sockaddr_storage *, struct sockaddr *, int *);
Index: src/sbin/dkscan_bsdlabel/dkscan_util.h
diff -u src/sbin/dkscan_bsdlabel/dkscan_util.h:1.3 src/sbin/dkscan_bsdlabel/dkscan_util.h:1.4
--- src/sbin/dkscan_bsdlabel/dkscan_util.h:1.3 Sat Aug 27 16:43:07 2011
+++ src/sbin/dkscan_bsdlabel/dkscan_util.h Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dkscan_util.h,v 1.3 2011/08/27 16:43:07 joerg Exp $ */
+/* $NetBSD: dkscan_util.h,v 1.4 2012/03/15 02:02:21 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,8 +37,8 @@ u_int dkcksum_sized(struct disklabel *,
int dkwedge_read(struct disk *pdk, struct vnode *vp, daddr_t blkno,
void *tbuf, size_t len);
int dkwedge_add(struct dkwedge_info *dkw);
-void aprint_error(const char *format, ...);
-void aprint_verbose(const char *format, ...);
+void aprint_error(const char *format, ...) __printflike(1, 2);
+void aprint_verbose(const char *format, ...) __printflike(1, 2);
extern int verbose; /* are we verbose? */
extern int no_action; /* don't do anything, just print info */
Index: src/sbin/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.138 src/sbin/fdisk/fdisk.c:1.139
--- src/sbin/fdisk/fdisk.c:1.138 Fri Dec 2 15:21:15 2011
+++ src/sbin/fdisk/fdisk.c Thu Mar 15 02:02:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.138 2011/12/02 15:21:15 christos Exp $ */
+/* $NetBSD: fdisk.c,v 1.139 2012/03/15 02:02:21 joerg Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fdisk.c,v 1.138 2011/12/02 15:21:15 christos Exp $");
+__RCSID("$NetBSD: fdisk.c,v 1.139 2012/03/15 02:02:21 joerg Exp $");
#endif /* not lint */
#define MBRPTYPENAMES
@@ -286,7 +286,7 @@ static int read_s0(daddr_t, struct mbr_s
static int write_mbr(void);
static int read_gpt(daddr_t, struct gpt_hdr *);
static int delete_gpt(struct gpt_hdr *);
-static int yesno(const char *, ...);
+static int yesno(const char *, ...) __printflike(1, 2);
static int64_t decimal(const char *, int64_t, int, int64_t, int64_t);
#define DEC_SEC 1 /* asking for a sector number */
#define DEC_RND 2 /* round to end of first track */
Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.141 src/sbin/sysctl/sysctl.c:1.142
--- src/sbin/sysctl/sysctl.c:1.141 Sun Mar 11 23:33:00 2012
+++ src/sbin/sysctl/sysctl.c Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.c,v 1.141 2012/03/11 23:33:00 christos Exp $ */
+/* $NetBSD: sysctl.c,v 1.142 2012/03/15 02:02:22 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)sysctl.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: sysctl.c,v 1.141 2012/03/11 23:33:00 christos Exp $");
+__RCSID("$NetBSD: sysctl.c,v 1.142 2012/03/15 02:02:22 joerg Exp $");
#endif
#endif /* not lint */
@@ -146,7 +146,7 @@ static void getdesc(int *, u_int, struct
static void trim_whitespace(char *, int);
static void sysctlerror(int);
static void sysctlparseerror(u_int, const char *);
-static void sysctlperror(const char *, ...);
+static void sysctlperror(const char *, ...) __printflike(1, 2);
#define EXIT(n) do { \
if (fn == NULL) exit(n); else return; } while (/*CONSTCOND*/0)
Index: src/sys/ddb/db_output.h
diff -u src/sys/ddb/db_output.h:1.20 src/sys/ddb/db_output.h:1.21
--- src/sys/ddb/db_output.h:1.20 Fri Feb 10 02:14:23 2012
+++ src/sys/ddb/db_output.h Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_output.h,v 1.20 2012/02/10 02:14:23 christos Exp $ */
+/* $NetBSD: db_output.h,v 1.21 2012/03/15 02:02:22 joerg Exp $ */
/*
* Mach Operating System
@@ -38,7 +38,7 @@ void db_force_whitespace(void);
void db_putchar(int);
int db_print_position(void);
void db_printf(const char *, ...) __printflike(1, 2);
-void db_vprintf(const char *, va_list);
+void db_vprintf(const char *, va_list) __printflike(1, 0);
void db_format_radix(char *, size_t, quad_t, int);
void db_format_hex(char *, size_t, quad_t, int);
void db_end_line(void);
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.71 src/sys/rump/include/rump/rumpuser.h:1.72
--- src/sys/rump/include/rump/rumpuser.h:1.71 Mon Nov 28 08:05:06 2011
+++ src/sys/rump/include/rump/rumpuser.h Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.71 2011/11/28 08:05:06 tls Exp $ */
+/* $NetBSD: rumpuser.h,v 1.72 2012/03/15 02:02:22 joerg Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -108,7 +108,7 @@ void rumpuser_seterrno(int);
int rumpuser_writewatchfile_setup(int, int, intptr_t, int *);
int rumpuser_writewatchfile_wait(int, intptr_t *, int *);
-int rumpuser_dprintf(const char *, ...);
+int rumpuser_dprintf(const char *, ...) __printflike(1, 2);
int rumpuser_getnhostcpu(void);
Index: src/tests/h_macros.h
diff -u src/tests/h_macros.h:1.7 src/tests/h_macros.h:1.8
--- src/tests/h_macros.h:1.7 Thu Jun 16 15:33:24 2011
+++ src/tests/h_macros.h Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: h_macros.h,v 1.7 2011/06/16 15:33:24 joerg Exp $ */
+/* $NetBSD: h_macros.h,v 1.8 2012/03/15 02:02:22 joerg Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@ do { \
ATF_REQUIRE_MSG(RZ_rv == 0, "%s: %s", #x, strerror(RZ_rv)); \
} while (/*CONSTCOND*/0)
-static __inline void
+static __inline __printflike(1, 2) void
atf_tc_fail_errno(const char *fmt, ...)
{
va_list ap;
Index: src/tests/fs/ffs/t_quota2_1.c
diff -u src/tests/fs/ffs/t_quota2_1.c:1.3 src/tests/fs/ffs/t_quota2_1.c:1.4
--- src/tests/fs/ffs/t_quota2_1.c:1.3 Thu Jun 16 15:33:24 2011
+++ src/tests/fs/ffs/t_quota2_1.c Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_quota2_1.c,v 1.3 2011/06/16 15:33:24 joerg Exp $ */
+/* $NetBSD: t_quota2_1.c,v 1.4 2012/03/15 02:02:22 joerg Exp $ */
/*
* Basic tests for quota2
@@ -72,10 +72,9 @@ ATF_TC(quota_##name); \
\
ATF_TC_HEAD(quota_##name, tc) \
{ \
- char buf[1000]; \
- snprintf(buf, sizeof(buf), "test quotas with %d users and groups, " \
- descr, nent); \
- atf_tc_set_md_var(tc, "descr", buf); \
+ atf_tc_set_md_var(tc, "descr", \
+ "test quotas with %d users and groups, %s", \
+ nent, descr); \
} \
\
ATF_TC_BODY(quota_##name, tc) \
Index: src/tests/fs/ffs/t_quota2_remount.c
diff -u src/tests/fs/ffs/t_quota2_remount.c:1.3 src/tests/fs/ffs/t_quota2_remount.c:1.4
--- src/tests/fs/ffs/t_quota2_remount.c:1.3 Thu Jun 16 15:33:25 2011
+++ src/tests/fs/ffs/t_quota2_remount.c Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_quota2_remount.c,v 1.3 2011/06/16 15:33:25 joerg Exp $ */
+/* $NetBSD: t_quota2_remount.c,v 1.4 2012/03/15 02:02:22 joerg Exp $ */
/*
* Basic tests for quota2
@@ -104,10 +104,8 @@ ATF_TC(quota_##name); \
\
ATF_TC_HEAD(quota_##name, tc) \
{ \
- char buf[1000]; \
- snprintf(buf, sizeof(buf), "test filesystem remount with quotas, " \
- descr); \
- atf_tc_set_md_var(tc, "descr", buf); \
+ atf_tc_set_md_var(tc, "descr", \
+ "test filesystem remount with quotas, %s", descr); \
} \
\
ATF_TC_BODY(quota_##name, tc) \
Index: src/tests/kernel/gen_t_subr_prf
diff -u src/tests/kernel/gen_t_subr_prf:1.1 src/tests/kernel/gen_t_subr_prf:1.2
--- src/tests/kernel/gen_t_subr_prf:1.1 Thu Nov 24 01:46:40 2011
+++ src/tests/kernel/gen_t_subr_prf Thu Mar 15 02:02:22 2012
@@ -24,8 +24,8 @@ static const char hexdigits[] = "0123456
typedef int device_t;
#define device_xname(a) ""
-int kprintf(const char *, int, void *, char *, va_list);
-void device_printf(device_t, const char *, ...);
+int kprintf(const char *, int, void *, char *, va_list) __printflike(1, 0);
+void device_printf(device_t, const char *, ...) __printflike(2, 3);
static void
empty(void)
Index: src/tests/lib/libc/ssp/h_vsnprintf.c
diff -u src/tests/lib/libc/ssp/h_vsnprintf.c:1.2 src/tests/lib/libc/ssp/h_vsnprintf.c:1.3
--- src/tests/lib/libc/ssp/h_vsnprintf.c:1.2 Tue Dec 28 16:18:46 2010
+++ src/tests/lib/libc/ssp/h_vsnprintf.c Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: h_vsnprintf.c,v 1.2 2010/12/28 16:18:46 christos Exp $ */
+/* $NetBSD: h_vsnprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,13 +29,13 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: h_vsnprintf.c,v 1.2 2010/12/28 16:18:46 christos Exp $");
+__RCSID("$NetBSD: h_vsnprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $");
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
-void wrap(size_t, const char *, ...);
+static void wrap(size_t, const char *, ...) __printflike(2, 3);
void
wrap(size_t len, const char *fmt, ...)
Index: src/tests/lib/libc/ssp/h_vsprintf.c
diff -u src/tests/lib/libc/ssp/h_vsprintf.c:1.2 src/tests/lib/libc/ssp/h_vsprintf.c:1.3
--- src/tests/lib/libc/ssp/h_vsprintf.c:1.2 Tue Dec 28 16:18:46 2010
+++ src/tests/lib/libc/ssp/h_vsprintf.c Thu Mar 15 02:02:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: h_vsprintf.c,v 1.2 2010/12/28 16:18:46 christos Exp $ */
+/* $NetBSD: h_vsprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,12 +29,12 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: h_vsprintf.c,v 1.2 2010/12/28 16:18:46 christos Exp $");
+__RCSID("$NetBSD: h_vsprintf.c,v 1.3 2012/03/15 02:02:22 joerg Exp $");
#include <stdio.h>
#include <stdarg.h>
-static void wrap(const char *, ...);
+static void wrap(const char *, ...) __printflike(1, 2);
static void
wrap(const char *fmt, ...)
Index: src/tests/lib/libc/stdlib/t_getenv_thread.c
diff -u src/tests/lib/libc/stdlib/t_getenv_thread.c:1.1 src/tests/lib/libc/stdlib/t_getenv_thread.c:1.2
--- src/tests/lib/libc/stdlib/t_getenv_thread.c:1.1 Fri Jul 15 13:54:31 2011
+++ src/tests/lib/libc/stdlib/t_getenv_thread.c Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_getenv_thread.c,v 1.1 2011/07/15 13:54:31 jruoho Exp $ */
+/* $NetBSD: t_getenv_thread.c,v 1.2 2012/03/15 02:02:23 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getenv_thread.c,v 1.1 2011/07/15 13:54:31 jruoho Exp $");
+__RCSID("$NetBSD: t_getenv_thread.c,v 1.2 2012/03/15 02:02:23 joerg Exp $");
#include <atf-c.h>
#include <errno.h>
@@ -140,13 +140,9 @@ thread_unsetenv(void *arg)
ATF_TC(getenv_r_thread);
ATF_TC_HEAD(getenv_r_thread, tc)
{
- char timeout[32];
atf_tc_set_md_var(tc, "descr", "Test getenv_r(3) with threads");
-
- (void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
- atf_tc_set_md_var(tc, "timeout", timeout);
+ atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
}
ATF_TC_BODY(getenv_r_thread, tc)
@@ -170,13 +166,8 @@ ATF_TC_BODY(getenv_r_thread, tc)
ATF_TC(putenv_thread);
ATF_TC_HEAD(putenv_thread, tc)
{
- char timeout[32];
-
atf_tc_set_md_var(tc, "descr", "Test concurrent access by putenv(3)");
-
- (void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
- atf_tc_set_md_var(tc, "timeout", timeout);
+ atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
}
ATF_TC_BODY(putenv_thread, tc)
@@ -200,13 +191,8 @@ ATF_TC_BODY(putenv_thread, tc)
ATF_TC(setenv_thread);
ATF_TC_HEAD(setenv_thread, tc)
{
- char timeout[32];
-
atf_tc_set_md_var(tc, "descr", "Test concurrent access by setenv(3)");
-
- (void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
- atf_tc_set_md_var(tc, "timeout", timeout);
+ atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
}
ATF_TC_BODY(setenv_thread, tc)
@@ -230,13 +216,8 @@ ATF_TC_BODY(setenv_thread, tc)
ATF_TC(unsetenv_thread);
ATF_TC_HEAD(unsetenv_thread, tc)
{
- char timeout[32];
-
atf_tc_set_md_var(tc, "descr", "Test unsetenv(3) with threads");
-
- (void)snprintf(timeout, sizeof(timeout), "%d", THREADED_RUN_TIME + 5);
-
- atf_tc_set_md_var(tc, "timeout", timeout);
+ atf_tc_set_md_var(tc, "timeout", "%d", THREADED_RUN_TIME + 5);
}
ATF_TC_BODY(unsetenv_thread, tc)
Index: src/tests/modules/t_modctl.c
diff -u src/tests/modules/t_modctl.c:1.7 src/tests/modules/t_modctl.c:1.8
--- src/tests/modules/t_modctl.c:1.7 Tue Mar 13 05:56:46 2012
+++ src/tests/modules/t_modctl.c Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_modctl.c,v 1.7 2012/03/13 05:56:46 jruoho Exp $ */
+/* $NetBSD: t_modctl.c,v 1.8 2012/03/15 02:02:23 joerg Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: t_modctl.c,v 1.7 2012/03/13 05:56:46 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: t_modctl.c,v 1.8 2012/03/15 02:02:23 joerg Exp $");
#include <sys/module.h>
#include <sys/sysctl.h>
@@ -195,7 +195,7 @@ k_helper_is_present(enum presence_check
* occurs when loading the module, an error message is printed and the
* test case is aborted.
*/
-static int
+static __printflike(3, 4) int
load(prop_dictionary_t props, bool fatal, const char *fmt, ...)
{
int err;
@@ -300,7 +300,7 @@ ATF_TC_BODY(cmd_load, tc)
for (i = 0; i < MAXPATHLEN - 1; i++)
longname[i] = 'a';
longname[MAXPATHLEN - 1] = '\0';
- ATF_CHECK(load(NULL, false, longname) == ENAMETOOLONG);
+ ATF_CHECK(load(NULL, false, "%s", longname) == ENAMETOOLONG);
ATF_CHECK(!k_helper_is_present(stat_check));
load(NULL, true, "%s/k_helper/k_helper.kmod",
Index: src/usr.bin/bthset/bthset.c
diff -u src/usr.bin/bthset/bthset.c:1.7 src/usr.bin/bthset/bthset.c:1.8
--- src/usr.bin/bthset/bthset.c:1.7 Mon Aug 29 13:47:16 2011
+++ src/usr.bin/bthset/bthset.c Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bthset.c,v 1.7 2011/08/29 13:47:16 joerg Exp $ */
+/* $NetBSD: bthset.c,v 1.8 2012/03/15 02:02:23 joerg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2006 Itronix, Inc. All rights reserved.");
-__RCSID("$NetBSD: bthset.c,v 1.7 2011/08/29 13:47:16 joerg Exp $");
+__RCSID("$NetBSD: bthset.c,v 1.8 2012/03/15 02:02:23 joerg Exp $");
#include <sys/types.h>
#include <sys/audioio.h>
@@ -69,7 +69,7 @@ static void do_ring(int, short, void *);
static void do_mixer(int, short, void *);
static void do_rfcomm(int, short, void *);
static void do_server(int, short, void *);
-static int send_rfcomm(const char *, ...);
+static int send_rfcomm(const char *, ...) __printflike(1, 2);
static int init_mixer(struct btsco_info *, const char *);
static int init_rfcomm(struct btsco_info *);
Index: src/usr.bin/getent/getent.c
diff -u src/usr.bin/getent/getent.c:1.18 src/usr.bin/getent/getent.c:1.19
--- src/usr.bin/getent/getent.c:1.18 Tue Oct 11 19:24:43 2011
+++ src/usr.bin/getent/getent.c Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: getent.c,v 1.18 2011/10/11 19:24:43 christos Exp $ */
+/* $NetBSD: getent.c,v 1.19 2012/03/15 02:02:23 joerg Exp $ */
/*-
* Copyright (c) 2004-2006 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: getent.c,v 1.18 2011/10/11 19:24:43 christos Exp $");
+__RCSID("$NetBSD: getent.c,v 1.19 2012/03/15 02:02:23 joerg Exp $");
#endif /* not lint */
#include <sys/socket.h>
@@ -175,7 +175,7 @@ parsenum(const char *word, unsigned long
* then the aliases (beginning with prefix, separated by sep),
* then a newline
*/
-static void
+static __printflike(4, 5) void
printfmtstrings(char *strings[], const char *prefix, const char *sep,
const char *fmt, ...)
{
Index: src/usr.bin/m4/extern.h
diff -u src/usr.bin/m4/extern.h:1.15 src/usr.bin/m4/extern.h:1.16
--- src/usr.bin/m4/extern.h:1.15 Tue Sep 6 18:16:01 2011
+++ src/usr.bin/m4/extern.h Thu Mar 15 02:02:23 2012
@@ -1,5 +1,5 @@
/* $OpenBSD: extern.h,v 1.49 2009/10/14 17:19:47 sthen Exp $ */
-/* $NetBSD: extern.h,v 1.15 2011/09/06 18:16:01 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.16 2012/03/15 02:02:23 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -101,13 +101,14 @@ extern void pbnumbase(int, int, int);
extern void pbunsigned(unsigned long);
extern void pbstr(const char *);
extern void pushback(int);
-extern void *xalloc(size_t, const char *fmt, ...);
-extern void *xrealloc(void *, size_t, const char *fmt, ...);
+extern void *xalloc(size_t, const char *fmt, ...) __printflike(2, 3);
+extern void *xrealloc(void *, size_t, const char *fmt, ...)
+ __printflike(3, 4);
extern char *xstrdup(const char *);
extern void resizedivs(int);
extern size_t buffer_mark(void);
extern void dump_buffer(FILE *, size_t);
-extern void __dead m4errx(int, const char *, ...);
+extern void __dead m4errx(int, const char *, ...) __printflike(2, 3);
extern int obtain_char(struct input_file *);
extern void set_input(struct input_file *, FILE *, const char *);
Index: src/usr.bin/su/su_pam.c
diff -u src/usr.bin/su/su_pam.c:1.16 src/usr.bin/su/su_pam.c:1.17
--- src/usr.bin/su/su_pam.c:1.16 Sat Oct 2 10:55:36 2010
+++ src/usr.bin/su/su_pam.c Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: su_pam.c,v 1.16 2010/10/02 10:55:36 tron Exp $ */
+/* $NetBSD: su_pam.c,v 1.17 2012/03/15 02:02:23 joerg Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988\
#if 0
static char sccsid[] = "@(#)su.c 8.3 (Berkeley) 4/2/94";*/
#else
-__RCSID("$NetBSD: su_pam.c,v 1.16 2010/10/02 10:55:36 tron Exp $");
+__RCSID("$NetBSD: su_pam.c,v 1.17 2012/03/15 02:02:23 joerg Exp $");
#endif
#endif /* not lint */
@@ -81,7 +81,7 @@ static const struct pam_conv pamc = { &o
#define ARGSTR ARGSTRX
#endif
-static void logit(const char *, ...);
+static void logit(const char *, ...) __printflike(1, 2);
int
main(int argc, char **argv)
Index: src/usr.sbin/cpuctl/cpuctl.h
diff -u src/usr.sbin/cpuctl/cpuctl.h:1.2 src/usr.sbin/cpuctl/cpuctl.h:1.3
--- src/usr.sbin/cpuctl/cpuctl.h:1.2 Tue Dec 16 22:44:51 2008
+++ src/usr.sbin/cpuctl/cpuctl.h Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.h,v 1.2 2008/12/16 22:44:51 christos Exp $ */
+/* $NetBSD: cpuctl.h,v 1.3 2012/03/15 02:02:23 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -26,11 +26,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-int aprint_normal(const char *, ...);
-int aprint_verbose(const char *, ...);
-int aprint_error(const char *, ...);
-int aprint_normal_dev(const char *, const char *, ...);
-int aprint_verbose_dev(const char *, const char *, ...);
-int aprint_error_dev(const char *, const char *, ...);
+int aprint_normal(const char *, ...) __printflike(1, 2);
+int aprint_verbose(const char *, ...) __printflike(1, 2);
+int aprint_error(const char *, ...) __printflike(1, 2);
+int aprint_normal_dev(const char *, const char *, ...) __printflike(2, 3);
+int aprint_verbose_dev(const char *, const char *, ...) __printflike(2, 3);
+int aprint_error_dev(const char *, const char *, ...) __printflike(2, 3);
void identifycpu(const char *);
Index: src/usr.sbin/envstat/config_lex.l
diff -u src/usr.sbin/envstat/config_lex.l:1.7 src/usr.sbin/envstat/config_lex.l:1.8
--- src/usr.sbin/envstat/config_lex.l:1.7 Mon Feb 15 22:37:14 2010
+++ src/usr.sbin/envstat/config_lex.l Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: config_lex.l,v 1.7 2010/02/15 22:37:14 pgoyette Exp $ */
+/* $NetBSD: config_lex.l,v 1.8 2012/03/15 02:02:23 joerg Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: config_lex.l,v 1.7 2010/02/15 22:37:14 pgoyette Exp $");
+__RCSID("$NetBSD: config_lex.l,v 1.8 2012/03/15 02:02:23 joerg Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -39,7 +39,7 @@ __RCSID("$NetBSD: config_lex.l,v 1.7 201
#include "config_yacc.h"
extern int yyline;
-extern int yyerror(const char *, ...);
+extern int yyerror(const char *, ...) __printflike(1, 2);
int yylex(void);
Index: src/usr.sbin/envstat/config_yacc.y
diff -u src/usr.sbin/envstat/config_yacc.y:1.4 src/usr.sbin/envstat/config_yacc.y:1.5
--- src/usr.sbin/envstat/config_yacc.y:1.4 Thu Jul 17 16:24:55 2008
+++ src/usr.sbin/envstat/config_yacc.y Thu Mar 15 02:02:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: config_yacc.y,v 1.4 2008/07/17 16:24:55 drochner Exp $ */
+/* $NetBSD: config_yacc.y,v 1.5 2012/03/15 02:02:23 joerg Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: config_yacc.y,v 1.4 2008/07/17 16:24:55 drochner Exp $");
+__RCSID("$NetBSD: config_yacc.y,v 1.5 2012/03/15 02:02:23 joerg Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -46,7 +46,7 @@ __RCSID("$NetBSD: config_yacc.y,v 1.4 20
int yylex(void);
int yyparse(void);
-int yyerror(const char *, ...);
+int yyerror(const char *, ...) __printflike(1, 2);
void yyrestart(FILE *);
int yyline;
Index: src/usr.sbin/ldpd/ldp_errors.c
diff -u src/usr.sbin/ldpd/ldp_errors.c:1.1 src/usr.sbin/ldpd/ldp_errors.c:1.2
--- src/usr.sbin/ldpd/ldp_errors.c:1.1 Wed Dec 8 07:20:14 2010
+++ src/usr.sbin/ldpd/ldp_errors.c Thu Mar 15 02:02:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_errors.c,v 1.1 2010/12/08 07:20:14 kefren Exp $ */
+/* $NetBSD: ldp_errors.c,v 1.2 2012/03/15 02:02:24 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
int debug_f = 0, warn_f = 0, syslog_f = 0;
-static void do_syslog(int, const char*, va_list);
+static void do_syslog(int, const char*, va_list) __printflike(2, 0);
void
debugp(const char *fmt, ...)
Index: src/usr.sbin/ldpd/ldp_errors.h
diff -u src/usr.sbin/ldpd/ldp_errors.h:1.2 src/usr.sbin/ldpd/ldp_errors.h:1.3
--- src/usr.sbin/ldpd/ldp_errors.h:1.2 Tue Jun 14 11:28:51 2011
+++ src/usr.sbin/ldpd/ldp_errors.h Thu Mar 15 02:02:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_errors.h,v 1.2 2011/06/14 11:28:51 kefren Exp $ */
+/* $NetBSD: ldp_errors.h,v 1.3 2012/03/15 02:02:24 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -52,8 +52,8 @@
void printtime(void);
-void debugp(const char *, ...);
-void fatalp(const char *, ...);
-void warnp(const char *, ...);
+void debugp(const char *, ...) __printflike(1, 2);
+void fatalp(const char *, ...) __printflike(1, 2);
+void warnp(const char *, ...) __printflike(1, 2);
#endif /* !_LDP_ERRORS_H_ */
Index: src/usr.sbin/ldpd/mpls_routes.c
diff -u src/usr.sbin/ldpd/mpls_routes.c:1.8 src/usr.sbin/ldpd/mpls_routes.c:1.9
--- src/usr.sbin/ldpd/mpls_routes.c:1.8 Thu Jun 16 20:42:15 2011
+++ src/usr.sbin/ldpd/mpls_routes.c Thu Mar 15 02:02:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_routes.c,v 1.8 2011/06/16 20:42:15 kefren Exp $ */
+/* $NetBSD: mpls_routes.c,v 1.9 2012/03/15 02:02:24 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -532,7 +532,7 @@ get_route(struct rt_msg * rg, union sock
}
if (rlen <= (int)sizeof(struct rt_msghdr)) {
- debugp("Got only %d bytes, expecting at least %u\n", rlen,
+ debugp("Got only %d bytes, expecting at least %zu\n", rlen,
sizeof(struct rt_msghdr));
return LDP_E_ROUTE_ERROR;
}
Index: src/usr.sbin/mtree/spec.c
diff -u src/usr.sbin/mtree/spec.c:1.79 src/usr.sbin/mtree/spec.c:1.80
--- src/usr.sbin/mtree/spec.c:1.79 Mon Feb 14 16:27:58 2011
+++ src/usr.sbin/mtree/spec.c Thu Mar 15 02:02:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spec.c,v 1.79 2011/02/14 16:27:58 uebayasi Exp $ */
+/* $NetBSD: spec.c,v 1.80 2012/03/15 02:02:24 joerg Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: spec.c,v 1.79 2011/02/14 16:27:58 uebayasi Exp $");
+__RCSID("$NetBSD: spec.c,v 1.80 2012/03/15 02:02:24 joerg Exp $");
#endif
#endif /* not lint */
@@ -101,7 +101,7 @@ static void set(char *, NODE *);
static void unset(char *, NODE *);
static void addchild(NODE *, NODE *);
static int nodecmp(const NODE *, const NODE *);
-static int appendfield(int, const char *, ...);
+static int appendfield(int, const char *, ...) __printflike(2, 3);
#define REPLACEPTR(x,v) do { if ((x)) free((x)); (x) = (v); } while (0)
Index: src/usr.sbin/powerd/powerd.c
diff -u src/usr.sbin/powerd/powerd.c:1.16 src/usr.sbin/powerd/powerd.c:1.17
--- src/usr.sbin/powerd/powerd.c:1.16 Sun Dec 19 22:52:08 2010
+++ src/usr.sbin/powerd/powerd.c Thu Mar 15 02:02:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: powerd.c,v 1.16 2010/12/19 22:52:08 pgoyette Exp $ */
+/* $NetBSD: powerd.c,v 1.17 2012/03/15 02:02:24 joerg Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -75,7 +75,7 @@ static struct kevent *allocchange(void);
static int wait_for_events(struct kevent *, size_t);
static void dispatch_dev_power(struct kevent *);
static void dispatch_power_event_state_change(int, power_event_t *);
-static void powerd_log(int, const char *, ...);
+static void powerd_log(int, const char *, ...) __printflike(2, 3);
static const char *script_paths[] = {
NULL,
Index: src/usr.sbin/ypserv/ypserv/ypserv.c
diff -u src/usr.sbin/ypserv/ypserv/ypserv.c:1.25 src/usr.sbin/ypserv/ypserv/ypserv.c:1.26
--- src/usr.sbin/ypserv/ypserv/ypserv.c:1.25 Tue Aug 30 17:06:22 2011
+++ src/usr.sbin/ypserv/ypserv/ypserv.c Thu Mar 15 02:02:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ypserv.c,v 1.25 2011/08/30 17:06:22 plunky Exp $ */
+/* $NetBSD: ypserv.c,v 1.26 2012/03/15 02:02:24 joerg Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ypserv.c,v 1.25 2011/08/30 17:06:22 plunky Exp $");
+__RCSID("$NetBSD: ypserv.c,v 1.26 2012/03/15 02:02:24 joerg Exp $");
#endif
#include <sys/types.h>
@@ -94,7 +94,7 @@ static void usage(void) __dead;
static int bind_resv_port(int, sa_family_t, in_port_t);
void ypserv_sock_hostname(struct host_info *host);
-static void
+static __printflike(2, 3) void
_msgout(int level, const char *msg, ...)
{
va_list ap;
