Changeset 14532

Timestamp:

May 31, 2015, 10:13:31 PM (6 years ago)

Author:

mikedld

Message:

Add more booleans to the picture

Location:

trunk

Files:

• daemon/daemon.c (modified) (1 diff)
• gtk/open-dialog.c (modified) (3 diffs)
• gtk/tr-core.c (modified) (1 diff)
• libtransmission/bandwidth.c (modified) (1 diff)
• libtransmission/bitfield.c (modified) (2 diffs)
• libtransmission/cache.c (modified) (1 diff)
• libtransmission/natpmp.c (modified) (1 diff)
• libtransmission/platform.c (modified) (1 diff)
• libtransmission/platform.h (modified) (1 diff)
• libtransmission/resume.c (modified) (4 diffs)
• libtransmission/torrent-ctor.c (modified) (3 diffs)
• libtransmission/torrent-magnet.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (4 diffs)
• libtransmission/torrent.h (modified) (1 diff)
• libtransmission/tr-dht.c (modified) (6 diffs)
• libtransmission/tr-dht.h (modified) (1 diff)
• libtransmission/tr-lpd.c (modified) (6 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• libtransmission/web.c (modified) (1 diff)

trunk/daemon/daemon.c

@@ -202 +202 @@
         {
             bool trash = false;
-            int test = tr_ctorGetDeleteSource (ctor, &trash);
+            const bool test = tr_ctorGetDeleteSource (ctor, &trash);
 
             tr_logAddInfo ("Parsing .torrent file successful \"%s\"", file);
 
-            if (!test && trash)
+            if (test && trash)
             {
                 tr_error * error = NULL;

trunk/gtk/open-dialog.c

@@ -290 +290 @@
                                            -1);
 
-  if (tr_ctorGetDownloadDir (ctor, TR_FORCE, &str))
+  if (!tr_ctorGetDownloadDir (ctor, TR_FORCE, &str))
     g_assert_not_reached ();
   g_assert (str);
@@ -376 +376 @@
   row++;
   w = data->run_check;
-  if (tr_ctorGetPaused (ctor, TR_FORCE, &flag))
+  if (!tr_ctorGetPaused (ctor, TR_FORCE, &flag))
     g_assert_not_reached ();
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), !flag);
@@ -384 +384 @@
   row++;
   w = data->trash_check;
-  if (tr_ctorGetDeleteSource (ctor, &flag))
+  if (!tr_ctorGetDeleteSource (ctor, &flag))
     g_assert_not_reached ();
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), flag);

trunk/gtk/tr-core.c

@@ -1172 +1172 @@
 core_apply_defaults (tr_ctor * ctor)
 {
-  if (tr_ctorGetPaused (ctor, TR_FORCE, NULL))
+  if (!tr_ctorGetPaused (ctor, TR_FORCE, NULL))
     tr_ctorSetPaused (ctor, TR_FORCE, !gtr_pref_flag_get (TR_KEY_start_added_torrents));
 
-  if (tr_ctorGetDeleteSource (ctor, NULL))
+  if (!tr_ctorGetDeleteSource (ctor, NULL))
     tr_ctorSetDeleteSource (ctor, gtr_pref_flag_get (TR_KEY_trash_original_torrent_files));
 
-  if (tr_ctorGetPeerLimit (ctor, TR_FORCE, NULL))
+  if (!tr_ctorGetPeerLimit (ctor, TR_FORCE, NULL))
     tr_ctorSetPeerLimit (ctor, TR_FORCE, gtr_pref_int_get (TR_KEY_peer_limit_per_torrent));
 
-  if (tr_ctorGetDownloadDir (ctor, TR_FORCE, NULL))
+  if (!tr_ctorGetDownloadDir (ctor, TR_FORCE, NULL))
     tr_ctorSetDownloadDir (ctor, TR_FORCE, gtr_pref_string_get (TR_KEY_download_dir));
 }

trunk/libtransmission/bandwidth.c

@@ -347 +347 @@
   return byteCount;
 }
