You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2015/01/12 19:35:21 UTC

trafficserver git commit: TS-3287: fix event bitmasking check

Repository: trafficserver
Updated Branches:
  refs/heads/master 229cf3cbc -> d9d1fdeb0


TS-3287: fix event bitmasking check

Coverity CID #1022024


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d9d1fdeb
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d9d1fdeb
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d9d1fdeb

Branch: refs/heads/master
Commit: d9d1fdeb0a88d4238488aaa7c9ec5a0269c91c4b
Parents: 229cf3c
Author: James Peach <jp...@apache.org>
Authored: Mon Jan 12 09:12:12 2015 -0800
Committer: James Peach <jp...@apache.org>
Committed: Mon Jan 12 09:22:12 2015 -0800

----------------------------------------------------------------------
 iocore/net/UnixNet.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d9d1fdeb/iocore/net/UnixNet.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index 09dcb0f..fe9303d 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -393,7 +393,7 @@ NetHandler::mainNetEvent(int event, Event *e)
                 "Unhandled epoll event on write: 0x%04x write.enabled=%d closed=%d write.netready_queue=%d",
                 get_ev_events(pd,x), vc->write.enabled, vc->closed, write_ready_list.in(vc));
         }
-      } else if (!get_ev_events(pd,x) & EVENTIO_ERROR) {
+      } else if (!(get_ev_events(pd,x) & EVENTIO_ERROR)) {
         Debug("iocore_net_main", "Unhandled epoll event: 0x%04x", get_ev_events(pd,x));
       }
     } else if (epd->type == EVENTIO_DNS_CONNECTION) {
@@ -403,8 +403,9 @@ NetHandler::mainNetEvent(int event, Event *e)
         epd->refresh(EVENTIO_READ);
 #endif
       }
-    } else if (epd->type == EVENTIO_ASYNC_SIGNAL)
+    } else if (epd->type == EVENTIO_ASYNC_SIGNAL) {
       net_signal_hook_callback(trigger_event->ethread);
+    }
     ev_next_event(pd,x);
   }