From owner-svn-src-all@FreeBSD.ORG  Tue Oct 29 03:12:32 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 232A6B54;
 Tue, 29 Oct 2013 03:12:32 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1125F2343;
 Tue, 29 Oct 2013 03:12:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9T3CVNY064239;
 Tue, 29 Oct 2013 03:12:31 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9T3CVx4064237;
 Tue, 29 Oct 2013 03:12:31 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201310290312.r9T3CVx4064237@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 29 Oct 2013 03:12:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257298 - head/lib/libproc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 03:12:32 -0000

Author: markj
Date: Tue Oct 29 03:12:31 2013
New Revision: 257298
URL: http://svnweb.freebsd.org/changeset/base/257298

Log:
  Revert r257248 and fix the problem in a way that doesn't violate style(9).
  
  Suggested by:	jmg

Modified:
  head/lib/libproc/_libproc.h
  head/lib/libproc/proc_util.c

Modified: head/lib/libproc/_libproc.h
==============================================================================
--- head/lib/libproc/_libproc.h	Tue Oct 29 02:25:18 2013	(r257297)
+++ head/lib/libproc/_libproc.h	Tue Oct 29 03:12:31 2013	(r257298)
@@ -52,6 +52,6 @@ struct proc_handle {
 #define	DPRINTF(...) 	warn(__VA_ARGS__)
 #define	DPRINTFX(...)	warnx(__VA_ARGS__)
 #else
-#define	DPRINTF(...)
-#define	DPRINTFX(...)
+#define	DPRINTF(...)    do { } while (0)
+#define	DPRINTFX(...)   do { } while (0)
 #endif

Modified: head/lib/libproc/proc_util.c
==============================================================================
--- head/lib/libproc/proc_util.c	Tue Oct 29 02:25:18 2013	(r257297)
+++ head/lib/libproc/proc_util.c	Tue Oct 29 03:12:31 2013	(r257298)
@@ -145,9 +145,8 @@ proc_wstatus(struct proc_handle *phdl)
 	if (phdl == NULL)
 		return (-1);
 	if (waitpid(phdl->pid, &status, WUNTRACED) < 0) {
-		if (errno != EINTR) {
+		if (errno != EINTR)
 			DPRINTF("waitpid");
-		}
 		return (-1);
 	}
 	if (WIFSTOPPED(status))