Module Name: src
Committed By: christos
Date: Sat Feb 9 00:31:22 UTC 2013
Modified Files:
src/sys/kern: init_main.c kern_runq.c subr_autoconf.c subr_blist.c
subr_disk.c subr_lockdebug.c subr_pool.c subr_vmem.c tty.c
vfs_vnode.c
Log Message:
printflike maintenance.
To generate a diff of this commit:
cvs rdiff -u -r1.445 -r1.446 src/sys/kern/init_main.c
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/kern_runq.c
cvs rdiff -u -r1.225 -r1.226 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/subr_blist.c
cvs rdiff -u -r1.100 -r1.101 src/sys/kern/subr_disk.c
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/subr_lockdebug.c
cvs rdiff -u -r1.198 -r1.199 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.81 -r1.82 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.256 -r1.257 src/sys/kern/tty.c
cvs rdiff -u -r1.17 -r1.18 src/sys/kern/vfs_vnode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.445 src/sys/kern/init_main.c:1.446
--- src/sys/kern/init_main.c:1.445 Sun Jul 29 14:05:48 2012
+++ src/sys/kern/init_main.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.445 2012/07/29 18:05:48 mlelstv Exp $ */
+/* $NetBSD: init_main.c,v 1.446 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.445 2012/07/29 18:05:48 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.446 2013/02/09 00:31:21 christos Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -1125,7 +1125,7 @@ banner(void)
static char notice[] = " Notice: this software is "
"protected by copyright";
char pbuf[81];
- void (*pr)(const char *, ...);
+ void (*pr)(const char *, ...) __printflike(1, 2);
int i;
if ((boothowto & AB_SILENT) != 0) {
Index: src/sys/kern/kern_runq.c
diff -u src/sys/kern/kern_runq.c:1.35 src/sys/kern/kern_runq.c:1.36
--- src/sys/kern/kern_runq.c:1.35 Wed Aug 29 22:25:35 2012
+++ src/sys/kern/kern_runq.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_runq.c,v 1.35 2012/08/30 02:25:35 matt Exp $ */
+/* $NetBSD: kern_runq.c,v 1.36 2013/02/09 00:31:21 christos Exp $ */
/*
* Copyright (c) 2007, 2008 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.35 2012/08/30 02:25:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_runq.c,v 1.36 2013/02/09 00:31:21 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -864,8 +864,7 @@ SYSCTL_SETUP(sysctl_sched_setup, "sysctl
#ifdef DDB
void
-sched_print_runqueue(void (*pr)(const char *, ...)
- __attribute__((__format__(__printf__,1,2))))
+sched_print_runqueue(void (*pr)(const char *, ...))
{
runqueue_t *ci_rq;
struct cpu_info *ci, *tci;
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.225 src/sys/kern/subr_autoconf.c:1.226
--- src/sys/kern/subr_autoconf.c:1.225 Thu Jan 10 05:15:59 2013
+++ src/sys/kern/subr_autoconf.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.225 2013/01/10 10:15:59 mlelstv Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.226 2013/02/09 00:31:21 christos Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.225 2013/01/10 10:15:59 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.226 2013/02/09 00:31:21 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -239,7 +239,8 @@ frob_cfdrivervec(struct cfdriver * const
cfdriver_fn drv_do, cfdriver_fn drv_undo,
const char *style, bool dopanic)
{
- void (*pr)(const char *, ...) = dopanic ? panic : printf;
+ void (*pr)(const char *, ...) __printflike(1, 2) =
+ dopanic ? panic : printf;
int i = 0, error = 0, e2;
for (i = 0; cfdriverv[i] != NULL; i++) {
@@ -270,7 +271,8 @@ frob_cfattachvec(const struct cfattachin
const char *style, bool dopanic)
{
const struct cfattachinit *cfai = NULL;
- void (*pr)(const char *, ...) = dopanic ? panic : printf;
+ void (*pr)(const char *, ...) __printflike(1, 2) =
+ dopanic ? panic : printf;
int j = 0, error = 0, e2;
for (cfai = &cfattachv[0]; cfai->cfai_name != NULL; cfai++) {
Index: src/sys/kern/subr_blist.c
diff -u src/sys/kern/subr_blist.c:1.10 src/sys/kern/subr_blist.c:1.11
--- src/sys/kern/subr_blist.c:1.10 Sun Apr 24 14:46:22 2011
+++ src/sys/kern/subr_blist.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_blist.c,v 1.10 2011/04/24 18:46:22 rmind Exp $ */
+/* $NetBSD: subr_blist.c,v 1.11 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c) 1998 Matthew Dillon. All Rights Reserved.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_blist.c,v 1.10 2011/04/24 18:46:22 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_blist.c,v 1.11 2013/02/09 00:31:21 christos Exp $");
#if 0
__FBSDID("$FreeBSD: src/sys/kern/subr_blist.c,v 1.17 2004/06/04 04:03:25 alc Exp $");
#endif
@@ -118,7 +118,7 @@ __FBSDID("$FreeBSD: src/sys/kern/subr_bl
#include "../sys/blist.h"
-void panic(const char *ctl, ...);
+void panic(const char *ctl, ...) __printflike(1, 2);
#endif
Index: src/sys/kern/subr_disk.c
diff -u src/sys/kern/subr_disk.c:1.100 src/sys/kern/subr_disk.c:1.101
--- src/sys/kern/subr_disk.c:1.100 Wed Oct 13 20:47:16 2010
+++ src/sys/kern/subr_disk.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk.c,v 1.100 2010/10/14 00:47:16 mrg Exp $ */
+/* $NetBSD: subr_disk.c,v 1.101 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000, 2009 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.100 2010/10/14 00:47:16 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.101 2013/02/09 00:31:21 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -124,7 +124,7 @@ diskerr(const struct buf *bp, const char
int blkdone, const struct disklabel *lp)
{
int unit = DISKUNIT(bp->b_dev), part = DISKPART(bp->b_dev);
- void (*pr)(const char *, ...);
+ void (*pr)(const char *, ...) __printflike(1, 2);
char partname = 'a' + part;
daddr_t sn;
Index: src/sys/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.46 src/sys/kern/subr_lockdebug.c:1.47
--- src/sys/kern/subr_lockdebug.c:1.46 Sat Aug 4 08:38:20 2012
+++ src/sys/kern/subr_lockdebug.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_lockdebug.c,v 1.46 2012/08/04 12:38:20 christos Exp $ */
+/* $NetBSD: subr_lockdebug.c,v 1.47 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.46 2012/08/04 12:38:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.47 2013/02/09 00:31:21 christos Exp $");
#include "opt_ddb.h"
@@ -714,7 +714,8 @@ lockdebug_mem_check(const char *func, vo
* Dump information about a lock on panic, or for DDB.
*/
static void
-lockdebug_dump(lockdebug_t *ld, void (*pr)(const char *, ...))
+lockdebug_dump(lockdebug_t *ld, void (*pr)(const char *, ...)
+ __printflike(1, 2))
{
int sleeper = (ld->ld_flags & LD_SLEEPER);
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.198 src/sys/kern/subr_pool.c:1.199
--- src/sys/kern/subr_pool.c:1.198 Tue Aug 28 11:52:19 2012
+++ src/sys/kern/subr_pool.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.198 2012/08/28 15:52:19 christos Exp $ */
+/* $NetBSD: subr_pool.c,v 1.199 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.198 2012/08/28 15:52:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.199 2013/02/09 00:31:21 christos Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -203,9 +203,9 @@ static void *pool_allocator_alloc(struct
static void pool_allocator_free(struct pool *, void *);
static void pool_print_pagelist(struct pool *, struct pool_pagelist *,
- void (*)(const char *, ...));
+ void (*)(const char *, ...) __printflike(1, 2));
static void pool_print1(struct pool *, const char *,
- void (*)(const char *, ...));
+ void (*)(const char *, ...) __printflike(1, 2));
static int pool_chk_page(struct pool *, const char *,
struct pool_item_header *);
Index: src/sys/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.81 src/sys/kern/subr_vmem.c:1.82
--- src/sys/kern/subr_vmem.c:1.81 Fri Feb 8 04:30:01 2013
+++ src/sys/kern/subr_vmem.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.81 2013/02/08 09:30:01 skrll Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.82 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.81 2013/02/08 09:30:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.82 2013/02/09 00:31:21 christos Exp $");
#if defined(_KERNEL)
#include "opt_ddb.h"
@@ -1423,7 +1423,8 @@ vmem_rehash_start(void)
#if defined(DDB) || defined(UNITTEST) || defined(VMEM_SANITY)
-static void bt_dump(const bt_t *, void (*)(const char *, ...));
+static void bt_dump(const bt_t *, void (*)(const char *, ...)
+ __printflike(1, 2));
static const char *
bt_type_string(int type)
@@ -1451,7 +1452,7 @@ bt_dump(const bt_t *bt, void (*pr)(const
}
static void
-vmem_dump(const vmem_t *vm , void (*pr)(const char *, ...))
+vmem_dump(const vmem_t *vm , void (*pr)(const char *, ...) __printflike(1, 2))
{
const bt_t *bt;
int i;
Index: src/sys/kern/tty.c
diff -u src/sys/kern/tty.c:1.256 src/sys/kern/tty.c:1.257
--- src/sys/kern/tty.c:1.256 Fri Oct 19 12:55:22 2012
+++ src/sys/kern/tty.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.256 2012/10/19 16:55:22 apb Exp $ */
+/* $NetBSD: tty.c,v 1.257 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.256 2012/10/19 16:55:22 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.257 2013/02/09 00:31:21 christos Exp $");
#include "opt_compat_netbsd.h"
@@ -104,7 +104,7 @@ static void ttyblock(struct tty *);
static void ttyecho(int, struct tty *);
static void ttyrubo(struct tty *, int);
static void ttyprintf_nolock(struct tty *, const char *fmt, ...)
- __attribute__((__format__(__printf__,2,3)));
+ __printflike(2, 3);
static int proc_compare_wrapper(struct proc *, struct proc *);
static void ttysigintr(void *);
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.17 src/sys/kern/vfs_vnode.c:1.18
--- src/sys/kern/vfs_vnode.c:1.17 Mon Nov 12 06:00:07 2012
+++ src/sys/kern/vfs_vnode.c Fri Feb 8 19:31:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.17 2012/11/12 11:00:07 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.18 2013/02/09 00:31:21 christos Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.17 2012/11/12 11:00:07 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.18 2013/02/09 00:31:21 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -173,7 +173,7 @@ static int cleanvnode(void);
static void vdrain_thread(void *);
static void vrele_thread(void *);
static void vnpanic(vnode_t *, const char *, ...)
- __attribute__((__format__(__printf__, 2, 3)));
+ __printflike(2, 3);
/* Routines having to do with the management of the vnode table. */
extern int (**dead_vnodeop_p)(void *);
