Module Name:    src
Committed By:   kre
Date:           Fri Jun  1 05:48:29 UTC 2018

Modified Files:
        src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
80 column police.   Some KNF and whitespace corrections (until I got bored...)
NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/tests/lib/libc/sys/t_ptrace_wait.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.60 src/tests/lib/libc/sys/t_ptrace_wait.c:1.61
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.60	Wed May 30 05:09:11 2018
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Fri Jun  1 05:48:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.60 2018/05/30 05:09:11 kre Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.61 2018/06/01 05:48:29 kre Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.60 2018/05/30 05:09:11 kre Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.61 2018/06/01 05:48:29 kre Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -60,16 +60,20 @@ __RCSID("$NetBSD: t_ptrace_wait.c,v 1.60
 #include "msg.h"
 
 #define PARENT_TO_CHILD(info, fds, msg) \
-    SYSCALL_REQUIRE(msg_write_child(info " to child " # fds, &fds, &msg, sizeof(msg)) == 0)
+    SYSCALL_REQUIRE(msg_write_child(info " to child " # fds, &fds, &msg, \
+	sizeof(msg)) == 0)
 
 #define CHILD_FROM_PARENT(info, fds, msg) \
-    FORKEE_ASSERT(msg_read_parent(info " from parent " # fds, &fds, &msg, sizeof(msg)) == 0)
+    FORKEE_ASSERT(msg_read_parent(info " from parent " # fds, &fds, &msg, \
+	sizeof(msg)) == 0)
 
 #define CHILD_TO_PARENT(info, fds, msg) \
-    FORKEE_ASSERT(msg_write_parent(info " to parent " # fds, &fds, &msg, sizeof(msg)) == 0)
+    FORKEE_ASSERT(msg_write_parent(info " to parent " # fds, &fds, &msg, \
+	sizeof(msg)) == 0)
 
 #define PARENT_FROM_CHILD(info, fds, msg) \
-    SYSCALL_REQUIRE(msg_read_child(info " from parent " # fds, &fds, &msg, sizeof(msg)) == 0)
+    SYSCALL_REQUIRE(msg_read_child(info " from parent " # fds, &fds, &msg, \
+	sizeof(msg)) == 0)
 
 #define SYSCALL_REQUIRE(expr) ATF_REQUIRE_MSG(expr, "%s: %s", # expr, \
     strerror(errno))
@@ -127,15 +131,15 @@ traceme_raise(int sigval)
 		validate_status_stopped(status, sigval);
 
 		DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for "
-		        "child\n");
+			"child\n");
 		SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info,
-		                       sizeof(info)) != -1);
+			sizeof(info)) != -1);
 
 		DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 		DPRINTF("Signal properties: si_signo=%#x si_code=%#x "
-		        "si_errno=%#x\n",
-		        info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
-		        info.psi_siginfo.si_errno);
+			"si_errno=%#x\n",
+			info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+			info.psi_siginfo.si_errno);
 
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SI_LWP);
@@ -146,7 +150,7 @@ traceme_raise(int sigval)
 
 		DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
 		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0),
-		                      child);
+		    child);
 		break;
 	}
 
@@ -154,18 +158,18 @@ traceme_raise(int sigval)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_RAISE(test, sig)						\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify " #sig " followed by _exit(2) in a child");			\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_raise(sig);							\
+#define TRACEME_RAISE(test, sig)					\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify " #sig " followed by _exit(2) in a child");		\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_raise(sig);						\
 }
 
 TRACEME_RAISE(traceme_raise1, SIGKILL) /* non-maskable */
@@ -184,6 +188,7 @@ traceme_crash(int sig)
 	int status;
 #endif
 	struct ptrace_siginfo info;
+
 	memset(&info, 0, sizeof(info));
 
 	DPRINTF("Before forking process PID=%d\n", getpid());
@@ -225,12 +230,13 @@ traceme_crash(int sig)
 	validate_status_stopped(status, sig);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
-	        info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
-	        info.psi_siginfo.si_errno);
+	    info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+	    info.psi_siginfo.si_errno);
 
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sig);
 	switch (sig) {
@@ -262,18 +268,18 @@ traceme_crash(int sig)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_CRASH(test, sig)						\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify crash signal " #sig " in a child after PT_TRACE_ME");	\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_crash(sig);							\
+#define TRACEME_CRASH(test, sig)					\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify crash signal " #sig " in a child after PT_TRACE_ME"); \
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_crash(sig);						\
 }
 
 TRACEME_CRASH(traceme_crash_trap, SIGTRAP)
