From a1b142bd3e327c488841636e4e85db2c1459399d Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Sun, 8 Nov 2015 14:33:49 +0300
Subject: [PATCH] epoll: introduce PRINT_CHANGES() macro to avoid copy-pasting

And also this will use change_to_string() for successfully returned
epoll_ctl()
---
 epoll.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/epoll.c b/epoll.c
index aa41f84e02..bf730b23db 100644
--- a/epoll.c
+++ b/epoll.c
@@ -246,6 +246,23 @@ epoll_op_to_string(int op)
 	    "???";
 }
 
+#define PRINT_CHANGES(op, events, ch, status)  \
+	"Epoll %s(%d) on fd %d " status ". "       \
+	"Old events were %d; "                     \
+	"read change was %d (%s); "                \
+	"write change was %d (%s); "               \
+	"close change was %d (%s)",                \
+	epoll_op_to_string(op),                    \
+	events,                                    \
+	ch->fd,                                    \
+	ch->old_events,                            \
+	ch->read_change,                           \
+	change_to_string(ch->read_change),         \
+	ch->write_change,                          \
+	change_to_string(ch->write_change),        \
+	ch->close_change,                          \
+	change_to_string(ch->close_change)
+
 static int
 epoll_apply_one_change(struct event_base *base,
     struct epollop *epollop,
@@ -271,14 +288,7 @@ epoll_apply_one_change(struct event_base *base,
 	epev.data.fd = ch->fd;
 	epev.events = events;
 	if (epoll_ctl(epollop->epfd, op, ch->fd, &epev) == 0) {
-		event_debug(("Epoll %s(%d) on fd %d okay. [old events were %d; read change was %d; write change was %d; close change was %d]",
-			epoll_op_to_string(op),
-			(int)epev.events,
-			(int)ch->fd,
-			ch->old_events,
-			ch->read_change,
-			ch->write_change,
-			ch->close_change));
+		event_debug((PRINT_CHANGES(op, epev.events, ch, "okay")));
 		return 0;
 	}
 
@@ -338,18 +348,7 @@ epoll_apply_one_change(struct event_base *base,
 		break;
 	}
 
-	event_warn("Epoll %s(%d) on fd %d failed.  Old events were %d; read change was %d (%s); write change was %d (%s); close change was %d (%s)",
-	    epoll_op_to_string(op),
-	    (int)epev.events,
-	    ch->fd,
-	    ch->old_events,
-	    ch->read_change,
-	    change_to_string(ch->read_change),
-	    ch->write_change,
-	    change_to_string(ch->write_change),
-	    ch->close_change,
-	    change_to_string(ch->close_change));
-
+	event_warn(PRINT_CHANGES(op, epev.events, ch, "failed"));
 	return -1;
 }