Changeset 14347

Timestamp:

Nov 30, 2014, 7:38:47 PM (8 years ago)

Author:

mikedld

Message:

#5771: Use true and false instead of 1 and 0 for bool variables (patch by ticamkq + additional fixes)

Location:

trunk/libtransmission

Files:

• crypto.c (modified) (3 diffs)
• crypto.h (modified) (1 diff)
• fdlimit.c (modified) (2 diffs)
• handshake.c (modified) (6 diffs)
• net.c (modified) (1 diff)
• peer-io.c (modified) (3 diffs)
• peer-io.h (modified) (1 diff)
• peer-mgr.c (modified) (2 diffs)
• peer-msgs.c (modified) (6 diffs)
• torrent.c (modified) (1 diff)
• upnp.c (modified) (1 diff)
• verify.c (modified) (1 diff)

trunk/libtransmission/crypto.c

@@ -176 +176 @@
       memset (crypto->mySecret, 0, offset);
       memcpy (crypto->mySecret + offset, secret, len);
-      crypto->mySecretIsSet = 1;
+      crypto->mySecretIsSet = true;
     }
 
@@ -271 +271 @@
                          const uint8_t * hash)
 {
-  crypto->torrentHashIsSet = hash ? 1 : 0;
+  crypto->torrentHashIsSet = hash != NULL;
 
   if (hash)
@@ -287 +287 @@
 }
 
-int
+bool
 tr_cryptoHasTorrentHash (const tr_crypto * crypto)
 {
   assert (crypto);
 
-  return crypto->torrentHashIsSet ? 1 : 0;
+  return crypto->torrentHashIsSet;
 }
 

trunk/libtransmission/crypto.h

@@ -58 +58 @@
 const uint8_t* tr_cryptoGetTorrentHash (const tr_crypto * crypto);
 
-int            tr_cryptoHasTorrentHash (const tr_crypto * crypto);
+bool           tr_cryptoHasTorrentHash (const tr_crypto * crypto);
 
 const uint8_t* tr_cryptoComputeSecret (tr_crypto *     crypto,

trunk/libtransmission/fdlimit.c

@@ -42 +42 @@
 {
   const char zero = '\0';
-  bool success = 0;
+  bool success = false;
 
   if (!length)
@@ -66 +66 @@
 preallocate_file_full (const char * filename, uint64_t length)
 {
-  bool success = 0;
+  bool success = false;
 
   tr_sys_file_t fd = tr_sys_file_open (filename, TR_SYS_FILE_WRITE | TR_SYS_FILE_CREATE, 0666, NULL);

trunk/libtransmission/handshake.c

@@ -475 +475 @@
     evbuffer_add        (outbuf, msg, sizeof (msg));
 
-    handshake->haveSentBitTorrentHandshake = 1;
+    handshake->haveSentBitTorrentHandshake = true;
   }
 
@@ -688 +688 @@
         return tr_handshakeDone (handshake, false);
       tr_peerIoWriteBytes (handshake->io, msg, sizeof (msg), false);
-      handshake->haveSentBitTorrentHandshake = 1;
+      handshake->haveSentBitTorrentHandshake = true;
     }
 
@@ -940 +940 @@
 
     evbuffer_add (outbuf, msg, sizeof (msg));
-    handshake->haveSentBitTorrentHandshake = 1;
+    handshake->haveSentBitTorrentHandshake = true;
   }
 
@@ -1140 +1140 @@
           uint8_t msg[HANDSHAKE_SIZE];
           buildHandshakeMessage (handshake, msg);
-          handshake->haveSentBitTorrentHandshake = 1;
+          handshake->haveSentBitTorrentHandshake = true;
           setReadState (handshake, AWAITING_HANDSHAKE);
           tr_peerIoWriteBytes (handshake->io, msg, sizeof (msg), false);
@@ -1157 +1157 @@
       dbgmsg (handshake, "handshake failed, trying plaintext...");
       buildHandshakeMessage (handshake, msg);
-      handshake->haveSentBitTorrentHandshake = 1;
+      handshake->haveSentBitTorrentHandshake = true;
       setReadState (handshake, AWAITING_HANDSHAKE);
       tr_peerIoWriteBytes (handshake->io, msg, sizeof (msg), false);
@@ -1215 +1215 @@
       buildHandshakeMessage (handshake, msg);
 
-      handshake->haveSentBitTorrentHandshake = 1;
+      handshake->haveSentBitTorrentHandshake = true;
       setReadState (handshake, AWAITING_HANDSHAKE);
       tr_peerIoWriteBytes (handshake->io, msg, sizeof (msg), false);

trunk/libtransmission/net.c

@@ -575 +575 @@
     static unsigned char ipv6[16];
     static time_t last_time = 0;
-    static int have_ipv6 = 0;
+    static bool have_ipv6 = false;
     const time_t now = tr_time ();
 

trunk/libtransmission/peer-io.c

