svn commit: r240364 - head/usr.bin/truss

Andrey Zonov zont at FreeBSD.org
Tue Sep 11 16:30:27 UTC 2012


Author: zont
Date: Tue Sep 11 16:30:26 2012
New Revision: 240364
URL: http://svn.freebsd.org/changeset/base/240364

Log:
  - Remove unused variables.
  - Remove redundant return after err(3) call.
  
  Approved by:	kib (mentor)

Modified:
  head/usr.bin/truss/setup.c

Modified: head/usr.bin/truss/setup.c
==============================================================================
--- head/usr.bin/truss/setup.c	Tue Sep 11 13:58:03 2012	(r240363)
+++ head/usr.bin/truss/setup.c	Tue Sep 11 16:30:26 2012	(r240364)
@@ -70,7 +70,6 @@ int
 setup_and_wait(char *command[])
 {
 	pid_t pid;
-	int waitval;
 
 	pid = vfork();
 	if (pid == -1)
@@ -82,10 +81,8 @@ setup_and_wait(char *command[])
 	}
 
 	/* Only in the parent here */
-	if (waitpid(pid, &waitval, 0) < 0) {
+	if (waitpid(pid, NULL, 0) < 0)
 		err(1, "unexpect stop in waitpid");
-		return 0;
-	}
 
 	child_pid = pid;
 
@@ -101,7 +98,7 @@ setup_and_wait(char *command[])
 int
 start_tracing(pid_t pid)
 {
-	int ret, retry, waitval;
+	int ret, retry;
 
 	retry = 10;
 	do {
@@ -112,7 +109,7 @@ start_tracing(pid_t pid)
 		err(1, "can not attach to target process");
 
 	child_pid = pid;
-	if (waitpid(pid, &waitval, 0) < 0)
+	if (waitpid(pid, NULL, 0) < 0)
 		err(1, "Unexpect stop in waitpid");
 
 	return (0);


More information about the svn-src-head mailing list