+
 unsigned int
 tr_bandwidthClamp (const tr_bandwidth  * b,

trunk/libtransmission/bitfield.c

@@ -147 +147 @@
 ***/
 
+#ifndef NDEBUG
+
 static bool
-tr_bitfieldIsValid (const tr_bitfield * b UNUSED)
+tr_bitfieldIsValid (const tr_bitfield * b)
 {
   assert (b != NULL);
@@ -156 +158 @@
   return true;
 }
+
+#endif
 
 size_t

trunk/libtransmission/cache.c

@@ -454 +454 @@
     }
 
-    return err;
+  return err;
 }
 

trunk/libtransmission/natpmp.c

@@ -99 +99 @@
 }
 
-static int
+static bool
 canSendCommand (const struct tr_natpmp * nat)
 {

trunk/libtransmission/platform.c

@@ -193 +193 @@
 }
 
-int
+bool
 tr_lockHave (const tr_lock * l)
 {

trunk/libtransmission/platform.h

@@ -76 +76 @@
 
 /** @brief return nonzero if the specified lock is locked */
-int tr_lockHave (const tr_lock *);
+bool tr_lockHave (const tr_lock *);
 
 /* @} */

trunk/libtransmission/resume.c

@@ -78 +78 @@
     }
 
-    return numAdded;
+  return numAdded;
 }
 
@@ -873 +873 @@
       bool isPaused;
 
-      if (!tr_ctorGetPaused (ctor, mode, &isPaused))
+      if (tr_ctorGetPaused (ctor, mode, &isPaused))
         {
           tor->isRunning = !isPaused;
@@ -881 +881 @@
 
   if (fields & TR_FR_MAX_PEERS)
-    if (!tr_ctorGetPeerLimit (ctor, mode, &tor->maxConnectedPeers))
+    if (tr_ctorGetPeerLimit (ctor, mode, &tor->maxConnectedPeers))
       ret |= TR_FR_MAX_PEERS;
 
@@ -888 +888 @@
       const char * path;
 
-      if (!tr_ctorGetDownloadDir (ctor, mode, &path) && path && *path)
+      if (tr_ctorGetDownloadDir (ctor, mode, &path) && path && *path)
         {
           ret |= TR_FR_DOWNLOAD_DIR;

trunk/libtransmission/torrent-ctor.c

@@ -259 +259 @@
 }
 
-int
+bool
 tr_ctorGetDeleteSource (const tr_ctor * ctor, bool * setme)
 {
-    int err = 0;
+    bool ret = true;
 
     if (!ctor->isSet_delete)
-        err = 1;
+        ret = false;
     else if (setme)
-        *setme = ctor->doDelete ? 1 : 0;
-
-    return err;
+        *setme = ctor->doDelete;
+
+    return ret;
 }
 
@@ -284 +284 @@
 }
 
-int
+bool
 tr_ctorGetSave (const tr_ctor * ctor)
 {
@@ -350 +350 @@
 }
 
-int
+bool
 tr_ctorGetPeerLimit (const tr_ctor * ctor,
                      tr_ctorMode     mode,
                      uint16_t *      setmeCount)
 {
-    int err = 0;
+    bool ret = true;
     const struct optional_args * args = &ctor->optionalArgs[mode];
 
     if (!args->isSet_connected)
-        err = 1;
+        ret = false;
     else if (setmeCount)
         *setmeCount = args->peerLimit;
 
-    return err;
-}
-
-int
+    return ret;
+}
+
+bool
 tr_ctorGetPaused (const tr_ctor * ctor, tr_ctorMode mode, bool * setmeIsPaused)
 {
-    int err = 0;
+    bool ret = true;
     const struct optional_args * args = &ctor->optionalArgs[mode];
 
     if (!args->isSet_paused)
-        err = 1;
+        ret = false;
     else if (setmeIsPaused)
         *setmeIsPaused = args->isPaused;
 
-    return err;
-}
-
-int
+    return ret;
+}
+
+bool
 tr_ctorGetDownloadDir (const tr_ctor * ctor,
                        tr_ctorMode     mode,
                        const char **   setmeDownloadDir)
 {
-    int err = 0;
+    bool ret = true;
     const struct optional_args * args = &ctor->optionalArgs[mode];
 
     if (!args->isSet_downloadDir)
-        err = 1;
+        ret = false;
     else if (setmeDownloadDir)
         *setmeDownloadDir = args->downloadDir;
 
-    return err;
-}
-
-int
+    return ret;
+}
+
+bool
 tr_ctorGetIncompleteDir (const tr_ctor  * ctor,
                          const char    ** setmeIncompleteDir)
 {
-    int err = 0;
+    bool ret = true;
 
     if (ctor->incompleteDir == NULL)
-        err = 1;
+        ret = false;
     else
         *setmeIncompleteDir = ctor->incompleteDir;
 
-    return err;
-}
-
-int
+    return ret;
+}
+
+bool
 tr_ctorGetMetainfo (const tr_ctor *  ctor,
                     const tr_variant ** setme)
 {
-    int err = 0;
+    bool ret = true;
 
     if (!ctor->isSet_metainfo)
-        err = 1;
+        ret = false;
     else if (setme)
         *setme = &ctor->metainfo;
 
-    return err;
+    return ret;
 }
 

