Use stricter type for enums

diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h
index e5e371dd5ac3f83c7e942df7c8e34fa8959554cb..2532148dd9e3ea08195e4f5bd10bea5aaac44217 100644 (file)
--- a/libtransmission/peer-common.h
+++ b/libtransmission/peer-common.h
@@ -20,14 +20,14 @@
 #include "transmission.h"
 #include "publish.h"
 
-enum
+typedef enum
 {
     TR_ADDREQ_OK=0,
     TR_ADDREQ_FULL,
     TR_ADDREQ_DUPLICATE,
     TR_ADDREQ_MISSING,
     TR_ADDREQ_CLIENT_CHOKED
-};
+} tr_addreq_t;
 
 /**
 ***  Peer Publish / Subscribe

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 07a8f45dd6fcccd89557b0c648e50c9517a06d3b..87ea61901a71de6c1e4573cb729aee483e37f0f5 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -715,7 +715,7 @@ refillPulse( void * vtorrent )
         /* find a peer who can ask for this piece */
         for( j=0; !handled && j<peerCount; )
         {
-            const int val = tr_peerMsgsAddRequest( peers[j]->msgs, piece );
+            const tr_addreq_t val = tr_peerMsgsAddRequest( peers[j]->msgs, piece );
             switch( val )
             {
                 case TR_ADDREQ_FULL: 

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 09b2ea9d3b3c33d1f750687e016a9087a01199f5..6af9c465667fa1b193ab9545d9e3aebcba1bbe7c 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -866,7 +866,7 @@ requestQueueIsFull( const tr_peermsgs * msgs )
     return msgs->clientWillAskFor.count >= req_max;
 }
 
-int
+tr_addreq_t
 tr_peerMsgsAddRequest( tr_peermsgs       * msgs,
                        tr_piece_index_t    piece )
 {

diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index 348d2be2dfed9c9a5e4049d7a02cda835de6c3cc..2329dc2b93bd92c780ea82ffb639788126566c33 100644 (file)
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -44,7 +44,7 @@ void         tr_peerMsgsCancel( tr_peermsgs * msgs,
 
 void         tr_peerMsgsFree( tr_peermsgs* );
 
-int          tr_peerMsgsAddRequest( tr_peermsgs      * peer,
+tr_addreq_t  tr_peerMsgsAddRequest( tr_peermsgs      * peer,
                                     tr_piece_index_t   piece );
 
 void         tr_peerMsgsUnsubscribe ( tr_peermsgs       * peer,