@@ -294,8 +300,8 @@ traceme_sendsignal_handle(int sigsent, v
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
-
 	struct ptrace_siginfo info;
+
 	memset(&info, 0, sizeof(info));
 
 	DPRINTF("Before forking process PID=%d\n", getpid());
@@ -326,8 +332,8 @@ traceme_sendsignal_handle(int sigsent, v
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info))
-	                != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -350,29 +356,29 @@ traceme_sendsignal_handle(int sigsent, v
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_SENDSIGNAL_HANDLE(test, sig)					\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify that a signal " #sig " emitted by a tracer to a child is "	\
-	    "handled correctly and caught by a signal handler");		\
-}										\
-										\
-static int test##_caught = 0;							\
-										\
-static void									\
-test##_sighandler(int arg)							\
-{										\
-	FORKEE_ASSERT_EQ(arg, sig);						\
-										\
-	++ test##_caught;							\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_sendsignal_handle(sig, test##_sighandler, & test##_caught);	\
+#define TRACEME_SENDSIGNAL_HANDLE(test, sig)				\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify that a signal " #sig " emitted by a tracer to a child is " \
+	    "handled correctly and caught by a signal handler");	\
+}									\
+									\
+static int test##_caught = 0;						\
+									\
+static void								\
+test##_sighandler(int arg)						\
+{									\
+	FORKEE_ASSERT_EQ(arg, sig);					\
+									\
+	++ test##_caught;						\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_sendsignal_handle(sig, test##_sighandler, & test##_caught); \
 }
 
 // A signal handler for SIGKILL and SIGSTOP cannot be registered.
@@ -392,8 +398,8 @@ traceme_sendsignal_masked(int sigsent)
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
-
 	struct ptrace_siginfo info;
+
 	memset(&info, 0, sizeof(info));
 
 	DPRINTF("Before forking process PID=%d\n", getpid());
@@ -419,8 +425,8 @@ traceme_sendsignal_masked(int sigsent)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info))
-	                != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -443,19 +449,19 @@ traceme_sendsignal_masked(int sigsent)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_SENDSIGNAL_MASKED(test, sig)					\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify that a signal " #sig " emitted by a tracer to a child is "	\
-	    "handled correctly and the signal is masked by SIG_BLOCK");		\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_sendsignal_masked(sig);						\
+#define TRACEME_SENDSIGNAL_MASKED(test, sig)				\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify that a signal " #sig " emitted by a tracer to a child is " \
+	    "handled correctly and the signal is masked by SIG_BLOCK");	\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_sendsignal_masked(sig);					\
 }
 
 // A signal handler for SIGKILL and SIGSTOP cannot be masked.
@@ -475,14 +481,15 @@ traceme_sendsignal_ignored(int sigsent)
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
-
 	struct ptrace_siginfo info;
+
 	memset(&info, 0, sizeof(info));
 
 	DPRINTF("Before forking process PID=%d\n", getpid());
 	SYSCALL_REQUIRE((child = fork()) != -1);
 	if (child == 0) {
 		DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+		
 		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
 
 		memset(&sa, 0, sizeof(sa));
@@ -503,8 +510,8 @@ traceme_sendsignal_ignored(int sigsent)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info))
-	                != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -527,25 +534,25 @@ traceme_sendsignal_ignored(int sigsent)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_SENDSIGNAL_IGNORED(test, sig)					\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify that a signal " #sig " emitted by a tracer to a child is "	\
-	    "handled correctly and the signal is masked by SIG_IGN");		\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_sendsignal_ignored(sig);					\
+#define TRACEME_SENDSIGNAL_IGNORED(test, sig)				\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify that a signal " #sig " emitted by a tracer to a child is " \
+	    "handled correctly and the signal is masked by SIG_IGN");	\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_sendsignal_ignored(sig);				\
 }
 
 // A signal handler for SIGKILL and SIGSTOP cannot be ignored.
-TRACEME_SENDSIGNAL_IGNORED(traceme_sendsignal_ignored1, SIGABRT) /* abort trap */
+TRACEME_SENDSIGNAL_IGNORED(traceme_sendsignal_ignored1, SIGABRT) /* abort */
 TRACEME_SENDSIGNAL_IGNORED(traceme_sendsignal_ignored2, SIGHUP)  /* hangup */
