Module Name: src
Committed By: riastradh
Date: Sun Apr 19 03:12:26 UTC 2020
Modified Files:
src/sys/sys: sdt.h
Log Message:
do {...} while (0) to make DTRACE_PROBE macros proper statements.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/sys/sdt.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/sys/sdt.h
diff -u src/sys/sys/sdt.h:1.12 src/sys/sys/sdt.h:1.13
--- src/sys/sys/sdt.h:1.12 Wed Oct 16 18:29:49 2019
+++ src/sys/sys/sdt.h Sun Apr 19 03:12:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sdt.h,v 1.12 2019/10/16 18:29:49 christos Exp $ */
+/* $NetBSD: sdt.h,v 1.13 2020/04/19 03:12:26 riastradh Exp $ */
/*-
* Copyright 2006-2008 John Birrell <j...@freebsd.org>
@@ -37,45 +37,45 @@
#define _DTRACE_VERSION 1
-#define DTRACE_PROBE(prov, name) { \
+#define DTRACE_PROBE(prov, name) do { \
extern void __dtrace_##prov##___##name(void); \
__dtrace_##prov##___##name(); \
-}
+} while (0)
-#define DTRACE_PROBE1(prov, name, arg1) { \
+#define DTRACE_PROBE1(prov, name, arg1) do { \
extern void __dtrace_##prov##___##name(unsigned long); \
__dtrace_##prov##___##name((unsigned long)arg1); \
-}
+} while (0)
-#define DTRACE_PROBE2(prov, name, arg1, arg2) { \
+#define DTRACE_PROBE2(prov, name, arg1, arg2) do { \
extern void __dtrace_##prov##___##name(unsigned long, \
unsigned long); \
__dtrace_##prov##___##name((unsigned long)arg1, \
(unsigned long)arg2); \
-}
+} while (0)
-#define DTRACE_PROBE3(prov, name, arg1, arg2, arg3) { \
+#define DTRACE_PROBE3(prov, name, arg1, arg2, arg3) do { \
extern void __dtrace_##prov##___##name(unsigned long, \
unsigned long, unsigned long); \
__dtrace_##prov##___##name((unsigned long)arg1, \
(unsigned long)arg2, (unsigned long)arg3); \
-}
+} while (0)
-#define DTRACE_PROBE4(prov, name, arg1, arg2, arg3, arg4) { \
+#define DTRACE_PROBE4(prov, name, arg1, arg2, arg3, arg4) do { \
extern void __dtrace_##prov##___##name(unsigned long, \
unsigned long, unsigned long, unsigned long); \
__dtrace_##prov##___##name((unsigned long)arg1, \
(unsigned long)arg2, (unsigned long)arg3, \
(unsigned long)arg4); \
-}
+} while (0)
-#define DTRACE_PROBE5(prov, name, arg1, arg2, arg3, arg4, arg5) { \
+#define DTRACE_PROBE5(prov, name, arg1, arg2, arg3, arg4, arg5) do { \
extern void __dtrace_##prov##___##name(unsigned long, \
unsigned long, unsigned long, unsigned long, unsigned long);\
__dtrace_##prov##___##name((unsigned long)arg1, \
(unsigned long)arg2, (unsigned long)arg3, \
(unsigned long)arg4, (unsigned long)arg5); \
-}
+} while (0)
#else /* _KERNEL */
