summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/kern_malloc.c4
-rw-r--r--sys/kern/kern_malloc_debug.c4
-rw-r--r--sys/kern/kern_proc.c4
-rw-r--r--sys/kern/subr_disk.c4
-rw-r--r--sys/kern/subr_extent.c6
-rw-r--r--sys/kern/subr_pool.c16
-rw-r--r--sys/kern/uipc_mbuf.c4
-rw-r--r--sys/kern/vfs_bio.c6
-rw-r--r--sys/kern/vfs_subr.c8
-rw-r--r--sys/ufs/ffs/ffs_softdep.c6
10 files changed, 31 insertions, 31 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 3873e20c03a..3a0b89d82f0 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc.c,v 1.93 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: kern_malloc.c,v 1.94 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */
/*
@@ -711,7 +711,7 @@ malloc_roundup(size_t sz)
void
malloc_printit(
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
#ifdef KMEMSTATS
struct kmemstats *km;
diff --git a/sys/kern/kern_malloc_debug.c b/sys/kern/kern_malloc_debug.c
index a0fcf2fc91f..0d4b7a0d186 100644
--- a/sys/kern/kern_malloc_debug.c
+++ b/sys/kern/kern_malloc_debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc_debug.c,v 1.29 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: kern_malloc_debug.c,v 1.30 2013/02/17 17:39:29 miod Exp $ */
/*
* Copyright (c) 1999, 2000 Artur Grabowski <art@openbsd.org>
@@ -301,7 +301,7 @@ debug_malloc_assert_allocated(void *addr, const char *func)
void
debug_malloc_printit(
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct debug_malloc_entry *md;
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index e2115ecb221..da0b84e90f1 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_proc.c,v 1.49 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: kern_proc.c,v 1.50 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $ */
/*
@@ -381,7 +381,7 @@ orphanpg(struct pgrp *pg)
#ifdef DDB
void
proc_printit(struct proc *p, const char *modif,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
static const char *const pstat[] = {
"idle", "run", "sleep", "stop", "zombie", "dead", "onproc"
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index c39538ba772..b8b47b17f31 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_disk.c,v 1.146 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: subr_disk.c,v 1.147 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
/*
@@ -756,7 +756,7 @@ diskerr(struct buf *bp, char *dname, char *what, int pri, int blkdone,
struct disklabel *lp)
{
int unit = DISKUNIT(bp->b_dev), part = DISKPART(bp->b_dev);
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2)));
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */;
char partname = 'a' + part;
daddr64_t sn;
diff --git a/sys/kern/subr_extent.c b/sys/kern/subr_extent.c
index ff231cbadfa..48b638fee2b 100644
--- a/sys/kern/subr_extent.c
+++ b/sys/kern/subr_extent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_extent.c,v 1.46 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: subr_extent.c,v 1.47 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: subr_extent.c,v 1.7 1996/11/21 18:46:34 cgd Exp $ */
/*-
@@ -70,7 +70,7 @@
#if defined(DIAGNOSTIC) || defined(DDB)
void extent_print1(struct extent *, int (*)(const char *, ...)
- __attribute__((__format__(__kprintf__,1,2))));
+ /* __attribute__((__format__(__kprintf__,1,2))) */);
#endif
static void extent_insert_and_optimize(struct extent *, u_long, u_long,
@@ -1160,7 +1160,7 @@ extent_print(struct extent *ex)
void
extent_print1(struct extent *ex,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct extent_region *rp;
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index f05872ac102..47459a8e332 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_pool.c,v 1.113 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: subr_pool.c,v 1.114 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */
/*-
@@ -139,9 +139,9 @@ void pool_large_free_ni(struct pool *, void *);
#ifdef DDB
void pool_print_pagelist(struct pool_pagelist *, int (*)(const char *, ...)
- __attribute__((__format__(__kprintf__,1,2))));
+ /* __attribute__((__format__(__kprintf__,1,2))) */);
void pool_print1(struct pool *, const char *, int (*)(const char *, ...)
- __attribute__((__format__(__kprintf__,1,2))));
+ /* __attribute__((__format__(__kprintf__,1,2))) */);
#endif
#define pool_sleep(pl) msleep(pl, &pl->pr_mtx, PSWP, pl->pr_wchan, 0)
@@ -1123,14 +1123,14 @@ pool_reclaim_all(void)
*/
void
pool_printit(struct pool *pp, const char *modif,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
pool_print1(pp, modif, pr);
}
void
pool_print_pagelist(struct pool_pagelist *pl,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct pool_item_header *ph;
#ifdef DIAGNOSTIC
@@ -1153,7 +1153,7 @@ pool_print_pagelist(struct pool_pagelist *pl,
void
pool_print1(struct pool *pp, const char *modif,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct pool_item_header *ph;
int print_pagelist = 0;
@@ -1372,8 +1372,8 @@ pool_chk(struct pool *pp)
#ifdef DDB
void
pool_walk(struct pool *pp, int full,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))),
- void (*func)(void *, int, int (*)(const char *, ...) __attribute__((__format__(__kprintf__,1,2)))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */,
+ void (*func)(void *, int, int (*)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */))
{
struct pool_item_header *ph;
struct pool_item *pi;
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 0cb9de8c7d0..08c0ad0fdf9 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.169 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.170 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -1347,7 +1347,7 @@ m_dup_pkthdr(struct mbuf *to, struct mbuf *from, int wait)
#ifdef DDB
void
m_print(void *v,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct mbuf *m = v;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 8b9f88ffbff..ee43ef83b65 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_bio.c,v 1.145 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: vfs_bio.c,v 1.146 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */
/*
@@ -1239,13 +1239,13 @@ biodone(struct buf *bp)
}
#ifdef DDB
-void bcstats_print(int (*)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))));
+void bcstats_print(int (*)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */);
/*
* bcstats_print: ddb hook to print interesting buffer cache counters
*/
void
bcstats_print(
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
(*pr)("Current Buffer Cache status:\n");
(*pr)("numbufs %lld busymapped %lld, delwri %lld\n",
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 55ad5eb33c7..764d8b8e4e9 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.201 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.202 2013/02/17 17:39:29 miod Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -2151,7 +2151,7 @@ vn_isdisk(struct vnode *vp, int *errp)
void
vfs_buf_print(void *b, int full,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct buf *bp = b;
@@ -2179,7 +2179,7 @@ const char *vtags[] = { VTAG_NAMES };
void
vfs_vnode_print(void *v, int full,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct vnode *vp = v;
@@ -2213,7 +2213,7 @@ vfs_vnode_print(void *v, int full,
void
vfs_mount_print(struct mount *mp, int full,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct vfsconf *vfc = mp->mnt_vfc;
struct vnode *vp;
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 3541ea36804..01150f826ea 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_softdep.c,v 1.115 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: ffs_softdep.c,v 1.116 2013/02/17 17:39:29 miod Exp $ */
/*
* Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -5612,7 +5612,7 @@ softdep_error(char *func, int error)
void
softdep_print(struct buf *bp, int full,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct worklist *wk;
@@ -5623,7 +5623,7 @@ softdep_print(struct buf *bp, int full,
void
worklist_print(struct worklist *wk, int full,
- int (*pr)(const char *, ...) __attribute__((__format__(__kprintf__,1,2))))
+ int (*pr)(const char *, ...) /* __attribute__((__format__(__kprintf__,1,2))) */)
{
struct pagedep *pagedep;
struct inodedep *inodedep;