Changeset 9131

Timestamp:

Sep 17, 2009, 3:24:35 AM (14 years ago)

Author:

charles

Message:

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

Location:

trunk/libtransmission

Files:

• handshake.c (modified) (1 diff)
• peer-mgr.c (modified) (2 diffs)
• peer-msgs.c (modified) (1 diff)
• resume.c (modified) (2 diffs)
• torrent.h (modified) (3 diffs)

trunk/libtransmission/handshake.c

@@ -863 +863 @@
         const tr_bool peerIsSeed = tr_peerMgrPeerIsSeed( tor, tr_peerIoGetAddress( handshake->io, NULL ) );
         dbgmsg( handshake, "got INCOMING connection's encrypted handshake for torrent [%s]",
-                tor->info.name );
+                tr_torrentName( tor ) );
         tr_peerIoSetTorrentHash( handshake->io, tor->info.hash );
 

trunk/libtransmission/peer-mgr.c

@@ -172 +172 @@
     do { \
         if( tr_deepLoggingIsActive( ) ) \
-            tr_deepLog( __FILE__, __LINE__, t->tor->info.name, __VA_ARGS__ ); \
+            tr_deepLog( __FILE__, __LINE__, tr_torrentName( t->tor ), __VA_ARGS__ ); \
     } while( 0 )
 
@@ -2364 +2364 @@
                    "%d atoms, "
                    "max per pulse is %d",
-                   t->tor->info.name,
+                   tr_torrentName( t->tor ),
                    mustCloseCount,
                    canCloseCount,

trunk/libtransmission/peer-msgs.c

@@ -220 +220 @@
         evbuffer_add_printf( buf, "[%s] %s - %s [%s]: ",
                              tr_getLogTimeStr( timestr, sizeof( timestr ) ),
-                             msgs->torrent->info.name,
+                             tr_torrentName( msgs->torrent ),
                              tr_peerIoGetAddrStr( msgs->peer->io ),
                              msgs->peer->client );

trunk/libtransmission/resume.c

@@ -70 +70 @@
                              tr_getResumeDir( tor->session ),
                              TR_PATH_DELIMITER,
-                             tor->info.name,
+                             tr_torrentName( tor ),
                              tor->info.hashString );
 }
@@ -502 +502 @@
         return;
 
-    tr_tordbg( tor, "Saving .resume file for \"%s\"", tor->info.name );
+    tr_tordbg( tor, "Saving .resume file for \"%s\"", tr_torrentName( tor ) );
 
     tr_bencInitDict( &top, 32 ); /* arbitrary "big enough" number */

trunk/libtransmission/torrent.h

@@ -327 +327 @@
 };
 
-static inline tr_bool tr_isTorrent( const tr_torrent * tor )
+static TR_INLINE tr_bool tr_isTorrent( const tr_torrent * tor )
 {
     return ( tor != NULL )
@@ -336 +336 @@
 /* set a flag indicating that the torrent's .resume file
  * needs to be saved when the torrent is closed */
-static inline void tr_torrentSetDirty( tr_torrent * tor )
+static TR_INLINE void tr_torrentSetDirty( tr_torrent * tor )
 {
     assert( tr_isTorrent( tor ) );
@@ -343 +343 @@
 }
 
+static TR_INLINE const char * tr_torrentName( const tr_torrent * tor )
+{
+    assert( tr_isTorrent( tor ) );
+
+    return tor->info.name;
+}
+
 #endif