Module Name: src
Committed By: joerg
Date: Wed Aug 6 21:57:51 UTC 2014
Modified Files:
src/sys/arch/acorn26/include: loadfile_machdep.h
src/sys/arch/acorn32/include: loadfile_machdep.h
src/sys/arch/alpha/include: loadfile_machdep.h
src/sys/arch/amiga/include: loadfile_machdep.h
src/sys/arch/arc/include: loadfile_machdep.h
src/sys/arch/bebox/include: loadfile_machdep.h
src/sys/arch/cobalt/include: loadfile_machdep.h
src/sys/arch/emips/include: loadfile_machdep.h
src/sys/arch/epoc32/include: loadfile_machdep.h
src/sys/arch/evbarm/include: loadfile_machdep.h
src/sys/arch/evbcf/include: loadfile_machdep.h
src/sys/arch/evbppc/include: loadfile_machdep.h
src/sys/arch/ews4800mips/include: loadfile_machdep.h
src/sys/arch/hp300/include: loadfile_machdep.h
src/sys/arch/hpcmips/include: loadfile_machdep.h
src/sys/arch/hppa/include: loadfile_machdep.h
src/sys/arch/ia64/include: loadfile_machdep.h
src/sys/arch/landisk/include: loadfile_machdep.h
src/sys/arch/luna68k/include: loadfile_machdep.h
src/sys/arch/macppc/include: loadfile_machdep.h
src/sys/arch/mipsco/include: loadfile_machdep.h
src/sys/arch/mmeye/include: loadfile_machdep.h
src/sys/arch/mvme68k/include: loadfile_machdep.h
src/sys/arch/mvmeppc/include: loadfile_machdep.h
src/sys/arch/news68k/include: loadfile_machdep.h
src/sys/arch/newsmips/include: loadfile_machdep.h
src/sys/arch/next68k/include: loadfile_machdep.h
src/sys/arch/ofppc/include: loadfile_machdep.h
src/sys/arch/pmax/include: loadfile_machdep.h
src/sys/arch/prep/include: loadfile_machdep.h
src/sys/arch/rs6000/include: loadfile_machdep.h
src/sys/arch/sandpoint/include: loadfile_machdep.h
src/sys/arch/sbmips/include: loadfile_machdep.h
src/sys/arch/sgimips/include: loadfile_machdep.h
src/sys/arch/shark/include: loadfile_machdep.h
src/sys/arch/sparc/include: loadfile_machdep.h
src/sys/arch/sparc64/include: loadfile_machdep.h
src/sys/arch/sun68k/include: loadfile_machdep.h
src/sys/arch/vax/include: loadfile_machdep.h
src/sys/arch/x68k/include: loadfile_machdep.h
src/sys/arch/x86/include: loadfile_machdep.h
src/sys/arch/zaurus/include: loadfile_machdep.h
Log Message:
Consistently define WARN in a way that passes format string checks, i.e.
always uses the same number of arguments as given in the format string.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/acorn26/include/loadfile_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/include/loadfile_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/include/loadfile_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arc/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/bebox/include/loadfile_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/cobalt/include/loadfile_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/include/loadfile_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/include/loadfile_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/include/loadfile_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbcf/include/loadfile_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/include/loadfile_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ews4800mips/include/loadfile_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/include/loadfile_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcmips/include/loadfile_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/loadfile_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/loadfile_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/landisk/include/loadfile_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/include/loadfile_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mipsco/include/loadfile_machdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mmeye/include/loadfile_machdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mvme68k/include/loadfile_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mvmeppc/include/loadfile_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/news68k/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/newsmips/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/next68k/include/loadfile_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ofppc/include/loadfile_machdep.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/pmax/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/prep/include/loadfile_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/rs6000/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sandpoint/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sbmips/include/loadfile_machdep.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/include/loadfile_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/shark/include/loadfile_machdep.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/include/loadfile_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/include/loadfile_machdep.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sun68k/include/loadfile_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/vax/include/loadfile_machdep.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x68k/include/loadfile_machdep.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/include/loadfile_machdep.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/include/loadfile_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/include/loadfile_machdep.h
diff -u src/sys/arch/acorn26/include/loadfile_machdep.h:1.4 src/sys/arch/acorn26/include/loadfile_machdep.h:1.5
--- src/sys/arch/acorn26/include/loadfile_machdep.h:1.4 Wed Jan 14 23:14:48 2009
+++ src/sys/arch/acorn26/include/loadfile_machdep.h Wed Aug 6 21:57:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2009/01/14 23:14:48 bjh21 Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:48 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -44,9 +44,14 @@
#define READ(f, b, c) boot26_read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) boot26_memcpy((void *)LOADADDR(d), (s), (c))
#define BZERO(d, c) boot26_memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/acorn32/include/loadfile_machdep.h
diff -u src/sys/arch/acorn32/include/loadfile_machdep.h:1.5 src/sys/arch/acorn32/include/loadfile_machdep.h:1.6
--- src/sys/arch/acorn32/include/loadfile_machdep.h:1.5 Sat Mar 14 14:45:51 2009
+++ src/sys/arch/acorn32/include/loadfile_machdep.h Wed Aug 6 21:57:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.5 2009/03/14 14:45:51 dsl Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.6 2014/08/06 21:57:48 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -44,9 +44,14 @@
#define READ(f, b, c) boot32_read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) boot32_memcpy((void *)LOADADDR(d), (s), (c))
#define BZERO(d, c) boot32_memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/alpha/include/loadfile_machdep.h
diff -u src/sys/arch/alpha/include/loadfile_machdep.h:1.5 src/sys/arch/alpha/include/loadfile_machdep.h:1.6
--- src/sys/arch/alpha/include/loadfile_machdep.h:1.5 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/loadfile_machdep.h Wed Aug 6 21:57:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.5 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.6 2014/08/06 21:57:48 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c))
#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/amiga/include/loadfile_machdep.h
diff -u src/sys/arch/amiga/include/loadfile_machdep.h:1.5 src/sys/arch/amiga/include/loadfile_machdep.h:1.6
--- src/sys/arch/amiga/include/loadfile_machdep.h:1.5 Sat Mar 14 14:45:54 2009
+++ src/sys/arch/amiga/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.5 2009/03/14 14:45:54 dsl Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.6 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -45,9 +45,14 @@
#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c))
#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/arc/include/loadfile_machdep.h
diff -u src/sys/arch/arc/include/loadfile_machdep.h:1.4 src/sys/arch/arc/include/loadfile_machdep.h:1.5
--- src/sys/arch/arc/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:13 2008
+++ src/sys/arch/arc/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,9 +43,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/bebox/include/loadfile_machdep.h
diff -u src/sys/arch/bebox/include/loadfile_machdep.h:1.4 src/sys/arch/bebox/include/loadfile_machdep.h:1.5
--- src/sys/arch/bebox/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:15 2008
+++ src/sys/arch/bebox/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/cobalt/include/loadfile_machdep.h
diff -u src/sys/arch/cobalt/include/loadfile_machdep.h:1.3 src/sys/arch/cobalt/include/loadfile_machdep.h:1.4
--- src/sys/arch/cobalt/include/loadfile_machdep.h:1.3 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/cobalt/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.3 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.4 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,9 +43,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/emips/include/loadfile_machdep.h
diff -u src/sys/arch/emips/include/loadfile_machdep.h:1.1 src/sys/arch/emips/include/loadfile_machdep.h:1.2
--- src/sys/arch/emips/include/loadfile_machdep.h:1.1 Wed Jan 26 01:18:52 2011
+++ src/sys/arch/emips/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.1 2011/01/26 01:18:52 pooka Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.2 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -50,9 +50,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/epoc32/include/loadfile_machdep.h
diff -u src/sys/arch/epoc32/include/loadfile_machdep.h:1.1 src/sys/arch/epoc32/include/loadfile_machdep.h:1.2
--- src/sys/arch/epoc32/include/loadfile_machdep.h:1.1 Sun Apr 28 12:11:26 2013
+++ src/sys/arch/epoc32/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.2 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#ifdef _STANDALONE
Index: src/sys/arch/evbarm/include/loadfile_machdep.h
diff -u src/sys/arch/evbarm/include/loadfile_machdep.h:1.1 src/sys/arch/evbarm/include/loadfile_machdep.h:1.2
--- src/sys/arch/evbarm/include/loadfile_machdep.h:1.1 Mon Jan 30 03:28:33 2012
+++ src/sys/arch/evbarm/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -9,9 +9,14 @@
#define READ(f, b, c) read((f), (void*)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void*)LOADADDR(d), (void*)(s), (c))
#define BZERO(d, c) memset((void*)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void)printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/evbcf/include/loadfile_machdep.h
diff -u src/sys/arch/evbcf/include/loadfile_machdep.h:1.2 src/sys/arch/evbcf/include/loadfile_machdep.h:1.3
--- src/sys/arch/evbcf/include/loadfile_machdep.h:1.2 Tue Mar 18 18:20:41 2014
+++ src/sys/arch/evbcf/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2014/03/18 18:20:41 riastradh Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.3 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,9 +45,14 @@
#ifdef _STANDALONE
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/evbppc/include/loadfile_machdep.h
diff -u src/sys/arch/evbppc/include/loadfile_machdep.h:1.5 src/sys/arch/evbppc/include/loadfile_machdep.h:1.6
--- src/sys/arch/evbppc/include/loadfile_machdep.h:1.5 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbppc/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.5 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.6 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/ews4800mips/include/loadfile_machdep.h
diff -u src/sys/arch/ews4800mips/include/loadfile_machdep.h:1.3 src/sys/arch/ews4800mips/include/loadfile_machdep.h:1.4
--- src/sys/arch/ews4800mips/include/loadfile_machdep.h:1.3 Mon Apr 28 20:23:18 2008
+++ src/sys/arch/ews4800mips/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.3 2008/04/28 20:23:18 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.4 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,9 +43,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/hp300/include/loadfile_machdep.h
diff -u src/sys/arch/hp300/include/loadfile_machdep.h:1.7 src/sys/arch/hp300/include/loadfile_machdep.h:1.8
--- src/sys/arch/hp300/include/loadfile_machdep.h:1.7 Mon Apr 28 20:23:19 2008
+++ src/sys/arch/hp300/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.7 2008/04/28 20:23:19 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.8 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -45,9 +45,14 @@
#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c))
#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/hpcmips/include/loadfile_machdep.h
diff -u src/sys/arch/hpcmips/include/loadfile_machdep.h:1.3 src/sys/arch/hpcmips/include/loadfile_machdep.h:1.4
--- src/sys/arch/hpcmips/include/loadfile_machdep.h:1.3 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpcmips/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.3 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.4 2014/08/06 21:57:49 joerg Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,9 +38,14 @@
#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c))
#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/hppa/include/loadfile_machdep.h
diff -u src/sys/arch/hppa/include/loadfile_machdep.h:1.1 src/sys/arch/hppa/include/loadfile_machdep.h:1.2
--- src/sys/arch/hppa/include/loadfile_machdep.h:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.2 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -44,9 +44,14 @@
#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c))
#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/ia64/include/loadfile_machdep.h
diff -u src/sys/arch/ia64/include/loadfile_machdep.h:1.2 src/sys/arch/ia64/include/loadfile_machdep.h:1.3
--- src/sys/arch/ia64/include/loadfile_machdep.h:1.2 Mon Apr 28 20:23:25 2008
+++ src/sys/arch/ia64/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.3 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -55,9 +55,14 @@ extern vsize_t ia64_unwindtablen;
#define READ(f, b, c) pread((f), LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), LOADADDR(d), (c))
#define BZERO(d, c) pbzero(LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/landisk/include/loadfile_machdep.h
diff -u src/sys/arch/landisk/include/loadfile_machdep.h:1.2 src/sys/arch/landisk/include/loadfile_machdep.h:1.3
--- src/sys/arch/landisk/include/loadfile_machdep.h:1.2 Mon Apr 28 20:23:26 2008
+++ src/sys/arch/landisk/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.3 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#ifdef _STANDALONE
Index: src/sys/arch/luna68k/include/loadfile_machdep.h
diff -u src/sys/arch/luna68k/include/loadfile_machdep.h:1.2 src/sys/arch/luna68k/include/loadfile_machdep.h:1.3
--- src/sys/arch/luna68k/include/loadfile_machdep.h:1.2 Thu Jan 17 14:20:06 2013
+++ src/sys/arch/luna68k/include/loadfile_machdep.h Wed Aug 6 21:57:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2013/01/17 14:20:06 tsutsui Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.3 2014/08/06 21:57:49 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -46,9 +46,14 @@
#ifdef _STANDALONE
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/macppc/include/loadfile_machdep.h
diff -u src/sys/arch/macppc/include/loadfile_machdep.h:1.5 src/sys/arch/macppc/include/loadfile_machdep.h:1.6
--- src/sys/arch/macppc/include/loadfile_machdep.h:1.5 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/macppc/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.5 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.6 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/mipsco/include/loadfile_machdep.h
diff -u src/sys/arch/mipsco/include/loadfile_machdep.h:1.4 src/sys/arch/mipsco/include/loadfile_machdep.h:1.5
--- src/sys/arch/mipsco/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:28 2008
+++ src/sys/arch/mipsco/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,9 +43,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/mmeye/include/loadfile_machdep.h
diff -u src/sys/arch/mmeye/include/loadfile_machdep.h:1.6 src/sys/arch/mmeye/include/loadfile_machdep.h:1.7
--- src/sys/arch/mmeye/include/loadfile_machdep.h:1.6 Wed Feb 23 09:06:48 2011
+++ src/sys/arch/mmeye/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.6 2011/02/23 09:06:48 he Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.7 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/mvme68k/include/loadfile_machdep.h
diff -u src/sys/arch/mvme68k/include/loadfile_machdep.h:1.6 src/sys/arch/mvme68k/include/loadfile_machdep.h:1.7
--- src/sys/arch/mvme68k/include/loadfile_machdep.h:1.6 Sun Mar 30 15:20:54 2014
+++ src/sys/arch/mvme68k/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.6 2014/03/30 15:20:54 christos Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.7 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,9 +46,14 @@
#ifdef _STANDALONE
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/mvmeppc/include/loadfile_machdep.h
diff -u src/sys/arch/mvmeppc/include/loadfile_machdep.h:1.3 src/sys/arch/mvmeppc/include/loadfile_machdep.h:1.4
--- src/sys/arch/mvmeppc/include/loadfile_machdep.h:1.3 Mon Apr 28 20:23:29 2008
+++ src/sys/arch/mvmeppc/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.3 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.4 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/news68k/include/loadfile_machdep.h
diff -u src/sys/arch/news68k/include/loadfile_machdep.h:1.7 src/sys/arch/news68k/include/loadfile_machdep.h:1.8
--- src/sys/arch/news68k/include/loadfile_machdep.h:1.7 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/news68k/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.7 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.8 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -46,9 +46,14 @@
#ifdef _STANDALONE
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/newsmips/include/loadfile_machdep.h
diff -u src/sys/arch/newsmips/include/loadfile_machdep.h:1.4 src/sys/arch/newsmips/include/loadfile_machdep.h:1.5
--- src/sys/arch/newsmips/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/newsmips/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,9 +40,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/next68k/include/loadfile_machdep.h
diff -u src/sys/arch/next68k/include/loadfile_machdep.h:1.4 src/sys/arch/next68k/include/loadfile_machdep.h:1.5
--- src/sys/arch/next68k/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/next68k/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,9 +46,14 @@
#ifdef _STANDALONE
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/ofppc/include/loadfile_machdep.h
diff -u src/sys/arch/ofppc/include/loadfile_machdep.h:1.5 src/sys/arch/ofppc/include/loadfile_machdep.h:1.6
--- src/sys/arch/ofppc/include/loadfile_machdep.h:1.5 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/ofppc/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.5 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.6 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/pmax/include/loadfile_machdep.h
diff -u src/sys/arch/pmax/include/loadfile_machdep.h:1.8 src/sys/arch/pmax/include/loadfile_machdep.h:1.9
--- src/sys/arch/pmax/include/loadfile_machdep.h:1.8 Mon Dec 14 00:46:10 2009
+++ src/sys/arch/pmax/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.8 2009/12/14 00:46:10 matt Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.9 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -44,9 +44,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/prep/include/loadfile_machdep.h
diff -u src/sys/arch/prep/include/loadfile_machdep.h:1.4 src/sys/arch/prep/include/loadfile_machdep.h:1.5
--- src/sys/arch/prep/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:33 2008
+++ src/sys/arch/prep/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:33 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/rs6000/include/loadfile_machdep.h
diff -u src/sys/arch/rs6000/include/loadfile_machdep.h:1.2 src/sys/arch/rs6000/include/loadfile_machdep.h:1.3
--- src/sys/arch/rs6000/include/loadfile_machdep.h:1.2 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/rs6000/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.3 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/sandpoint/include/loadfile_machdep.h
diff -u src/sys/arch/sandpoint/include/loadfile_machdep.h:1.4 src/sys/arch/sandpoint/include/loadfile_machdep.h:1.5
--- src/sys/arch/sandpoint/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:34 2008
+++ src/sys/arch/sandpoint/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:34 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/sbmips/include/loadfile_machdep.h
diff -u src/sys/arch/sbmips/include/loadfile_machdep.h:1.4 src/sys/arch/sbmips/include/loadfile_machdep.h:1.5
--- src/sys/arch/sbmips/include/loadfile_machdep.h:1.4 Mon Dec 14 00:46:12 2009
+++ src/sys/arch/sbmips/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2009/12/14 00:46:12 matt Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,9 +40,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/sgimips/include/loadfile_machdep.h
diff -u src/sys/arch/sgimips/include/loadfile_machdep.h:1.8 src/sys/arch/sgimips/include/loadfile_machdep.h:1.9
--- src/sys/arch/sgimips/include/loadfile_machdep.h:1.8 Mon Dec 14 00:46:13 2009
+++ src/sys/arch/sgimips/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.8 2009/12/14 00:46:13 matt Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.9 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,9 +45,14 @@
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), \
(void *)(vaddr_t)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/shark/include/loadfile_machdep.h
diff -u src/sys/arch/shark/include/loadfile_machdep.h:1.3 src/sys/arch/shark/include/loadfile_machdep.h:1.4
--- src/sys/arch/shark/include/loadfile_machdep.h:1.3 Mon Apr 28 20:23:35 2008
+++ src/sys/arch/shark/include/loadfile_machdep.h Wed Aug 6 21:57:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.3 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.4 2014/08/06 21:57:50 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -40,9 +40,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/sparc/include/loadfile_machdep.h
diff -u src/sys/arch/sparc/include/loadfile_machdep.h:1.10 src/sys/arch/sparc/include/loadfile_machdep.h:1.11
--- src/sys/arch/sparc/include/loadfile_machdep.h:1.10 Mon Apr 28 20:23:36 2008
+++ src/sys/arch/sparc/include/loadfile_machdep.h Wed Aug 6 21:57:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.10 2008/04/28 20:23:36 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.11 2014/08/06 21:57:51 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,9 +38,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/sparc64/include/loadfile_machdep.h
diff -u src/sys/arch/sparc64/include/loadfile_machdep.h:1.3 src/sys/arch/sparc64/include/loadfile_machdep.h:1.4
--- src/sys/arch/sparc64/include/loadfile_machdep.h:1.3 Mon Apr 28 20:23:37 2008
+++ src/sys/arch/sparc64/include/loadfile_machdep.h Wed Aug 6 21:57:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.3 2008/04/28 20:23:37 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.4 2014/08/06 21:57:51 joerg Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define BCOPY(s, d, c) sparc64_memcpy((void *)LOADADDR(d), \
(void *)(s), (c))
#define BZERO(d, c) sparc64_memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/sun68k/include/loadfile_machdep.h
diff -u src/sys/arch/sun68k/include/loadfile_machdep.h:1.4 src/sys/arch/sun68k/include/loadfile_machdep.h:1.5
--- src/sys/arch/sun68k/include/loadfile_machdep.h:1.4 Mon Apr 28 20:23:38 2008
+++ src/sys/arch/sun68k/include/loadfile_machdep.h Wed Aug 6 21:57:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:38 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2014/08/06 21:57:51 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -46,9 +46,14 @@
#ifdef _STANDALONE
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/vax/include/loadfile_machdep.h
diff -u src/sys/arch/vax/include/loadfile_machdep.h:1.7 src/sys/arch/vax/include/loadfile_machdep.h:1.8
--- src/sys/arch/vax/include/loadfile_machdep.h:1.7 Mon Apr 28 20:23:39 2008
+++ src/sys/arch/vax/include/loadfile_machdep.h Wed Aug 6 21:57:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.7 2008/04/28 20:23:39 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.8 2014/08/06 21:57:51 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -43,9 +43,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/x68k/include/loadfile_machdep.h
diff -u src/sys/arch/x68k/include/loadfile_machdep.h:1.7 src/sys/arch/x68k/include/loadfile_machdep.h:1.8
--- src/sys/arch/x68k/include/loadfile_machdep.h:1.7 Tue Mar 20 13:03:33 2012
+++ src/sys/arch/x68k/include/loadfile_machdep.h Wed Aug 6 21:57:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.7 2012/03/20 13:03:33 minoura Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.8 2014/08/06 21:57:51 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -48,9 +48,14 @@
#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c))
#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/x86/include/loadfile_machdep.h
diff -u src/sys/arch/x86/include/loadfile_machdep.h:1.5 src/sys/arch/x86/include/loadfile_machdep.h:1.6
--- src/sys/arch/x86/include/loadfile_machdep.h:1.5 Sun Apr 6 18:48:06 2014
+++ src/sys/arch/x86/include/loadfile_machdep.h Wed Aug 6 21:57:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.5 2014/04/06 18:48:06 joerg Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.6 2014/08/06 21:57:51 joerg Exp $ */
/*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -42,9 +42,14 @@
#define READ(f, b, c) pread((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) vpbcopy((s), (void *)LOADADDR(d), (c))
#define BZERO(d, c) pbzero((void *)LOADADDR(d), (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) x86_progress a
#define ALLOC(a) alloc(a)
#define DEALLOC(a, b) dealloc(a, b)
Index: src/sys/arch/zaurus/include/loadfile_machdep.h
diff -u src/sys/arch/zaurus/include/loadfile_machdep.h:1.1 src/sys/arch/zaurus/include/loadfile_machdep.h:1.2
--- src/sys/arch/zaurus/include/loadfile_machdep.h:1.1 Mon Mar 2 09:33:01 2009
+++ src/sys/arch/zaurus/include/loadfile_machdep.h Wed Aug 6 21:57:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.1 2009/03/02 09:33:01 nonaka Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.2 2014/08/06 21:57:51 joerg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -39,9 +39,14 @@
#define READ(f, b, c) read((f), (void *)LOADADDR(b), (c))
#define BCOPY(s, d, c) memcpy((void *)LOADADDR(d), (void *)(s), (c))
#define BZERO(d, c) memset((void *)LOADADDR(d), 0, (c))
-#define WARN(a) (void)(printf a, \
- printf((errno ? ": %s\n" : "\n"), \
- strerror(errno)))
+#define WARN(a) do { \
+ (void)printf a; \
+ if (errno) \
+ (void)printf(": %s\n", \
+ strerror(errno)); \
+ else \
+ (void)printf("\n"); \
+ } while(/* CONSTCOND */0)
#define PROGRESS(a) (void) printf a
#ifdef _STANDALONE