-TRACEME_SENDSIGNAL_IGNORED(traceme_sendsignal_ignored3, SIGCONT) /* continued? */
+TRACEME_SENDSIGNAL_IGNORED(traceme_sendsignal_ignored3, SIGCONT) /* continued */
 
 /// ----------------------------------------------------------------------------
 
@@ -559,8 +566,8 @@ traceme_sendsignal_simple(int sigsent)
 	int status;
 	int expect_core = (sigsent == SIGABRT) ? 1 : 0;
 #endif
-
 	struct ptrace_siginfo info;
+
 	memset(&info, 0, sizeof(info));
 
 	DPRINTF("Before forking process PID=%d\n", getpid());
@@ -589,8 +596,8 @@ traceme_sendsignal_simple(int sigsent)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info))
-	                != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -611,26 +618,26 @@ traceme_sendsignal_simple(int sigsent)
 	case SIGSTOP:
 		validate_status_stopped(status, sigsent);
 		DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for "
-		        "child\n");
+		    "child\n");
 		SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info,
-		                       sizeof(info)) != -1);
+		    sizeof(info)) != -1);
 
 		DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 		DPRINTF("Signal properties: si_signo=%#x si_code=%#x "
-		        "si_errno=%#x\n",
-			info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
-		        info.psi_siginfo.si_errno);
+		    "si_errno=%#x\n",
+		    info.psi_siginfo.si_signo, info.psi_siginfo.si_code,
+		    info.psi_siginfo.si_errno);
 
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_code, SI_LWP);
 
 		DPRINTF("Before resuming the child process where it left off "
-		        "and with signal %s to be sent\n", strsignal(sigsent));
+		    "and with signal %s to be sent\n", strsignal(sigsent));
 		SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
 
 		DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
 		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0),
-		                      child);
+		    child);
 		/* FALLTHROUGH */
 	case SIGCONT:
 		validate_status_exited(status, exitval);
@@ -644,23 +651,23 @@ traceme_sendsignal_simple(int sigsent)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_SENDSIGNAL_SIMPLE(test, sig)					\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify that a signal " #sig " emitted by a tracer to a child is "	\
-	    "handled correctly in a child without a signal handler");		\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_sendsignal_simple(sig);						\
+#define TRACEME_SENDSIGNAL_SIMPLE(test, sig)				\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify that a signal " #sig " emitted by a tracer to a child is " \
+	    "handled correctly in a child without a signal handler");	\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_sendsignal_simple(sig);					\
 }
 
-TRACEME_SENDSIGNAL_SIMPLE(traceme_sendsignal_simple1, SIGKILL) /* non-maskable */
-TRACEME_SENDSIGNAL_SIMPLE(traceme_sendsignal_simple2, SIGSTOP) /* non-maskable */
+TRACEME_SENDSIGNAL_SIMPLE(traceme_sendsignal_simple1, SIGKILL) /* non-maskable*/
+TRACEME_SENDSIGNAL_SIMPLE(traceme_sendsignal_simple2, SIGSTOP) /* non-maskable*/
 TRACEME_SENDSIGNAL_SIMPLE(traceme_sendsignal_simple3, SIGABRT) /* abort trap */
 TRACEME_SENDSIGNAL_SIMPLE(traceme_sendsignal_simple4, SIGHUP)  /* hangup */
 TRACEME_SENDSIGNAL_SIMPLE(traceme_sendsignal_simple5, SIGCONT) /* continued? */
@@ -693,7 +700,7 @@ ATF_TC_BODY(traceme_pid1_parent, tc)
 		SYSCALL_REQUIRE((child2 = fork()) != -1);
 		if (child2 != 0) {
 			DPRINTF("Parent process PID=%d, child2's PID=%d\n",
-			        getpid(), child2);
+			    getpid(), child2);
 			_exit(exitval_child1);
 		}
 		CHILD_FROM_PARENT("exit child1", parent_child, msg);
@@ -712,8 +719,8 @@ ATF_TC_BODY(traceme_pid1_parent, tc)
 	DPRINTF("Parent process PID=%d, child1's PID=%d\n", getpid(), child1);
 
 	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
-	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child1, &status, WEXITED),
-	                      child1);
+	TWAIT_REQUIRE_SUCCESS(
+	    wpid = TWAIT_GENERIC(child1, &status, WEXITED), child1);
 
 	validate_status_exited(status, exitval_child1);
 
