From fad5fe2cc1c7826decc37df4a37cac45f8fd1b78 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Thu, 5 Nov 2015 17:51:46 +0300 Subject: [PATCH] be_sock: drop be_sock_add() macro (useless and debug unfriendly) --- bufferevent_sock.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 431d6e4b..5c014426 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -96,9 +96,6 @@ const struct bufferevent_ops bufferevent_ops_socket = { be_socket_ctrl, }; -#define be_socket_add(ev, t) \ - bufferevent_add_event_((ev), (t)) - const struct sockaddr* bufferevent_socket_get_conn_address_(struct bufferevent *bev) { @@ -139,7 +136,7 @@ bufferevent_socket_outbuf_cb(struct evbuffer *buf, !bufev_p->write_suspended) { /* Somebody added data to the buffer, and we would like to * write, and we were not writing. So, start writing. */ - if (be_socket_add(&bufev->ev_write, &bufev->timeout_write) == -1) { + if (bufferevent_add_event_(&bufev->ev_write, &bufev->timeout_write) == -1) { /* Should we log this? */ } } @@ -577,11 +574,11 @@ static int be_socket_enable(struct bufferevent *bufev, short event) { if (event & EV_READ) { - if (be_socket_add(&bufev->ev_read,&bufev->timeout_read) == -1) + if (bufferevent_add_event_(&bufev->ev_read, &bufev->timeout_read) == -1) return -1; } if (event & EV_WRITE) { - if (be_socket_add(&bufev->ev_write,&bufev->timeout_write) == -1) + if (bufferevent_add_event_(&bufev->ev_write, &bufev->timeout_write) == -1) return -1; } return 0; -- 2.40.0