X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=util.c;h=c459f1340a6d406caf528eebf2f777e173ed3a76;hb=ae5ae3bf5c5709938e3a2bb6203094ede8af45e6;hp=0215f257620b29955da29135aa332cf044bcf944;hpb=46d06c3918b0080af7e87db986612e23bde4a341;p=secnet.git

diff --git a/util.c b/util.c
index 0215f25..c459f13 100644
--- a/util.c
+++ b/util.c
@@ -613,6 +613,17 @@ int iaddr_socklen(const union iaddr *ia)
     }
 }
 
+const char *pollbadbit(int revents)
+{
+#define BADBIT(b) \
+    if ((revents & b)) return #b
+    BADBIT(POLLERR);
+    BADBIT(POLLHUP);
+    /* POLLNVAL is handled by the event loop - see afterpoll_fn comment */
+#undef BADBIT
+    return 0;
+}
+
 enum async_linebuf_result
 async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
 		   const char **emsg_out)
@@ -620,12 +631,9 @@ async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
     int revents=pfd->revents;
 
 #define BAD(m) do{ *emsg_out=(m); return async_linebuf_broken; }while(0)
-#define BADBIT(b) \
-    if (!(revents & b)) ; else BAD(#b)
-    BADBIT(POLLERR);
-    BADBIT(POLLHUP);
-    /* POLLNVAL is handled by the event loop - see afterpoll_fn comment */
-#undef BADBIT
+
+    const char *badbit=pollbadbit(revents);
+    if (badbit) BAD(badbit);
 
     if (!(revents & POLLIN))
 	return async_linebuf_nothing;