From 1c71e622e19ecb4ae957e52fdfdec561a54ffc6f Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Tue, 30 Dec 2008 02:43:51 +0000
Subject: [PATCH] (trunk libT) minor cleanup: use symbolic name instead of
 magic numbers; use tr_bool instead of int

---
 libtransmission/peer-io.c | 2 +-
 libtransmission/tracker.c | 8 ++------
 libtransmission/trevent.c | 2 +-
 libtransmission/trevent.h | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index f97da46ec..23cba89b8 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -92,7 +92,7 @@ struct tr_peerIo
     tr_port            port;
     int                socket;
 
-    uint8_t            peerId[20];
+    uint8_t            peerId[SHA_DIGEST_LENGTH];
     time_t             timeCreated;
 
     tr_session       * session;
diff --git a/libtransmission/tracker.c b/libtransmission/tracker.c
index b2ba544d9..7f9e2b87e 100644
--- a/libtransmission/tracker.c
+++ b/libtransmission/tracker.c
@@ -908,9 +908,7 @@ static void
 enqueueScrape( tr_session * session,
                tr_tracker * tracker )
 {
-    struct tr_tracker_request * req;
-
-    req = createScrape( session, tracker );
+    struct tr_tracker_request * req = createScrape( session, tracker );
     tr_runInEventThread( session, invokeRequest, req );
 }
 
@@ -919,9 +917,7 @@ enqueueRequest( tr_session * session,
                 tr_tracker * tracker,
                 int          reqtype )
 {
-    struct tr_tracker_request * req;
-
-    req = createRequest( session, tracker, reqtype );
+    struct tr_tracker_request * req = createRequest( session, tracker, reqtype );
     tr_runInEventThread( session, invokeRequest, req );
 }
 
diff --git a/libtransmission/trevent.c b/libtransmission/trevent.c
index 643647815..0b17e05b6 100644
--- a/libtransmission/trevent.c
+++ b/libtransmission/trevent.c
@@ -282,7 +282,7 @@ tr_eventClose( tr_session * session )
 ***
 **/
 
-int
+tr_bool
 tr_amInEventThread( tr_session * session )
 {
     assert( session );
diff --git a/libtransmission/trevent.h b/libtransmission/trevent.h
index c3bf86085..b04d9088c 100644
--- a/libtransmission/trevent.h
+++ b/libtransmission/trevent.h
@@ -48,7 +48,7 @@ tr_timer* tr_timerNew( tr_session * handle,
 void      tr_timerFree( tr_timer ** timer );
 
 
-int       tr_amInEventThread( tr_session * );
+tr_bool   tr_amInEventThread( tr_session * );
 
 void      tr_runInEventThread( tr_session * session,
                                void         func( void* ),