From: Jordan Lee Date: Sun, 27 Apr 2014 23:10:01 +0000 (+0000) Subject: (trunk, libT) #5651 'int to bool patch' -- fixed, patch by rajmannugetr X-Git-Tag: 2.83~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a2268289e264669fee80159d11c22f28447dbb9;p=transmission (trunk, libT) #5651 'int to bool patch' -- fixed, patch by rajmannugetr --- diff --git a/libtransmission/net.c b/libtransmission/net.c index 8052c23bf..0b4e7a646 100644 --- 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 d39a9c937..84646f73b 100644 --- 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 56fe0222e..2b60082a7 100644 --- 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 18b85b7c1..57179969e 100644 --- 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 5ce37e2d6..c4db6e680 100644 --- 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);