Changeset 7251

Timestamp:

Dec 3, 2008, 4:55:10 AM (12 years ago)

Author:

charles

Message:

(libT) misc cleanup: use tr_bool and tr_port where appropriate

Location:

trunk/libtransmission

Files:

• session.c (modified) (5 diffs)
• torrent-ctor.c (modified) (3 diffs)
• torrent.h (modified) (1 diff)
• transmission.h (modified) (6 diffs)

trunk/libtransmission/session.c

@@ -127 +127 @@
     DIR *       odir = NULL;
     tr_list *   list = NULL;
-    const int   isEnabled = session->isBlocklistEnabled;
+    const tr_bool   isEnabled = session->isBlocklistEnabled;
 
     /* walk through the directory and find blocklists */
@@ -760 +760 @@
 void
 tr_blocklistSetEnabled( tr_session * session,
-                        int          isEnabled )
+                        tr_bool      isEnabled )
 {
     tr_list * l;
 
-    session->isBlocklistEnabled = isEnabled ? 1 : 0;
-    for( l = session->blocklists; l; l = l->next )
+    session->isBlocklistEnabled = isEnabled != 0;
+
+    for( l=session->blocklists; l!=NULL; l=l->next )
         _tr_blocklistSetEnabled( l->data, isEnabled );
 }
@@ -1074 +1075 @@
 void
 tr_sessionSetProxyEnabled( tr_session * session,
-                           int          isEnabled )
-{
-    session->isProxyEnabled = isEnabled ? 1 : 0;
+                           tr_bool      isEnabled )
+{
+    session->isProxyEnabled = isEnabled != 0;
 }
 
@@ -1117 +1118 @@
 void
 tr_sessionSetProxyPort( tr_session * session,
-                        int          port )
+                        tr_port      port )
 {
     session->proxyPort = port;
@@ -1130 +1131 @@
 void
 tr_sessionSetProxyAuthEnabled( tr_session * session,
-                               int          isEnabled )
-{
-    session->isProxyAuthEnabled = isEnabled ? 1 : 0;
+                               tr_bool      isEnabled )
+{
+    session->isProxyAuthEnabled = isEnabled != 0;
 }
 

trunk/libtransmission/torrent-ctor.c

@@ -155 +155 @@
 void
 tr_ctorSetDeleteSource( tr_ctor * ctor,
-                        uint8_t   deleteSource )
-{
-    ctor->doDelete = deleteSource ? 1 : 0;
+                        tr_bool   deleteSource )
+{
+    ctor->doDelete = deleteSource != 0;
     ctor->isSet_delete = 1;
 }
@@ -181 +181 @@
 void
 tr_ctorSetSave( tr_ctor * ctor,
-                int       saveInOurTorrentsDir )
-{
-    ctor->saveInOurTorrentsDir = saveInOurTorrentsDir ? 1 : 0;
+                tr_bool   saveInOurTorrentsDir )
+{
+    ctor->saveInOurTorrentsDir = saveInOurTorrentsDir != 0;
 }
 
@@ -195 +195 @@
 tr_ctorSetPaused( tr_ctor *   ctor,
                   tr_ctorMode mode,
-                  uint8_t     isPaused )
+                  tr_bool     isPaused )
 {
     struct optional_args * args = &ctor->optionalArgs[mode];

trunk/libtransmission/torrent.h

@@ -38 +38 @@
 
 void        tr_ctorSetSave( tr_ctor * ctor,
-                            int       saveMetadataInOurTorrentsDir );
+                            tr_bool   saveMetadataInOurTorrentsDir );
 
 int         tr_ctorGetSave( const tr_ctor * ctor );

trunk/libtransmission/transmission.h

@@ -461 +461 @@
 const char*   tr_sessionGetProxyPassword( const tr_session * );
 
-void          tr_sessionSetProxyEnabled(                     tr_session *,
-                                                         int isEnabled );
-
-void          tr_sessionSetProxyAuthEnabled(                     tr_session *,
-                                                             int isEnabled );
-
-void          tr_sessionSetProxy(
-    tr_session *,
-    const char *
-    proxy );
-
-void          tr_sessionSetProxyPort(                     tr_session *,
-                                                      int port );
-
-void          tr_sessionSetProxyType( tr_session *,
-                                      tr_proxy_type );
-
-void          tr_sessionSetProxyUsername(
-    tr_session *,
-    const char *
-    username );
-
-void          tr_sessionSetProxyPassword(
-    tr_session *,
-    const char *
-    password );
+void          tr_sessionSetProxyEnabled( tr_session * session,
+                                         tr_bool      isEnabled );
+
+void          tr_sessionSetProxyAuthEnabled( tr_session * session,
+                                             tr_bool      isEnabled );
+
+void          tr_sessionSetProxy( tr_session * session,
+                                  const char * proxy );
+
+void          tr_sessionSetProxyPort( tr_session * session,
+                                      tr_port      port );
+
+void          tr_sessionSetProxyType( tr_session    * session,
+                                      tr_proxy_type   proxy_type );
+
+void          tr_sessionSetProxyUsername( tr_session * session,
+                                          const char * username );
+
+void          tr_sessionSetProxyPassword( tr_session * session,
+                                          const char * password );
 
 /**
@@ -690 +684 @@
 
 void tr_blocklistSetEnabled( tr_session * session,
-                             int          isEnabled );
+                             tr_bool      isEnabled );
 
 
@@ -739 +733 @@
 
 void        tr_ctorSetDeleteSource( tr_ctor * ctor,
-                                    uint8_t   doDelete );
+                                    tr_bool   doDelete );
 
 int         tr_ctorSetMetainfo( tr_ctor *       ctor,
@@ -766 +760 @@
 /** Set whether or not the torrent begins downloading/seeding when created.
     (Default: not paused) */
-void        tr_ctorSetPaused( tr_ctor *   ctor,
-                              tr_ctorMode mode,
-                              uint8_t     isPaused );
+void        tr_ctorSetPaused( tr_ctor      * ctor,
+                              tr_ctorMode    mode,
+                              tr_bool        isPaused );
 
 int         tr_ctorGetPeerLimit( const tr_ctor * ctor,
@@ -776 +770 @@
 int         tr_ctorGetPaused( const tr_ctor * ctor,
                               tr_ctorMode     mode,
-                              uint8_t *       setmeIsPaused );
+                              tr_bool       * setmeIsPaused );
 
 int         tr_ctorGetDownloadDir( const tr_ctor  * ctor,
@@ -786 +780 @@
 
 int         tr_ctorGetDeleteSource( const tr_ctor  * ctor,
-                                    uint8_t        * setmeDoDelete );
+                                    tr_bool        * setmeDoDelete );
 
 /* returns NULL if tr_ctorSetMetainfoFromFile() wasn't used */