]> granicus.if.org Git - libevent/commitdiff
Simplify the read high-watermark checking.
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Dec 2009 20:51:39 +0000 (15:51 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Dec 2009 20:52:12 +0000 (15:52 -0500)
bufferevent.c

index 3f28eeeb34bd50a169782368560a050b9b0ae2df..96b8ec7d7ad28b433d61ab31ad0073b70da0ff3c 100644 (file)
@@ -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