From 807eff8416d863fdc37d7351145b41a3fcbe409c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 15 Nov 2007 22:03:22 +0000 Subject: [PATCH] remove dead code. --- libtransmission/peer-io.c | 6 ++++-- libtransmission/trevent.c | 25 ------------------------- libtransmission/trevent.h | 5 ----- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c index 76ab00a86..d19f2226d 100644 --- a/libtransmission/peer-io.c +++ b/libtransmission/peer-io.c @@ -250,9 +250,11 @@ tr_peerIoSetIOFuncs( tr_peerIo * io, } void -tr_peerIoSetIOMode( tr_peerIo * c, short enable, short disable ) +tr_peerIoSetIOMode( tr_peerIo * io, short enable, short disable ) { - tr_setBufferEventMode( c->handle, c->bufev, enable, disable ); + assert( tr_amInEventThread( io->handle ) ); + bufferevent_enable( io->bufev, enable ); + bufferevent_disable( io->bufev, disable ); } int diff --git a/libtransmission/trevent.c b/libtransmission/trevent.c index 52d92c058..bdafa09cc 100644 --- a/libtransmission/trevent.c +++ b/libtransmission/trevent.c @@ -64,7 +64,6 @@ static int writes = 0; enum mode { TR_EV_EVHTTP_MAKE_REQUEST, - TR_EV_BUFFEREVENT_SET, TR_EV_TIMER_ADD, TR_EV_TIMER_DEL, TR_EV_EXEC @@ -143,11 +142,6 @@ pumpList( int i UNUSED, short s UNUSED, void * veh ) tr_free( cmd->uri ); break; - case TR_EV_BUFFEREVENT_SET: - bufferevent_enable( cmd->bufev, cmd->enable ); - bufferevent_disable( cmd->bufev, cmd->disable ); - break; - case TR_EV_EXEC: (cmd->func)( cmd->user_data ); break; @@ -277,25 +271,6 @@ tr_evhttp_make_request (tr_handle * handle, } } -void -tr_setBufferEventMode( struct tr_handle * handle, - struct bufferevent * bufev, - short mode_enable, - short mode_disable ) -{ - if( tr_amInThread( handle->events->thread ) ) { - bufferevent_enable( bufev, mode_enable ); - bufferevent_disable( bufev, mode_disable ); - } else { - struct tr_event_command * cmd = tr_new0( struct tr_event_command, 1 ); - cmd->mode = TR_EV_BUFFEREVENT_SET; - cmd->bufev = bufev; - cmd->enable = mode_enable; - cmd->disable = mode_disable; - pushList( handle->events, cmd ); - } -} - /** *** **/ diff --git a/libtransmission/trevent.h b/libtransmission/trevent.h index 382df0146..646514b48 100644 --- a/libtransmission/trevent.h +++ b/libtransmission/trevent.h @@ -37,11 +37,6 @@ void tr_evhttp_make_request (struct tr_handle * tr_handle, enum evhttp_cmd_type type, char * uri); -void tr_setBufferEventMode( struct tr_handle * tr_handle, - struct bufferevent * bufferEvent, - short mode_enable, - short mode_disable ); - int tr_amInEventThread( struct tr_handle * handle ); /**