@@ -768,13 +775,13 @@ traceme_vfork_raise(int sigval)
 		}
 		DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
 		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(watcher, &status, 0),
-		                      watcher);
+		    watcher);
 
 		validate_status_exited(status, exitval_watcher);
 
 		DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
-		TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(watcher,
-		                                                   &status, 0));
+		TWAIT_REQUIRE_FAILURE(ECHILD,
+		    wpid = TWAIT_GENERIC(watcher, &status, 0));
 	}
 
 	DPRINTF("Before forking process PID=%d\n", getpid());
@@ -828,19 +835,19 @@ traceme_vfork_raise(int sigval)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_VFORK_RAISE(test, sig)						\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify PT_TRACE_ME followed by raise of " #sig " in a vfork(2)ed "	\
-	    "child");								\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_vfork_raise(sig);						\
+#define TRACEME_VFORK_RAISE(test, sig)					\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify PT_TRACE_ME followed by raise of " #sig " in a "	\
+	    "vfork(2)ed child");					\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_vfork_raise(sig);					\
 }
 
 TRACEME_VFORK_RAISE(traceme_vfork_raise1, SIGKILL) /* non-maskable */
@@ -904,19 +911,19 @@ traceme_vfork_crash(int sig)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define TRACEME_VFORK_CRASH(test, sig)						\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify PT_TRACE_ME followed by a crash signal " #sig " in a "	\
-	    "vfork(2)ed child");						\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	traceme_vfork_crash(sig);						\
+#define TRACEME_VFORK_CRASH(test, sig)					\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify PT_TRACE_ME followed by a crash signal " #sig " in a " \
+	    "vfork(2)ed child");					\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	traceme_vfork_crash(sig);					\
 }
 
 TRACEME_VFORK_CRASH(traceme_vfork_crash_trap, SIGTRAP)
@@ -941,8 +948,8 @@ ATF_TC_BODY(traceme_vfork_exec, tc)
 #if defined(TWAIT_HAVE_STATUS)
 	int status;
 #endif
-
 	struct ptrace_siginfo info;
+
 	memset(&info, 0, sizeof(info));
 
 	DPRINTF("Before forking process PID=%d\n", getpid());
@@ -965,7 +972,8 @@ ATF_TC_BODY(traceme_vfork_exec, tc)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -1000,6 +1008,7 @@ unrelated_tracer_sees_crash(int sig)
 	int status;
 #endif
 	struct ptrace_siginfo info;
+
 	memset(&info, 0, sizeof(info));
 
 	DPRINTF("Spawn tracee\n");
@@ -1008,7 +1017,7 @@ unrelated_tracer_sees_crash(int sig)
 	if (tracee == 0) {
 		// Wait for parent to let us crash
 		CHILD_FROM_PARENT("exit tracee", parent_tracee, msg);
-		
+
 		DPRINTF("Before executing a trap\n");
 		switch (sig) {
 		case SIGTRAP:
@@ -1042,7 +1051,7 @@ unrelated_tracer_sees_crash(int sig)
 		/* Fork again and drop parent to reattach to PID 1 */
 		tracer = atf_utils_fork();
 		if (tracer != 0)
-				_exit(exitval);
+			_exit(exitval);
 
 		DPRINTF("Before calling PT_ATTACH from tracee %d\n", getpid());
 		FORKEE_ASSERT(ptrace(PT_ATTACH, tracee, NULL, 0) != -1);
@@ -1069,14 +1078,14 @@ unrelated_tracer_sees_crash(int sig)
 		validate_status_stopped(status, sig);
 
 		DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for the "
-		        "traced process\n");
-		SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, tracee, &info,
-		                       sizeof(info)) != -1);
+		    "traced process\n");
+		SYSCALL_REQUIRE(
+		    ptrace(PT_GET_SIGINFO, tracee, &info, sizeof(info)) != -1);
 
 		DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 		DPRINTF("Signal properties: si_signo=%#x si_code=%#x "
-		        "si_errno=%#x\n", info.psi_siginfo.si_signo,
-		        info.psi_siginfo.si_code, info.psi_siginfo.si_errno);
+		    "si_errno=%#x\n", info.psi_siginfo.si_signo,
+		    info.psi_siginfo.si_code, info.psi_siginfo.si_errno);
 
 		ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sig);
 		switch (sig) {
@@ -1099,8 +1108,8 @@ unrelated_tracer_sees_crash(int sig)
 
 		FORKEE_ASSERT(ptrace(PT_KILL, tracee, NULL, 0) != -1);
 		DPRINTF("Before calling %s() for the tracee\n", TWAIT_FNAME);
-		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(tracee, &status, 0),
-		                      tracee);
+		TWAIT_REQUIRE_SUCCESS(
+		    wpid = TWAIT_GENERIC(tracee, &status, 0), tracee);
 
 		validate_status_signaled(status, SIGKILL, 0);
 
