Changeset 14187


Ignore:
Timestamp:
Sep 8, 2013, 5:03:11 PM (8 years ago)
Author:
jordan
Message:

use evutil_socket_t instead of int to define socket types. Patch my mikedLd :)

Location:
trunk/libtransmission
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/announcer.c

    r14169 r14187  
    160160
    161161static void
    162 onUpkeepTimer (int foo UNUSED, short bar UNUSED, void * vannouncer);
     162onUpkeepTimer (evutil_socket_t foo UNUSED, short bar UNUSED, void * vannouncer);
    163163
    164164void
     
    15671567
    15681568static void
    1569 onUpkeepTimer (int foo UNUSED, short bar UNUSED, void * vannouncer)
     1569onUpkeepTimer (evutil_socket_t foo UNUSED, short bar UNUSED, void * vannouncer)
    15701570{
    15711571    tr_announcer * announcer = vannouncer;
  • trunk/libtransmission/handshake.c

    r14155 r14187  
    11771177
    11781178static void
    1179 handshakeTimeout (int foo UNUSED, short bar UNUSED, void * handshake)
     1179handshakeTimeout (evutil_socket_t foo UNUSED, short bar UNUSED, void * handshake)
    11801180{
    11811181  tr_handshakeAbort (handshake);
  • trunk/libtransmission/peer-io.c

    r14172 r14187  
    247247
    248248static void
    249 event_read_cb (int fd, short event UNUSED, void * vio)
     249event_read_cb (evutil_socket_t fd, short event UNUSED, void * vio)
    250250{
    251251    int res;
     
    326326
    327327static void
    328 event_write_cb (int fd, short event UNUSED, void * vio)
     328event_write_cb (evutil_socket_t fd, short event UNUSED, void * vio)
    329329{
    330330    int res = 0;
  • trunk/libtransmission/peer-mgr.c

    r14169 r14187  
    14761476/* cancel requests that are too old */
    14771477static void
    1478 refillUpkeep (int foo UNUSED, short bar UNUSED, void * vmgr)
     1478refillUpkeep (evutil_socket_t foo UNUSED, short bar UNUSED, void * vmgr)
    14791479{
    14801480    time_t now;
     
    23722372}
    23732373
    2374 static void atomPulse    (int, short, void *);
    2375 static void bandwidthPulse (int, short, void *);
    2376 static void rechokePulse (int, short, void *);
    2377 static void reconnectPulse (int, short, void *);
     2374static void atomPulse      (evutil_socket_t, short, void *);
     2375static void bandwidthPulse (evutil_socket_t, short, void *);
     2376static void rechokePulse   (evutil_socket_t, short, void *);
     2377static void reconnectPulse (evutil_socket_t, short, void *);
    23782378
    23792379static struct event *
    2380 createTimer (tr_session * session, int msec, void (*callback)(int, short, void *), void * cbdata)
     2380createTimer (tr_session * session, int msec, event_callback_fn callback, void * cbdata)
    23812381{
    23822382  struct event * timer = evtimer_new (session->event_base, callback, cbdata);
     
    31603160
    31613161static void
    3162 rechokePulse (int foo UNUSED, short bar UNUSED, void * vmgr)
     3162rechokePulse (evutil_socket_t foo UNUSED, short bar UNUSED, void * vmgr)
    31633163{
    31643164  tr_torrent * tor = NULL;
     
    35213521
    35223522static void
    3523 reconnectPulse (int foo UNUSED, short bar UNUSED, void * vmgr)
     3523reconnectPulse (evutil_socket_t foo UNUSED, short bar UNUSED, void * vmgr)
    35243524{
    35253525  tr_torrent * tor;
     
    36083608
    36093609static void
    3610 bandwidthPulse (int foo UNUSED, short bar UNUSED, void * vmgr)
     3610bandwidthPulse (evutil_socket_t foo UNUSED, short bar UNUSED, void * vmgr)
    36113611{
    36123612  tr_torrent * tor;
     
    37053705
    37063706static void
    3707 atomPulse (int foo UNUSED, short bar UNUSED, void * vmgr)
     3707atomPulse (evutil_socket_t foo UNUSED, short bar UNUSED, void * vmgr)
    37083708{
    37093709  tr_torrent * tor = NULL;
  • trunk/libtransmission/peer-msgs.c

    r14169 r14187  
    24462446
    24472447static void
    2448 pexPulse (int foo UNUSED, short bar UNUSED, void * vmsgs)
     2448pexPulse (evutil_socket_t foo UNUSED, short bar UNUSED, void * vmsgs)
    24492449{
    24502450    struct tr_peerMsgs * msgs = vmsgs;
  • trunk/libtransmission/port-forwarding.c

    r13868 r14187  
    127127
    128128static void
    129 onTimer (int fd UNUSED, short what UNUSED, void * vshared)
     129onTimer (evutil_socket_t fd UNUSED, short what UNUSED, void * vshared)
    130130{
    131131  tr_shared * s = vshared;
  • trunk/libtransmission/session.c

    r14172 r14187  
    181181
    182182static void
    183 accept_incoming_peer (int fd, short what UNUSED, void * vsession)
     183accept_incoming_peer (evutil_socket_t fd, short what UNUSED, void * vsession)
    184184{
    185185  int clientSocket;
     
    549549 */
    550550static void
    551 onSaveTimer (int foo UNUSED, short bar UNUSED, void * vsession)
     551onSaveTimer (evutil_socket_t foo UNUSED, short bar UNUSED, void * vsession)
    552552{
    553553  tr_torrent * tor = NULL;
     
    630630
    631631static void
    632 onNowTimer (int foo UNUSED, short bar UNUSED, void * vsession)
     632onNowTimer (evutil_socket_t foo UNUSED, short bar UNUSED, void * vsession)
    633633{
    634634  int usec;
  • trunk/libtransmission/tr-dht.c

    r13868 r14187  
    6767static tr_session *session = NULL;
    6868
    69 static void timer_callback (int s, short type, void *ignore);
     69static void timer_callback (evutil_socket_t s, short type, void *ignore);
    7070
    7171struct bootstrap_closure {
     
    658658
    659659static void
    660 timer_callback (int s UNUSED, short type UNUSED, void *session)
     660timer_callback (evutil_socket_t s UNUSED, short type UNUSED, void *session)
    661661{
    662662    tr_dhtCallback (NULL, 0, NULL, 0, session);
  • trunk/libtransmission/tr-lpd.c

    r13868 r14187  
    6868*/
    6969
    70 static void event_callback (int, short, void*);
     70static void event_callback (evutil_socket_t, short, void*);
    7171
    7272enum {
     
    256256* @} */
    257257
    258 static void on_upkeep_timer (int, short, void *);
     258static void on_upkeep_timer (evutil_socket_t, short, void *);
    259259
    260260/**
     
    620620
    621621static void
    622 on_upkeep_timer (int foo UNUSED, short bar UNUSED, void * vsession UNUSED)
     622on_upkeep_timer (evutil_socket_t foo UNUSED, short bar UNUSED, void * vsession UNUSED)
    623623{
    624624    const time_t now = tr_time ();
     
    631631* @note maximum rate of read events is limited according to @a lpd_maxAnnounceCap
    632632* @see DoS */
    633 static void event_callback (int s UNUSED, short type, void* ignore UNUSED)
     633static void event_callback (evutil_socket_t s UNUSED, short type, void* ignore UNUSED)
    634634{
    635635    assert (tr_isSession (session));
  • trunk/libtransmission/tr-udp.c

    r13868 r14187  
    189189
    190190static void
    191 event_callback (int s, short type UNUSED, void *sv)
     191event_callback (evutil_socket_t s, short type UNUSED, void *sv)
    192192{
    193193    int rc;
  • trunk/libtransmission/trevent.c

    r14166 r14187  
    161161
    162162static void
    163 readFromPipe (int    fd,
    164               short  eventType,
    165               void * veh)
     163readFromPipe (evutil_socket_t   fd,
     164              short             eventType,
     165              void            * veh)
    166166{
    167167    char              ch;
Note: See TracChangeset for help on using the changeset viewer.