trunk/libtransmission/torrent-magnet.c

@@ -193 +193 @@
     }
 
-    assert (ret == NULL || *len > 0);
-
-    return ret;
+  assert (ret == NULL || *len > 0);
+
+  return ret;
 }
 

trunk/libtransmission/torrent.c

@@ -633 +633 @@
 }
 
-static int
+static bool
 pieceHasFile (tr_piece_index_t piece,
               const tr_file *  file)
@@ -873 +873 @@
            NULL);
 
-  if (!tr_ctorGetDownloadDir (ctor, TR_FORCE, &dir) ||
-    !tr_ctorGetDownloadDir (ctor, TR_FALLBACK, &dir))
-      tor->downloadDir = tr_strdup (dir);
-
-  if (tr_ctorGetIncompleteDir (ctor, &dir))
+  if (tr_ctorGetDownloadDir (ctor, TR_FORCE, &dir) ||
+      tr_ctorGetDownloadDir (ctor, TR_FALLBACK, &dir))
+    tor->downloadDir = tr_strdup (dir);
+
+  if (!tr_ctorGetIncompleteDir (ctor, &dir))
     dir = tr_sessionGetIncompleteDir (session);
   if (tr_sessionIsIncompleteDirEnabled (session))
@@ -953 +953 @@
     {
       const tr_variant * val;
-      if (!tr_ctorGetMetainfo (ctor, &val))
+      if (tr_ctorGetMetainfo (ctor, &val))
         {
           const char * path = tor->info.torrent;
@@ -997 +997 @@
   memset (setmeInfo, 0, sizeof (tr_info));
 
-  if (tr_ctorGetMetainfo (ctor, &metainfo))
+  if (!tr_ctorGetMetainfo (ctor, &metainfo))
     return TR_PARSE_ERR;
 

trunk/libtransmission/torrent.h

@@ -32 +32 @@
                             bool      saveMetadataInOurTorrentsDir);
 
-int         tr_ctorGetSave (const tr_ctor * ctor);
+bool        tr_ctorGetSave (const tr_ctor * ctor);
 
 void        tr_ctorInitTorrentPriorities (const tr_ctor * ctor, tr_torrent * tor);

trunk/libtransmission/tr-dht.c

@@ -78 +78 @@
 };
 
-static int
+static bool
 bootstrap_done (tr_session *session, int af)
 {
@@ -461 +461 @@
 }
 
