Changeset 7591

Timestamp:

Jan 3, 2009, 12:25:27 AM (12 years ago)

Author:

charles

Message:

(trunk libT) inline a few more torrent methods

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (5 diffs)
• torrent.c (modified) (3 diffs)
• torrent.h (modified) (6 diffs)

trunk/libtransmission/peer-mgr.c

@@ -165 +165 @@
 **/
 
-static void
+static inline void
 managerLock( const struct tr_peerMgr * manager )
 {
@@ -171 +171 @@
 }
 
-static void
+static inline void
 managerUnlock( const struct tr_peerMgr * manager )
 {
@@ -177 +177 @@
 }
 
-static void
+static inline void
 torrentLock( Torrent * torrent )
 {
@@ -183 +183 @@
 }
 
-static void
+static inline void
 torrentUnlock( Torrent * torrent )
 {
@@ -189 +189 @@
 }
 
-static int
+static inline int
 torrentIsLocked( const Torrent * t )
 {

trunk/libtransmission/torrent.c

@@ -661 +661 @@
 }
 
-tr_bool
-tr_torrentIsPrivate( const tr_torrent * tor )
-{
-    return tor
-        && tor->info.isPrivate;
-}
-
-tr_bool
-tr_torrentAllowsPex( const tr_torrent * tor )
-{
-    return tor
-        && tor->session->isPexEnabled
-        && !tr_torrentIsPrivate( tor );
-}
-
 static inline void
 tr_torrentManualUpdateImpl( void * vtor )
@@ -1313 +1298 @@
 }
 
-tr_bool
-tr_torrentIsSeed( const tr_torrent * tor )
-{
-    return tor->completeness != TR_LEECH;
-}
-
 /**
 ***  File priorities
@@ -1574 +1553 @@
 ****
 ***/
-
-tr_bool
-tr_torrentIsPieceChecked( const tr_torrent * tor,
-                          tr_piece_index_t   piece )
-{
-    return tr_bitfieldHas( &tor->checkedPieces, piece );
-}
 
 void

trunk/libtransmission/torrent.h

@@ -57 +57 @@
                                    tr_bool           do_download );
 
-tr_bool     tr_torrentIsPrivate( const tr_torrent * );
-
 void        tr_torrentRecheckCompleteness( tr_torrent * );
 
@@ -67 +65 @@
                                    tr_bool          has );
 
-tr_bool     tr_torrentIsSeed( const tr_torrent * session );
-
 void        tr_torrentChangeMyPort( tr_torrent * session );
 
@@ -82 +78 @@
 tr_torrent* tr_torrentFindFromObfuscatedHash( tr_session    * session,
                                               const uint8_t * hash );
-
-tr_bool     tr_torrentAllowsPex( const tr_torrent * );
 
 tr_bool     tr_torrentIsPieceTransferAllowed( const tr_torrent * torrent,
@@ -110 +104 @@
 
 int              tr_torrentCountUncheckedPieces( const tr_torrent * );
-
-tr_bool          tr_torrentIsPieceChecked( const tr_torrent  * tor,
-                                           tr_piece_index_t    piece );
 
 tr_bool          tr_torrentIsFileChecked( const tr_torrent  * tor,
@@ -255 +246 @@
 }
 
-static inline void
-tr_torrentLock( const tr_torrent * tor )
+static inline void tr_torrentLock( const tr_torrent * tor )
 {
     tr_globalLock( tor->session );
 }
 
-static inline void
-tr_torrentUnlock( const tr_torrent * tor )
+static inline void tr_torrentUnlock( const tr_torrent * tor )
 {
     tr_globalUnlock( tor->session );
@@ -273 +262 @@
 }
 
+static inline tr_bool
+tr_torrentIsSeed( const tr_torrent * tor )
+{
+    return tor->completeness != TR_LEECH;
+}
+
+static inline tr_bool tr_torrentIsPrivate( const tr_torrent * tor )
+{
+    return ( tor != NULL ) && tor->info.isPrivate;
+}
+
+static inline tr_bool tr_torrentAllowsPex( const tr_torrent * tor )
+{
+    return ( tor != NULL  ) && tor->session->isPexEnabled && !tr_torrentIsPrivate( tor );
+}
+
+static inline tr_bool tr_torrentIsPieceChecked( const tr_torrent  * tor, tr_piece_index_t i )
+{
+    return tr_bitfieldHas( &tor->checkedPieces, i );
+}
 
 #endif