From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 8 Jun 2011 17:32:47 +0000 (-0400)
Subject: Remove a needless branch in evbuffer_drain()
X-Git-Tag: release-2.1.1-alpha~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d19a3260875a85206752a2aa8eaabeefb7e854d7;p=libevent

Remove a needless branch in evbuffer_drain()

Found by Gilad Benjamini; see June 2011 thread "Dead or wrong code".
---

diff --git a/buffer.c b/buffer.c
index 98de504c..84d3aea8 100644
--- a/buffer.c
+++ b/buffer.c
@@ -934,10 +934,8 @@ evbuffer_drain(struct evbuffer *buf, size_t len)
 		}
 
 		buf->first = chain;
-		if (chain) {
-			chain->misalign += remaining;
-			chain->off -= remaining;
-		}
+		chain->misalign += remaining;
+		chain->off -= remaining;
 	}
 
 	buf->n_del_for_cb += len;