@@ -1143,19 +1152,19 @@ unrelated_tracer_sees_crash(int sig)
 	msg_close(&parent_tracee);
 }
 
-#define UNRELATED_TRACER_SEES_CRASH(test, sig)					\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Assert that an unrelated tracer sees crash signal from the "	\
-	    "debuggee");							\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	unrelated_tracer_sees_crash(sig);					\
+#define UNRELATED_TRACER_SEES_CRASH(test, sig)				\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Assert that an unrelated tracer sees crash signal from the " \
+	    "debuggee");						\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	unrelated_tracer_sees_crash(sig);				\
 }
 
 UNRELATED_TRACER_SEES_CRASH(unrelated_tracer_sees_crash_trap, SIGTRAP)
@@ -1516,11 +1525,10 @@ tracee_sees_its_original_parent(enum tra
 	int rv;
 
 	if (type == TRACEE_SEES_ITS_ORIGINAL_PARENT_PROCFS_STATUS) {
-		SYSCALL_REQUIRE((rv = stat(fname, &st)) == 0 ||
-		                (errno == ENOENT));
-		if (rv != 0) {
+		SYSCALL_REQUIRE(
+		    (rv = stat(fname, &st)) == 0 || (errno == ENOENT));
+		if (rv != 0)
 			atf_tc_skip("/proc/curproc/status not found");
-		}
 	}
 
 	DPRINTF("Spawn tracee\n");
@@ -1547,9 +1555,8 @@ tracee_sees_its_original_parent(enum tra
 			name[namelen++] = len;
 			name[namelen++] = 1;
 
-			FORKEE_ASSERT_EQ(sysctl(name, namelen, &kp, &len, NULL,
-			                        0),
-			                 0);
+			FORKEE_ASSERT_EQ(
+			    sysctl(name, namelen, &kp, &len, NULL, 0), 0);
 			FORKEE_ASSERT_EQ(parent, kp.p_ppid);
 			break;
 		case TRACEE_SEES_ITS_ORIGINAL_PARENT_PROCFS_STATUS:
@@ -1635,19 +1642,19 @@ tracee_sees_its_original_parent(enum tra
 	msg_close(&parent_tracee);
 }
 
-#define TRACEE_SEES_ITS_ORIGINAL_PARENT(test, type, descr)			\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Assert that tracee sees its original parent when being traced "	\
-	    "(check " descr ")");						\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	tracee_sees_its_original_parent(type);					\
+#define TRACEE_SEES_ITS_ORIGINAL_PARENT(test, type, descr)		\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Assert that tracee sees its original parent when being traced " \
+	    "(check " descr ")");					\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	tracee_sees_its_original_parent(type);				\
 }
 
 TRACEE_SEES_ITS_ORIGINAL_PARENT(
@@ -1698,8 +1705,10 @@ eventmask_preserved(int event)
 	validate_status_stopped(status, sigval);
 
 	set_event.pe_set_event = event;
-	SYSCALL_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &set_event, len) != -1);
-	SYSCALL_REQUIRE(ptrace(PT_GET_EVENT_MASK, child, &get_event, len) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_SET_EVENT_MASK, child, &set_event, len) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_EVENT_MASK, child, &get_event, len) != -1);
 	ATF_REQUIRE(memcmp(&set_event, &get_event, len) == 0);
 
 	DPRINTF("Before resuming the child process where it left off and "
@@ -1715,18 +1724,18 @@ eventmask_preserved(int event)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define EVENTMASK_PRESERVED(test, event)					\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify that eventmask " #event " is preserved");			\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	eventmask_preserved(event);						\
+#define EVENTMASK_PRESERVED(test, event)				\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify that eventmask " #event " is preserved");		\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	eventmask_preserved(event);					\
 }
 
 EVENTMASK_PRESERVED(eventmask_preserved_empty, 0)