@@ -180 +180 @@
 canReadWrapper (tr_peerIo * io)
 {
-    bool err = 0;
-    bool done = 0;
+    bool err = false;
+    bool done = false;
     tr_session * session;
 
@@ -222 +222 @@
                     if (evbuffer_get_length (io->inbuf))
                         continue;
-                    done = 1;
+                    done = true;
                     break;
 
                 case READ_LATER:
-                    done = 1;
+                    done = true;
                     break;
 
                 case READ_ERR:
-                    err = 1;
+                    err = true;
                     break;
             }
@@ -972 +972 @@
 }
 
-int
+bool
 tr_peerIoHasTorrentHash (const tr_peerIo * io)
 {

trunk/libtransmission/peer-io.h

@@ -218 +218 @@
 const uint8_t*       tr_peerIoGetTorrentHash (tr_peerIo * io);
 
-int                  tr_peerIoHasTorrentHash (const tr_peerIo * io);
+bool                 tr_peerIoHasTorrentHash (const tr_peerIo * io);
 
 void                 tr_peerIoSetTorrentHash (tr_peerIo *     io,

trunk/libtransmission/peer-mgr.c

@@ -1557 +1557 @@
       struct peer_atom * atom = peer->atom;
       atom->flags2 |= MYFLAG_BANNED;
-      peer->doPurge = 1;
+      peer->doPurge = true;
       tordbg (s, "banning peer %s", tr_atomAddrStr (atom));
     }
@@ -1812 +1812 @@
           {
             /* some protocol error from the peer */
-            peer->doPurge = 1;
+            peer->doPurge = true;
             tordbg (s, "setting %s doPurge flag because we got an ERANGE, EMSGSIZE, or ENOTCONN error",
                     tr_atomAddrStr (peer->atom));

trunk/libtransmission/peer-msgs.c

@@ -679 +679 @@
         /* build the fast set */
         msgs->fastsetSize = tr_generateAllowedSet (msgs->fastset, numwant, inf->pieceCount, inf->hash, addr);
-        msgs->haveFastSet = 1;
+        msgs->haveFastSet = true;
 
         /* send it to the peer */
@@ -933 +933 @@
 
     dbgmsg (msgs, "sending an ltep handshake");
-    msgs->clientSentLtepHandshake = 1;
+    msgs->clientSentLtepHandshake = true;
 
     /* decide if we want to advertise metadata xfer support (BEP 9) */
     if (tr_torrentIsPrivate (msgs->torrent))
-        allow_metadata_xfer = 0;
+        allow_metadata_xfer = false;
     else
-        allow_metadata_xfer = 1;
+        allow_metadata_xfer = true;
 
     /* decide if we want to advertise pex support */
     if (!tr_torrentAllowsPex (msgs->torrent))
-        allow_pex = 0;
+        allow_pex = false;
     else if (msgs->peerSentLtepHandshake)
-        allow_pex = msgs->peerSupportsPex ? 1 : 0;
+        allow_pex = msgs->peerSupportsPex;
     else
-        allow_pex = 1;
+        allow_pex = true;
 
     tr_variantInitDict (&val, 8);
@@ -996 +996 @@
 
     tr_peerIoReadBytes (msgs->io, inbuf, tmp, len);
-    msgs->peerSentLtepHandshake = 1;
+    msgs->peerSentLtepHandshake = true;
 
     if (tr_variantFromBenc (&val, tmp, len) || !tr_variantIsDict (&val))
@@ -1016 +1016 @@
 
     /* check supported messages for utorrent pex */
-    msgs->peerSupportsPex = 0;
-    msgs->peerSupportsMetadataXfer = 0;
+    msgs->peerSupportsPex = false;
+    msgs->peerSupportsMetadataXfer = false;
 
     if (tr_variantDictFindDict (&val, TR_KEY_m, &sub)) {
@@ -1245 +1245 @@
     {
         dbgmsg (msgs, "got ut pex");
-        msgs->peerSupportsPex = 1;
+        msgs->peerSupportsPex = true;
         parseUtPex (msgs, msglen, inbuf);
     }
@@ -1251 +1251 @@
     {
         dbgmsg (msgs, "got ut metadata");
-        msgs->peerSupportsMetadataXfer = 1;
+        msgs->peerSupportsMetadataXfer = true;
         parseUtMetadata (msgs, msglen, inbuf);
     }

trunk/libtransmission/torrent.c

@@ -1977 +1977 @@
 
   assert (tr_isTorrent (tor));
-  tor->isDeleting = 1;
+  tor->isDeleting = true;
 
   data = tr_new0 (struct remove_data, 1);

trunk/libtransmission/upnp.c

@@ -225 +225 @@
                          "Local Address is \"%s\""), handle->lanaddr);
             handle->state = TR_UPNP_IDLE;
-            handle->hasDiscovered = 1;
+            handle->hasDiscovered = true;
         }
         else

trunk/libtransmission/verify.c

@@ -44 +44 @@
   tr_sys_file_t fd = TR_BAD_SYS_FILE;
   uint64_t filePos = 0;
-  bool changed = 0;
-  bool hadPiece = 0;
+  bool changed = false;
+  bool hadPiece = false;
   time_t lastSleptAt = 0;
   uint32_t piecePos = 0;