From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Thu, 5 Dec 2013 22:45:45 +0000 (+0000)
Subject: Clarifications in response to merge req. comments
X-Git-Tag: release-2.1.4-alpha~62^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd41947175f9156d0cd631a0f7a81161a39c66fa;p=libevent

Clarifications in response to merge req. comments
---

diff --git a/bufferevent-internal.h b/bufferevent-internal.h
index 12ae142b..70b25cd9 100644
--- a/bufferevent-internal.h
+++ b/bufferevent-internal.h
@@ -340,10 +340,10 @@ int bufferevent_decref_(struct bufferevent *bufev);
 int bufferevent_decref_and_unlock_(struct bufferevent *bufev);
 
 /** Internal: If callbacks are deferred and we have a read callback, schedule
- * a readcb.  Otherwise just run the readcb. */
+ * a readcb.  Otherwise just run the readcb. Ignores watermarks. */
 void bufferevent_run_readcb_(struct bufferevent *bufev, int options);
 /** Internal: If callbacks are deferred and we have a write callback, schedule
- * a writecb.  Otherwise just run the writecb. */
+ * a writecb.  Otherwise just run the writecb. Ignores watermarks. */
 void bufferevent_run_writecb_(struct bufferevent *bufev, int options);
 /** Internal: If callbacks are deferred and we have an eventcb, schedule
  * it to run with events "what".  Otherwise just run the eventcb.
@@ -352,7 +352,8 @@ void bufferevent_run_eventcb_(struct bufferevent *bufev, short what, int options
 
 /** Internal: Run or schedule (if deferred or options contain
  * BEV_TRIG_DEFER_CALLBACKS) I/O callbacks specified in iotype.
- * Must already hold the bufev lock. */
+ * Must already hold the bufev lock. Honors watermarks unless
+ * BEV_TRIG_IGNORE_WATERMARKS is in options. */
 void bufferevent_trigger_nolock_(struct bufferevent *bufev, short iotype, int options);
 
 
diff --git a/bufferevent.c b/bufferevent.c
index 5f424d7e..d8c84da4 100644
--- a/bufferevent.c
+++ b/bufferevent.c
@@ -629,14 +629,14 @@ bufferevent_getwatermark(struct bufferevent *bufev, short events,
     size_t *lowmark, size_t *highmark)
 {
 	BEV_LOCK(bufev);
-	if (events & EV_WRITE) {
+	if (events == EV_WRITE) {
 		if (lowmark)
 			*lowmark = bufev->wm_write.low;
 		if (highmark)
 			*highmark = bufev->wm_write.high;
 	}
 
-	if (events & EV_READ) {
+	if (events == EV_READ) {
 		if (lowmark)
 			*lowmark = bufev->wm_read.low;
 		if (highmark)