Changeset 6699 for trunk/libtransmission/bencode.h

Timestamp:

Sep 4, 2008, 2:42:32 PM (14 years ago)

Author:

charles

Message:

(libT) change benc's integral type from int to size_t, squashing a couple of minor warnings

File:

• trunk/libtransmission/bencode.h (modified) (6 diffs)

trunk/libtransmission/bencode.h

@@ -32 +32 @@
         struct
         {
-            int    i;
+            size_t i;
             char * s;
         } s;
         struct
         {
-            int alloc;
-            int count;
+            size_t alloc;
+            size_t count;
             struct tr_benc * vals;
         } l;
@@ -54 +54 @@
 
 int tr_bencLoad( const void  * buf,
-                 int           buflen,
+                 size_t        buflen,
                  tr_benc     * setme_benc,
                  char       ** setme_end );
@@ -75 +75 @@
 void  tr_bencInitRaw( tr_benc *, const void * raw, size_t raw_len );
 void  tr_bencInitInt( tr_benc *, int64_t num );
-int   tr_bencInitDict( tr_benc *, int reserveCount );
-int   tr_bencInitList( tr_benc *, int reserveCount );
+int   tr_bencInitDict( tr_benc *, size_t reserveCount );
+int   tr_bencInitList( tr_benc *, size_t reserveCount );
 
 /***
@@ -82 +82 @@
 ***/
 
-int tr_bencListReserve( tr_benc *, int count );
+int tr_bencListReserve( tr_benc *, size_t reserveCount );
 tr_benc * tr_bencListAdd( tr_benc * );
 tr_benc * tr_bencListAddInt( tr_benc *, int64_t val );
 tr_benc * tr_bencListAddStr( tr_benc *, const char * val );
-tr_benc * tr_bencListAddList( tr_benc *, int reserveCount );
-tr_benc * tr_bencListAddDict( tr_benc *, int reserveCount );
+tr_benc * tr_bencListAddList( tr_benc *, size_t reserveCount );
+tr_benc * tr_bencListAddDict( tr_benc *, size_t reserveCount );
 
-int tr_bencListSize( const tr_benc * list );
-tr_benc * tr_bencListChild( tr_benc * list, int n );
+size_t tr_bencListSize( const tr_benc * list );
+tr_benc * tr_bencListChild( tr_benc * list, size_t n );
 
 /***
@@ -96 +96 @@
 ***/
 
-int tr_bencDictReserve( tr_benc *, int count );
+int tr_bencDictReserve( tr_benc *, size_t reserveCount );
 int tr_bencDictRemove( tr_benc *, const char * key );
 tr_benc * tr_bencDictAdd( tr_benc *, const char * key );
@@ -102 +102 @@
 tr_benc * tr_bencDictAddInt( tr_benc *, const char * key, int64_t val );
 tr_benc * tr_bencDictAddStr( tr_benc *, const char * key, const char * val );
-tr_benc * tr_bencDictAddList( tr_benc *, const char * key, int reserveCount );
-tr_benc * tr_bencDictAddDict( tr_benc *, const char * key, int reserveCount );
+tr_benc * tr_bencDictAddList( tr_benc *, const char * key, size_t reserve );
+tr_benc * tr_bencDictAddDict( tr_benc *, const char * key, size_t reserve );
 tr_benc * tr_bencDictAddRaw( tr_benc *, const char * key,
                              const void *, size_t len );