Move some definitions and such

1 files changed, 6 insertions, 11 deletions

diff --git a/scan.c b/scan.c
index 1fe04fa..b18ad60 100644
--- a/scan.c
+++ b/scan.c
@@ -398,8 +398,8 @@ reset_signals()
 int
 main(int argc, char **argv)
 {
-	int kq, dir_fd, lock_fd;
-	struct kevent evt[6];
+	int kq, dir_fd, lock_fd, e, i;
+	struct kevent evt[6], revt[6];
 	struct procctl_reaper_kill rk;
 	struct procctl_reaper_status rs;
 	pid_t mypid = getpid();
@@ -439,13 +439,10 @@ main(int argc, char **argv)
 	start_dead();
 
 	for (;;) {
-		struct kevent revt[6];
-		int e = kevent(kq, NULL, 0, revt, 6, NULL);
-		if (e == -1) {
+		if ((e = kevent(kq, NULL, 0, revt, 6, NULL)) == -1) {
 			if (errno != EINTR)
-				err(1, "kevent()");
+				perror("kevent()");
 		} else if (e > 0) {
-			int i;
 			for (i = 0; i < e; i++) {
 				if (revt[i].filter == EVFILT_VNODE && revt[i].ident == dir_fd) {
 					scan_svcdir(dir_fd);
@@ -453,16 +450,14 @@ main(int argc, char **argv)
 					if (revt[i].ident == SIGCHLD) {
 						if (try_wait()) {
 							if (kevent(kq, &evt[5], 1, NULL, 0, NULL) == -1)
-								err(1, "kevent()");
+								perror("kevent()");
 						}
 					}
 					if (revt[i].ident == SIGHUP || revt[i].ident == SIGINT || revt[i].ident == SIGTERM) {
 						goto end;
 					}
-				} else if (revt[i].filter == EVFILT_TIMER) {
-					if (revt[i].ident == 1) {
+				} else if (revt[i].filter == EVFILT_TIMER && revt[i].ident == 1) {
 						start_dead();
-					}
 				} else {
 					fprintf(stderr, "Unknown event\n");
 				}