@@ -1740,7 +1749,7 @@ EVENTMASK_PRESERVED(eventmask_preserved_
 
 static void
 fork_body(pid_t (*fn)(void), bool trackfork, bool trackvfork,
-          bool trackvforkdone, bool detachchild, bool detachparent)
+    bool trackvforkdone, bool detachchild, bool detachparent)
 {
 	const int exitval = 5;
 	const int exitval2 = 15;
@@ -1784,9 +1793,9 @@ fork_body(pid_t (*fn)(void), bool trackf
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Set 0%s%s%s in EVENT_MASK for the child %d\n",
-	        trackfork ? "|PTRACE_FORK" : "",
-	        trackvfork ? "|PTRACE_VFORK" : "",
-	        trackvforkdone ? "|PTRACE_VFORK_DONE" : "", child);
+	    trackfork ? "|PTRACE_FORK" : "",
+	    trackvfork ? "|PTRACE_VFORK" : "",
+	    trackvforkdone ? "|PTRACE_VFORK_DONE" : "", child);
 	event.pe_set_event = 0;
 	if (trackfork)
 		event.pe_set_event |= PTRACE_FORK;
@@ -1803,14 +1812,14 @@ fork_body(pid_t (*fn)(void), bool trackf
 #if defined(TWAIT_HAVE_PID)
 	if ((trackfork && fn == fork) || (trackvfork && fn == vfork)) {
 		DPRINTF("Before calling %s() for the child %d\n", TWAIT_FNAME,
-		        child);
+		    child);
 		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0),
-		                      child);
+		    child);
 
 		validate_status_stopped(status, SIGTRAP);
 
-		SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state,
-		                       slen) != -1);
+		SYSCALL_REQUIRE(
+		    ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 		if (trackfork && fn == fork) {
 			ATF_REQUIRE_EQ(state.pe_report_event & PTRACE_FORK,
 			       PTRACE_FORK);
@@ -1824,14 +1833,14 @@ fork_body(pid_t (*fn)(void), bool trackf
 		DPRINTF("Reported ptrace event with forkee %d\n", child2);
 
 		DPRINTF("Before calling %s() for the forkee %d of the child "
-		        "%d\n", TWAIT_FNAME, child2, child);
+		    "%d\n", TWAIT_FNAME, child2, child);
 		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0),
 		    child2);
 
 		validate_status_stopped(status, SIGTRAP);
 
-		SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child2, &state,
-		                       slen) != -1);
+		SYSCALL_REQUIRE(
+		    ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
 		if (trackfork && fn == fork) {
 			ATF_REQUIRE_EQ(state.pe_report_event & PTRACE_FORK,
 			       PTRACE_FORK);
@@ -1845,47 +1854,47 @@ fork_body(pid_t (*fn)(void), bool trackf
 
 		DPRINTF("Before resuming the forkee process where it left off "
 		    "and without signal to be sent\n");
-		SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child2, (void *)1, 0)
-		                != -1);
+		SYSCALL_REQUIRE(
+		    ptrace(PT_CONTINUE, child2, (void *)1, 0) != -1);
 
 		DPRINTF("Before resuming the child process where it left off "
-		        "and without signal to be sent\n");
+		    "and without signal to be sent\n");
 		SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
 	}
 #endif
 
 	if (trackvforkdone && fn == vfork) {
 		DPRINTF("Before calling %s() for the child %d\n", TWAIT_FNAME,
-		        child);
-		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0),
-		                      child);
+		    child);
+		TWAIT_REQUIRE_SUCCESS(
+		    wpid = TWAIT_GENERIC(child, &status, 0), child);
 
 		validate_status_stopped(status, SIGTRAP);
 
-		SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state,
-		                       slen) != -1);
+		SYSCALL_REQUIRE(
+		    ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 		ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK_DONE);
 
 		child2 = state.pe_other_pid;
 		DPRINTF("Reported PTRACE_VFORK_DONE event with forkee %d\n",
-		        child2);
+		    child2);
 
 		DPRINTF("Before resuming the child process where it left off "
-		        "and without signal to be sent\n");
+		    "and without signal to be sent\n");
 		SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
 	}
 
 #if defined(TWAIT_HAVE_PID)
 	if ((trackfork && fn == fork) || (trackvfork && fn == vfork)) {
 		DPRINTF("Before calling %s() for the forkee - expected exited"
-		        "\n", TWAIT_FNAME);
-		TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child2, &status, 0),
-		    child2);
+		    "\n", TWAIT_FNAME);
+		TWAIT_REQUIRE_SUCCESS(
+		    wpid = TWAIT_GENERIC(child2, &status, 0), child2);
 
 		validate_status_exited(status, exitval2);
 
 		DPRINTF("Before calling %s() for the forkee - expected no "
-		        "process\n", TWAIT_FNAME);
+		    "process\n", TWAIT_FNAME);
 		TWAIT_REQUIRE_FAILURE(ECHILD,
 		    wpid = TWAIT_GENERIC(child2, &status, 0));
 	}
