diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-06-12 05:08:52 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-06-12 05:08:52 +0000 |
| commit | a2ef198c2a8993d937f9e4fc4c7586f63f3dedb2 (patch) | |
| tree | 93499950299167ac346e5fad88c0e06bc641acda | |
| parent | d929e09929bff6f39b9be75d18497b3110a25951 (diff) | |
ugh. cleanup debugging
| -rw-r--r-- | regress/sys/kern/kqueue/Makefile | 3 | ||||
| -rw-r--r-- | regress/sys/kern/kqueue/kqueue-pty.c | 28 |
2 files changed, 10 insertions, 21 deletions
diff --git a/regress/sys/kern/kqueue/Makefile b/regress/sys/kern/kqueue/Makefile index 5b002bbb11e..ef816308098 100644 --- a/regress/sys/kern/kqueue/Makefile +++ b/regress/sys/kern/kqueue/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2003/06/12 05:06:47 mickey Exp $ +# $OpenBSD: Makefile,v 1.7 2003/06/12 05:08:51 mickey Exp $ PROG= kqueue-test CFLAGS+=-Wall @@ -6,7 +6,6 @@ SRCS= kqueue-pipe.c kqueue-fork.c main.c kqueue-process.c kqueue-random.c \ kqueue-pty.c LDADD= ${LIBUTIL} DPADD= ${DPUTIL} -SUDO=sudo kq-pipe: ${PROG} ./${PROG} -p diff --git a/regress/sys/kern/kqueue/kqueue-pty.c b/regress/sys/kern/kqueue/kqueue-pty.c index 4683bb67a3f..a7d9af92bb2 100644 --- a/regress/sys/kern/kqueue/kqueue-pty.c +++ b/regress/sys/kern/kqueue/kqueue-pty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kqueue-pty.c,v 1.1 2003/06/12 05:06:47 mickey Exp $ */ +/* $OpenBSD: kqueue-pty.c,v 1.2 2003/06/12 05:08:51 mickey Exp $ */ #include <sys/types.h> #include <sys/time.h> @@ -10,8 +10,6 @@ #include <fcntl.h> #include <err.h> -#define EVDUMP(ev) printf("%d %d %d %d %d", ev->ident, ev->filter, ev->flags, ev->fflags, ev->data) - int pty_check(int kq, struct kevent *ev, int n, int rm, int rs, int wm, int ws) { @@ -26,28 +24,20 @@ pty_check(int kq, struct kevent *ev, int n, int rm, int rs, int wm, int ws) if (n == 0) return (1); - printf("%d:\n", n); for (i = 0; i < n; i++, ev++) { - EVDUMP(ev); if (ev->filter == EVFILT_READ) { - if (rm < 0 && ev->ident == -rm) { - printf(" bad"); - } - if (rs < 0 && ev->ident == -rs) { - printf(" bad"); - } + if (rm < 0 && ev->ident == -rm) + return (1); + if (rs < 0 && ev->ident == -rs) + return (1); } else if (ev->filter == EVFILT_WRITE) { - if (wm < 0 && ev->ident == -wm) { - printf(" bad"); - } - if (ws < 0 && ev->ident == -ws) { - printf(" bad"); - } + if (wm < 0 && ev->ident == -wm) + return (1); + if (ws < 0 && ev->ident == -ws) + return (1); } else errx(1, "unknown event"); - printf("\n"); } - printf("\n"); return (0); } |