Date: Tue, 29 Oct 2013 03:12:31 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257298 - head/lib/libproc Message-ID: <201310290312.r9T3CVx4064237@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310290312.r9T3CVx4064237>