From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 22 Dec 2009 20:51:39 +0000 (-0500)
Subject: Simplify the read high-watermark checking.
X-Git-Tag: release-2.0.4-alpha~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5846bf6cddbed402dbdf51e6268795cf41dbf9ba;p=libevent

Simplify the read high-watermark checking.
---

diff --git a/bufferevent.c b/bufferevent.c
index 3f28eeeb..96b8ec7d 100644
--- a/bufferevent.c
+++ b/bufferevent.c
@@ -120,17 +120,10 @@ bufferevent_inbuf_wm_cb(struct evbuffer *buf,
 
 	size = evbuffer_get_length(buf);
 
-	if (cbinfo->n_added > cbinfo->n_deleted) {
-		/* Data got added.  If it put us over the watermark, stop
-		 * reading. */
-		if (size >= bufev->wm_read.high)
-			bufferevent_wm_suspend_read(bufev);
-	} else {
-		/* Data got removed.  If it puts us under the watermark,
-		   stop reading. */
-		if (size < bufev->wm_read.high)
-			bufferevent_wm_unsuspend_read(bufev);
-	}
+	if (size >= bufev->wm_read.high)
+		bufferevent_wm_suspend_read(bufev);
+	else
+		bufferevent_wm_unsuspend_read(bufev);
 }
 
 static void