-int
+bool
 tr_dhtAddNode (tr_session       * ss,
                const tr_address * address,
@@ -470 +470 @@
 
     if (!tr_dhtEnabled (ss))
-        return 0;
+        return false;
 
     /* Since we don't want to abuse our bootstrap nodes,
@@ -477 +477 @@
     if (bootstrap) {
         if (tr_dhtStatus (ss, af, NULL) >= TR_DHT_FIREWALLED)
-            return 0;
+            return false;
     }
 
@@ -487 +487 @@
         sin.sin_port = htons (port);
         dht_ping_node ((struct sockaddr*)&sin, sizeof (sin));
-        return 1;
+        return true;
     } else if (address->type == TR_AF_INET6) {
         struct sockaddr_in6 sin6;
@@ -495 +495 @@
         sin6.sin6_port = htons (port);
         dht_ping_node ((struct sockaddr*)&sin6, sizeof (sin6));
-        return 1;
-    }
-
-    return 0;
+        return true;
+    }
+
+    return false;
 }
 

trunk/libtransmission/tr-dht.h

@@ -43 +43 @@
 int tr_dhtStatus (tr_session *, int af, int * setme_nodeCount);
 const char *tr_dhtPrintableStatus (int status);
-int tr_dhtAddNode (tr_session *, const tr_address *, tr_port, bool bootstrap);
+bool tr_dhtAddNode (tr_session *, const tr_address *, tr_port, bool bootstrap);
 void tr_dhtUpkeep (tr_session *);
 void tr_dhtCallback (unsigned char *buf, int buflen,

trunk/libtransmission/tr-lpd.c

@@ -212 +212 @@
 *   - copy back value from end to next "\r\n"
 */
-static int lpd_extractParam (const char* const str, const char* const name, int n, char* const val)
+static bool lpd_extractParam (const char* const str, const char* const name, int n, char* const val)
 {
     /* configure maximum length of search string here */
@@ -223 +223 @@
 
     if (strlen (name) > maxLength - strlen (CRLF ": "))
-        return 0;
+        return false;
 
     /* compose the string token to search for */
@@ -230 +230 @@
     pos = strstr (str, sstr);
     if (pos == NULL)
-        return 0; /* search was not successful */
+        return false; /* search was not successful */
 
     {
@@ -249 +249 @@
 
     /* we successfully returned the value string */
-    return 1;
+    return true;
 }
 
@@ -513 +513 @@
         /* save the effort to check Host, which seems to be optional anyway */
 
-        if (lpd_extractParam (params, "Port", maxValueLen, value) == 0)
+        if (!lpd_extractParam (params, "Port", maxValueLen, value))
             return 0;
 
@@ -523 +523 @@
         res = -1; /* signal caller side-effect to peer->port via return != 0 */
 
-        if (lpd_extractParam (params, "Infohash", maxHashLen, hashString) == 0)
+        if (!lpd_extractParam (params, "Infohash", maxHashLen, hashString))
             return res;
 

trunk/libtransmission/transmission.h

@@ -1012 +1012 @@
 
 /** @brief Get this peer constructor's peer limit */
-int         tr_ctorGetPeerLimit (const tr_ctor * ctor,
+bool        tr_ctorGetPeerLimit (const tr_ctor * ctor,
                                  tr_ctorMode     mode,
                                  uint16_t *      setmeCount);
 
 /** @brief Get the "isPaused" flag from this peer constructor */
-int         tr_ctorGetPaused (const tr_ctor * ctor,
+bool        tr_ctorGetPaused (const tr_ctor * ctor,
                               tr_ctorMode     mode,
                               bool          * setmeIsPaused);
 
 /** @brief Get the download path from this peer constructor */
-int         tr_ctorGetDownloadDir (const tr_ctor  * ctor,
+bool        tr_ctorGetDownloadDir (const tr_ctor  * ctor,
                                    tr_ctorMode      mode,
                                    const char    ** setmeDownloadDir);
 
 /** @brief Get the incomplete directory from this peer constructor */
-int         tr_ctorGetIncompleteDir (const tr_ctor  * ctor,
+bool        tr_ctorGetIncompleteDir (const tr_ctor  * ctor,
                                      const char    ** setmeIncompleteDir);
 
 /** @brief Get the metainfo from this peer constructor */
-int         tr_ctorGetMetainfo (const tr_ctor            * ctor,
+bool        tr_ctorGetMetainfo (const tr_ctor            * ctor,
                                 const struct tr_variant ** setme);
 
 /** @brief Get the "delete .torrent file" flag from this peer constructor */
-int         tr_ctorGetDeleteSource (const tr_ctor  * ctor,
+bool        tr_ctorGetDeleteSource (const tr_ctor  * ctor,
                                     bool           * setmeDoDelete);
 

trunk/libtransmission/web.c

@@ -639 +639 @@
 }
 
-static int
+static bool
 is_rfc2396_alnum (uint8_t ch)
 {