Do not use the "evbuffer_" prefix to denote parts of bufferevents.

This is a bit of an interface doozy, but it's really needed in order
to be able to document this stuff without apologizing it.  This patch
does the following renamings:

   evbuffercb -> bufferevent_data_cb
   everrorcb -> bufferevent_event_cb
   EVBUFFER_(READ,WRITE,...) -> BEV_EVENT_(...)
   EVBUFFER_(INPUT,OUTPUT) -> bufferevent_get_(input,output)

All the old names are available in event2/bufferevent_compat.h

svn:r1283

1 files changed, 4 insertions, 4 deletions

diff --git a/http.c b/http.c
index 282fd0e0..75a0f688 100644
--- a/http.c
+++ b/http.c
@@ -1092,7 +1092,7 @@ evhttp_error_cb(struct bufferevent *bufev, short what, void *arg)
 
 	switch (evcon->state) {
 	case EVCON_CONNECTING:
-		if (what == EVBUFFER_TIMEOUT) {
+		if (what == BEV_EVENT_TIMEOUT) {
 			event_debug(("%s: connection timeout for \"%s:%d\" on %d",
 				__func__, evcon->address, evcon->port,
 				evcon->fd));
@@ -1103,7 +1103,7 @@ evhttp_error_cb(struct bufferevent *bufev, short what, void *arg)
 
 	case EVCON_READING_BODY:
 		if (!req->chunked && req->ntoread < 0
-		    && what == (EVBUFFER_READ|EVBUFFER_EOF)) {
+		    && what == (BEV_EVENT_READING|BEV_EVENT_EOF)) {
 			/* EOF on read can be benign */
 			evhttp_connection_done(evcon);
 			return;
@@ -1135,9 +1135,9 @@ evhttp_error_cb(struct bufferevent *bufev, short what, void *arg)
 		return;
 	}
 
-	if (what & EVBUFFER_TIMEOUT) {
+	if (what & BEV_EVENT_TIMEOUT) {
 		evhttp_connection_fail(evcon, EVCON_HTTP_TIMEOUT);
-	} else if (what & (EVBUFFER_EOF|EVBUFFER_ERROR)) {
+	} else if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) {
 		evhttp_connection_fail(evcon, EVCON_HTTP_EOF);
 	} else {
 		evhttp_connection_fail(evcon, EVCON_HTTP_BUFFER_ERROR);