From fb15925c14316c4059e623eb7ccc12bec99dfcc6 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Tue, 29 Oct 2013 03:12:31 +0000 Subject: [PATCH] Revert r257248 and fix the problem in a way that doesn't violate style(9). Suggested by: jmg --- lib/libproc/_libproc.h | 4 ++-- lib/libproc/proc_util.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/libproc/_libproc.h b/lib/libproc/_libproc.h index a650f4500447..8099ba1d9173 100644 --- a/lib/libproc/_libproc.h +++ b/lib/libproc/_libproc.h @@ -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 diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c index 646ee97e241f..1c3d5229c9f4 100644 --- a/lib/libproc/proc_util.c +++ b/lib/libproc/proc_util.c @@ -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))