From 225344cfac221a3ba968c1a02c3ab1ac0622f0ff Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 26 Jul 2012 10:11:17 -0400
Subject: [PATCH] Fix a shadowed variable in addfile_test_readcb; found by
 coverity

---
 test/regress_buffer.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/regress_buffer.c b/test/regress_buffer.c
index 365b0c37..551d9e96 100644
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@@ -659,7 +659,7 @@ addfile_test_readcb(evutil_socket_t fd, short what, void *arg)
 	struct evbuffer *b = arg;
 	int e, r = 0;
 	do {
-		int r = evbuffer_read(b, fd, 1024);
+		r = evbuffer_read(b, fd, 1024);
 		if (r > 0) {
 			addfile_test_total_read += r;
 			TT_BLATHER(("Read %d/%d bytes", r, addfile_test_total_read));
@@ -1993,6 +1993,8 @@ test_evbuffer_add_iovec(void * ptr)
 
 	buf = evbuffer_new();
 
+	tt_assert(buf);
+
 	for (i = 0; i < 4; i++) {
 		vec[i].iov_len  = strlen(data[i]);
 		vec[i].iov_base = (char*) data[i];