@@ -1912,17 +1921,17 @@ fork_body(pid_t (*fn)(void), bool trackf
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define FORK_TEST(name,descr,fun,tfork,tvfork,tvforkdone,detchild,detparent)	\
-ATF_TC(name);									\
-ATF_TC_HEAD(name, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr", descr);					\
-}										\
-										\
-ATF_TC_BODY(name, tc)								\
-{										\
-										\
-	fork_body(fun, tfork, tvfork, tvforkdone, detchild, detparent);		\
+#define FORK_TEST(name,descr,fun,tfork,tvfork,tvforkdone,detchild,detparent) \
+ATF_TC(name);								\
+ATF_TC_HEAD(name, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr", descr);				\
+}									\
+									\
+ATF_TC_BODY(name, tc)							\
+{									\
+									\
+	fork_body(fun, tfork, tvfork, tvforkdone, detchild, detparent);	\
 }
 
 #define F false
@@ -1934,14 +1943,14 @@ ATF_TC_BODY(name, tc)								\
 #define F_IF_(x,y) F_IF__(x,y)
 #define F_IF(x,y) F_IF_(x,y)
 
-#define DSCR(function,forkbit,vforkbit,vforkdonebit,dchildbit,dparentbit)	\
-        "Verify " #function "(2) called with 0"					\
-        F_IF(forkbit,"|PTRACE_FORK")						\
-        F_IF(vforkbit,"|PTRACE_VFORK")						\
-        F_IF(vforkdonebit,"|PTRACE_VFORK_DONE")					\
-        " in EVENT_MASK."							\
-        F_IF(dchildbit," Detach child in this test.")				\
-        F_IF(dparentbit," Detach parent in this test.")
+#define DSCR(function,forkbit,vforkbit,vforkdonebit,dchildbit,dparentbit) \
+	"Verify " #function "(2) called with 0"				\
+	F_IF(forkbit,"|PTRACE_FORK")					\
+	F_IF(vforkbit,"|PTRACE_VFORK")					\
+	F_IF(vforkdonebit,"|PTRACE_VFORK_DONE")				\
+	" in EVENT_MASK."						\
+	F_IF(dchildbit," Detach child in this test.")			\
+	F_IF(dparentbit," Detach parent in this test.")
 
 FORK_TEST(fork1, DSCR(fork,0,0,0,0,0), fork, F, F, F, F, F)
 #if defined(TWAIT_HAVE_PID)
@@ -2386,19 +2395,19 @@ bytes_transfer(int operation, size_t siz
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
-#define BYTES_TRANSFER(test, operation, size, type)				\
-ATF_TC(test);									\
-ATF_TC_HEAD(test, tc)								\
-{										\
-	atf_tc_set_md_var(tc, "descr",						\
-	    "Verify bytes transfer operation" #operation " and size " #size	\
-	    " of type " #type);							\
-}										\
-										\
-ATF_TC_BODY(test, tc)								\
-{										\
-										\
-	bytes_transfer(operation, size, BYTES_TRANSFER_##type);			\
+#define BYTES_TRANSFER(test, operation, size, type)			\
+ATF_TC(test);								\
+ATF_TC_HEAD(test, tc)							\
+{									\
+	atf_tc_set_md_var(tc, "descr",					\
+	    "Verify bytes transfer operation" #operation " and size " #size \
+	    " of type " #type);						\
+}									\
+									\
+ATF_TC_BODY(test, tc)							\
+{									\
+									\
+	bytes_transfer(operation, size, BYTES_TRANSFER_##type);		\
 }
 
 // DATA
@@ -3452,7 +3461,8 @@ ATF_TC_BODY(siginfo2, tc)
 	    info.psi_siginfo.si_errno);
 
 	DPRINTF("Before calling ptrace(2) with PT_SET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_SET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_SET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before resuming the child process where it left off and "
 	    "without signal to be sent\n");
@@ -3530,7 +3540,8 @@ ATF_TC_BODY(siginfo3, tc)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -3543,10 +3554,12 @@ ATF_TC_BODY(siginfo3, tc)
 	info.psi_siginfo.si_code = sicodefaked;
 
 	DPRINTF("Before calling ptrace(2) with PT_SET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_SET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_SET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigfaked);
@@ -3602,7 +3615,8 @@ ATF_TC_BODY(siginfo4, tc)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -3679,7 +3693,8 @@ ATF_TC_BODY(siginfo5, tc)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
@@ -3703,13 +3718,15 @@ ATF_TC_BODY(siginfo5, tc)
 	validate_status_stopped(status, SIGTRAP);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_CHLD);
 
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_FORK);
 
 	child2 = state.pe_other_pid;
@@ -3723,13 +3740,15 @@ ATF_TC_BODY(siginfo5, tc)
 	validate_status_stopped(status, SIGTRAP);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_CHLD);
 
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_FORK);
 	ATF_REQUIRE_EQ(state.pe_other_pid, child);
 
@@ -3760,7 +3779,8 @@ ATF_TC_BODY(siginfo5, tc)
 	validate_status_stopped(status, SIGCHLD);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGCHLD);
@@ -3832,7 +3852,8 @@ ATF_TC_BODY(siginfo6, tc)
 	validate_status_stopped(status, sigval);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval);
