From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 16 Aug 2009 19:22:15 +0000 (+0000)
Subject: Fix build warnings and add changelog entry for evhttp patches.
X-Git-Tag: release-2.0.3-alpha~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c1b0e442826baec932e614e8c730fd13ab3cd07;p=libevent

Fix build warnings and add changelog entry for evhttp patches.

svn:r1424
---

diff --git a/ChangeLog b/ChangeLog
index 9238946a..ad9665c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Changes in 2.0.3-alpha:
  o Fix a rare crash bug in evdns.
  o Have bufferevent_socket_connect() with no arguments put a bufferevent into connecting mode.
  o Support sendfile on Solaris: patch from Caitlin Mercer.
+ o New functions to explicitly reference a socket used by an evhttp object. Patches from David Reiss.
 
 
 Changes in 2.0.2-alpha:
diff --git a/http.c b/http.c
index 8fc1e7d3..aa631983 100644
--- a/http.c
+++ b/http.c
@@ -2394,7 +2394,7 @@ struct evhttp_bound_socket *
 evhttp_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint16_t port)
 {
 	evutil_socket_t fd;
-	int res;
+	struct evhttp_bound_socket *bound;
 
 	if ((fd = bind_socket(address, port, 1 /*reuse*/)) == -1)
 		return (NULL);
@@ -2405,8 +2405,7 @@ evhttp_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint
 		return (NULL);
 	}
 
-	struct evhttp_bound_socket *bound =
-		evhttp_accept_socket_with_handle(http, fd);
+	bound = evhttp_accept_socket_with_handle(http, fd);
 
 	if (bound != NULL) {
 		event_debug(("Bound to port %d - Awaiting connections ... ",