(trunk, libT) #5651 'int to bool patch' -- fixed, patch by rajmannugetr

diff --git a/libtransmission/net.c b/libtransmission/net.c
index 8052c23bf397681408bab6c75886bfbfcd28c83c..0b4e7a6465f9ddb70dae37c8092223f3dc83b5df 100644 (file)
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -59,7 +59,7 @@ const tr_address tr_inaddr_any = { TR_AF_INET, { { { { INADDR_ANY, 0x00, 0x00, 0
 void
 tr_netInit (void)
 {
-    static int initialized = false;
+    static bool initialized = false;
 
     if (!initialized)
     {

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index d39a9c9372a7027cd1e44ccd3c64d609b5c55cdc..84646f73b6d7abf076dd53928d01144055a7c946 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -1339,7 +1339,7 @@ peerMadeRequest (tr_peerMsgs * msgs, const struct peer_request * req)
     const int clientHasPiece = reqIsValid && tr_torrentPieceIsComplete (msgs->torrent, req->index);
     const int peerIsChoked = msgs->peer_is_choked;
 
-    int allow = false;
+    bool allow = false;
 
     if (!reqIsValid)
         dbgmsg (msgs, "rejecting an invalid request.");

diff --git a/libtransmission/session.c b/libtransmission/session.c
index 56fe0222e904160de24e8ce0b95d7226017a7405..2b60082a7879ee4be0709e899827cf7b5cf15ec0 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -1243,7 +1243,7 @@ tr_sessionGetIdleLimit (const tr_session * session)
 bool
 tr_sessionGetActiveSpeedLimit_Bps (const tr_session * session, tr_direction dir, unsigned int * setme_Bps)
 {
-  int isLimited = true;
+  bool isLimited = true;
 
   if (!tr_isSession (session))
     return false;

diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
index 18b85b7c108e7c923810210ce56291062fbb7822..57179969e9bc3c93a9bb7aebf764b94ee6e5d456 100644 (file)
--- a/libtransmission/utils-test.c
+++ b/libtransmission/utils-test.c
@@ -204,7 +204,7 @@ test_lowerbound (void)
   int i;
   const int A[] = { 1, 2, 3, 3, 3, 5, 8 };
   const int expected_pos[] = { 0, 1, 2, 5, 5, 6, 6, 6, 7, 7 };
-  const int expected_exact[] = { true, true, true, false, true, false, false, true, false, false };
+  const bool expected_exact[] = { true, true, true, false, true, false, false, true, false, false };
   const int N = sizeof (A) / sizeof (A[0]);
 
   for (i=1; i<=10; i++)

diff --git a/libtransmission/variant-json.c b/libtransmission/variant-json.c
index 5ce37e2d666d8b7c3876ffd6979fa3636a72c0ff..c4db6e680a107e1635e46c04180d10c312758b5f 100644 (file)
--- a/libtransmission/variant-json.c
+++ b/libtransmission/variant-json.c
@@ -604,7 +604,7 @@ jsonContainerEndFunc (const tr_variant * val,
                       void             * vdata)
 {
   struct jsonWalk * data = vdata;
-  int emptyContainer = false;
+  bool emptyContainer = false;
 
   jsonPopParent (data);