@@ -3848,7 +3869,8 @@ ATF_TC_BODY(siginfo6, tc)
 	validate_status_stopped(status, SIGTRAP);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Before checking siginfo_t\n");
 	ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, SIGTRAP);
@@ -3951,7 +3973,8 @@ ATF_TC_BODY(lwp_create1, tc)
 
 	validate_status_stopped(status, SIGTRAP);
 
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_LWP_CREATE);
 
@@ -4047,7 +4070,8 @@ ATF_TC_BODY(lwp_exit1, tc)
 
 	validate_status_stopped(status, SIGTRAP);
 
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_LWP_EXIT);
 
@@ -4398,7 +4422,8 @@ ATF_TC_BODY(signal5, tc)
 	validate_status_stopped(status, sigmasked);
 
 	DPRINTF("Before calling ptrace(2) with PT_GET_SIGINFO for child\n");
-	SYSCALL_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1);
 
 	DPRINTF("Signal traced to lwpid=%d\n", info.psi_lwpid);
 	DPRINTF("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n",
@@ -4613,7 +4638,9 @@ ATF_TC_BODY(signal7, tc)
 
 	DPRINTF("Enable PTRACE_VFORK in EVENT_MASK for the child %d\n", child);
 	event.pe_set_event = PTRACE_VFORK;
-	SYSCALL_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1 || errno == ENOTSUP);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1 ||
+	    errno == ENOTSUP);
 
 	DPRINTF("Before resuming the child process where it left off and "
 	    "without signal to be sent\n");
@@ -4624,7 +4651,8 @@ ATF_TC_BODY(signal7, tc)
 
 	validate_status_stopped(status, sigmasked);
 
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK);
 
 	child2 = state.pe_other_pid;
@@ -4636,7 +4664,8 @@ ATF_TC_BODY(signal7, tc)
 
 	validate_status_stopped(status, SIGTRAP);
 
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK);
 	ATF_REQUIRE_EQ(state.pe_other_pid, child);
 
@@ -4755,7 +4784,8 @@ ATF_TC_BODY(signal8, tc)
 
 	validate_status_stopped(status, sigmasked);
 
-	SYSCALL_REQUIRE(ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
+	SYSCALL_REQUIRE(
+	    ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
 	ATF_REQUIRE_EQ(state.pe_report_event, PTRACE_VFORK_DONE);
 
 	child2 = state.pe_other_pid;
@@ -5576,7 +5606,8 @@ ATF_TP_ADD_TCS(tp)
 
 	ATF_TP_ADD_TC_HAVE_PID(tp, tracer_sees_terminaton_before_the_parent);
 	ATF_TP_ADD_TC_HAVE_PID(tp, tracer_sysctl_lookup_without_duplicates);
-	ATF_TP_ADD_TC_HAVE_PID(tp, unrelated_tracer_sees_terminaton_before_the_parent);
+	ATF_TP_ADD_TC_HAVE_PID(tp,
+		unrelated_tracer_sees_terminaton_before_the_parent);
 
 	ATF_TP_ADD_TC(tp, parent_attach_to_its_child);
 

Reply via email to