Changeset 9131


Ignore:
Timestamp:
Sep 17, 2009, 3:24:35 AM (12 years ago)
Author:
charles
Message:

(trunk libT) use tr_torrentName() instead of tor->info.name

Location:
trunk/libtransmission
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/handshake.c

    r8889 r9131  
    863863        const tr_bool peerIsSeed = tr_peerMgrPeerIsSeed( tor, tr_peerIoGetAddress( handshake->io, NULL ) );
    864864        dbgmsg( handshake, "got INCOMING connection's encrypted handshake for torrent [%s]",
    865                 tor->info.name );
     865                tr_torrentName( tor ) );
    866866        tr_peerIoSetTorrentHash( handshake->io, tor->info.hash );
    867867
  • trunk/libtransmission/peer-mgr.c

    r9089 r9131  
    172172    do { \
    173173        if( tr_deepLoggingIsActive( ) ) \
    174             tr_deepLog( __FILE__, __LINE__, t->tor->info.name, __VA_ARGS__ ); \
     174            tr_deepLog( __FILE__, __LINE__, tr_torrentName( t->tor ), __VA_ARGS__ ); \
    175175    } while( 0 )
    176176
     
    23642364                   "%d atoms, "
    23652365                   "max per pulse is %d",
    2366                    t->tor->info.name,
     2366                   tr_torrentName( t->tor ),
    23672367                   mustCloseCount,
    23682368                   canCloseCount,
  • trunk/libtransmission/peer-msgs.c

    r9085 r9131  
    220220        evbuffer_add_printf( buf, "[%s] %s - %s [%s]: ",
    221221                             tr_getLogTimeStr( timestr, sizeof( timestr ) ),
    222                              msgs->torrent->info.name,
     222                             tr_torrentName( msgs->torrent ),
    223223                             tr_peerIoGetAddrStr( msgs->peer->io ),
    224224                             msgs->peer->client );
  • trunk/libtransmission/resume.c

    r9085 r9131  
    7070                             tr_getResumeDir( tor->session ),
    7171                             TR_PATH_DELIMITER,
    72                              tor->info.name,
     72                             tr_torrentName( tor ),
    7373                             tor->info.hashString );
    7474}
     
    502502        return;
    503503
    504     tr_tordbg( tor, "Saving .resume file for \"%s\"", tor->info.name );
     504    tr_tordbg( tor, "Saving .resume file for \"%s\"", tr_torrentName( tor ) );
    505505
    506506    tr_bencInitDict( &top, 32 ); /* arbitrary "big enough" number */
  • trunk/libtransmission/torrent.h

    r8915 r9131  
    327327};
    328328
    329 static inline tr_bool tr_isTorrent( const tr_torrent * tor )
     329static TR_INLINE tr_bool tr_isTorrent( const tr_torrent * tor )
    330330{
    331331    return ( tor != NULL )
     
    336336/* set a flag indicating that the torrent's .resume file
    337337 * needs to be saved when the torrent is closed */
    338 static inline void tr_torrentSetDirty( tr_torrent * tor )
     338static TR_INLINE void tr_torrentSetDirty( tr_torrent * tor )
    339339{
    340340    assert( tr_isTorrent( tor ) );
     
    343343}
    344344
     345static TR_INLINE const char * tr_torrentName( const tr_torrent * tor )
     346{
     347    assert( tr_isTorrent( tor ) );
     348
     349    return tor->info.name;
     350}
     351
    345352#endif
Note: See TracChangeset for help on using the changeset viewer.