Changeset 7748 for trunk

Timestamp:

Jan 19, 2009, 2:05:43 PM (13 years ago)

Author:

charles

Message:

(trunk libT) prefer int' over ssize_t'

Location:

trunk/libtransmission

Files:

• ConvertUTF.c (modified) (2 diffs)
• ConvertUTF.h (modified) (2 diffs)
• bandwidth.c (modified) (1 diff)
• peer-io.c (modified) (9 diffs)
• peer-io.h (modified) (2 diffs)
• rpcimpl.c (modified) (3 diffs)
• rpcimpl.h (modified) (4 diffs)
• utils-test.c (modified) (1 diff)
• utils.c (modified) (3 diffs)
• utils.h (modified) (2 diffs)

trunk/libtransmission/ConvertUTF.c

@@ -44 +44 @@
 #endif
 #include <string.h> /* strlen() */
-#include <unistd.h> /* ssize_t */
 #include "ConvertUTF.h"
 
@@ -352 +351 @@
  */
 Boolean
-tr_utf8_validate( const char * str, ssize_t max_len, const char ** end )
+tr_utf8_validate( const char * str, int max_len, const char ** end )
 {
     const UTF8* source = (const UTF8*) str;

trunk/libtransmission/ConvertUTF.h

@@ -5 +5 @@
 #error only libtransmission should #include this header.
 #endif
-
-#include <unistd.h> /* ssize_t */
 
 /*
@@ -154 +152 @@
 
 /* intended to work the same as g_utf8_validate */
-Boolean tr_utf8_validate( const char * str, ssize_t max_len, const char ** end );
+Boolean tr_utf8_validate( const char * str, int max_len, const char ** end );
 
 

trunk/libtransmission/bandwidth.c

@@ -224 +224 @@
     {
         const size_t increment = 1024;
-        const ssize_t bytesUsed = tr_peerIoFlush( peers[i], dir, increment );
-
-        dbgmsg( "peer #%d of %d used %zd bytes in this pass", i, n, bytesUsed );
-
-        if( bytesUsed == (ssize_t)increment )
+        const int bytesUsed = tr_peerIoFlush( peers[i], dir, increment );
+
+        dbgmsg( "peer #%d of %d used %d bytes in this pass", i, n, bytesUsed );
+
+        if( bytesUsed == (int)increment )
             ++i;
         else {

trunk/libtransmission/peer-io.c

@@ -237 +237 @@
 }
 
-static ssize_t
+static int
 tr_evbuffer_write( tr_peerIo * io, int fd, size_t howmuch )
 {
     int e;
-    ssize_t n;
+    int n;
     struct evbuffer * buffer = io->outbuf;
 
@@ -248 +248 @@
     errno = 0;
 #ifdef WIN32
-    n = send(fd, buffer->buffer, howmuch,  0 );
+    n = (int) send(fd, buffer->buffer, howmuch,  0 );
 #else
-    n = write(fd, buffer->buffer, howmuch );
+    n = (int) write(fd, buffer->buffer, howmuch );
 #endif
     e = errno;
-    dbgmsg( io, "wrote %zd to peer (%s)", n, (n==-1?strerror(e):"") );
+    dbgmsg( io, "wrote %d to peer (%s)", n, (n==-1?strerror(e):"") );
 
     if( n > 0 )
@@ -763 +763 @@
 ***/
 
-static ssize_t
+static int
 tr_peerIoTryRead( tr_peerIo * io, size_t howmuch )
 {
-    ssize_t res = 0;
+    int res = 0;
 
     if(( howmuch = tr_bandwidthClamp( &io->bandwidth, TR_DOWN, howmuch )))
@@ -775 +775 @@
         e = errno;
 
-        dbgmsg( io, "read %zd from peer (%s)", res, (res==-1?strerror(e):"") );
+        dbgmsg( io, "read %d from peer (%s)", res, (res==-1?strerror(e):"") );
 
         if( EVBUFFER_LENGTH( io->inbuf ) )
@@ -785 +785 @@
             if( res == 0 )
                 what |= EVBUFFER_EOF;
-            dbgmsg( io, "tr_peerIoTryRead got an error. res is %zd, what is %hd, errno is %d (%s)", res, what, e, strerror( e ) );
+            dbgmsg( io, "tr_peerIoTryRead got an error. res is %d, what is %hd, errno is %d (%s)", res, what, e, strerror( e ) );
             io->gotError( io, what, io->userData );
         }
@@ -793 +793 @@
 }
 
-static ssize_t
+static int
 tr_peerIoTryWrite( tr_peerIo * io, size_t howmuch )
 {
-    ssize_t n = 0;
+    int n = 0;
 
     if(( howmuch = tr_bandwidthClamp( &io->bandwidth, TR_UP, howmuch )))
@@ -811 +811 @@
         {
             const short what = EVBUFFER_WRITE | EVBUFFER_ERROR;
-            dbgmsg( io, "tr_peerIoTryWrite got an error. res is %zd, what is %hd, errno is %d (%s)", n, what, e, strerror( e ) );
+            dbgmsg( io, "tr_peerIoTryWrite got an error. res is %d, what is %hd, errno is %d (%s)", n, what, e, strerror( e ) );
             io->gotError( io, what, io->userData );
         }
@@ -819 +819 @@
 }
 
-ssize_t
+int
 tr_peerIoFlush( tr_peerIo  * io, tr_direction dir, size_t limit )
 {
-    ssize_t bytesUsed;
+    int bytesUsed;
 
     assert( tr_isPeerIo( io ) );
@@ -835 +835 @@
     }
 
-    dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %zd", (int)dir, limit, bytesUsed );
+    dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %d", (int)dir, limit, bytesUsed );
     return bytesUsed;
 }

trunk/libtransmission/peer-io.h

@@ -77 +77 @@
     int                   socket;
 
-    ssize_t               refCount;
+    int                   refCount;
 
     uint8_t               peerId[SHA_DIGEST_LENGTH];
@@ -361 +361 @@
                                tr_bool        isEnabled );
                        
-ssize_t   tr_peerIoFlush( tr_peerIo     * io,
+int       tr_peerIoFlush( tr_peerIo     * io,
                           tr_direction    dir,
                           size_t          byteLimit );

trunk/libtransmission/rpcimpl.c

@@ -981 +981 @@
 tr_rpc_request_exec_json( tr_session            * session,
                           const void            * request_json,
-                          ssize_t                 request_len,
+                          int                     request_len,
                           tr_rpc_response_func    callback,
                           void                  * callback_user_data )
@@ -1033 +1033 @@
 tr_rpc_parse_list_str( tr_benc     * setme,
                        const char  * str_in,
-                       ssize_t       len )
+                       int           len )
 
 {
@@ -1080 +1080 @@
 tr_rpc_request_exec_uri( tr_session           * session,
                          const void           * request_uri,
-                         ssize_t                request_len,
+                         int                    request_len,
                          tr_rpc_response_func   callback,
                          void                 * callback_user_data )

trunk/libtransmission/rpcimpl.h

@@ -14 +14 @@
 #define TR_RPC_H
 
-#include <unistd.h> /* ssize_t */
-
 /***
 ****  RPC processing
@@ -29 +27 @@
 void tr_rpc_request_exec_json( tr_session            * session,
                                const void            * request_json,
-                               ssize_t                 request_len,
+                               int                     request_len,
                                tr_rpc_response_func    callback,
                                void                  * callback_user_data );
@@ -36 +34 @@
 void tr_rpc_request_exec_uri( tr_session           * session,
                               const void           * request_uri,
-                              ssize_t                request_len,
+                              int                    request_len,
                               tr_rpc_response_func   callback,
                               void                 * callback_user_data );
@@ -42 +40 @@
 void tr_rpc_parse_list_str( struct tr_benc * setme,
                             const char     * list_str,
-                            ssize_t          list_str_len );
+                            int              list_str_len );
 
 

trunk/libtransmission/utils-test.c

@@ -2 +2 @@
 #include <string.h> /* strcmp */
 #include "transmission.h"
-#include <unistd.h> /* ssize_t */
 #include "ConvertUTF.h" /* tr_utf8_validate*/
 #include "platform.h"

trunk/libtransmission/utils.c

@@ -638 +638 @@
 
 char*
-tr_strndup( const void * in, ssize_t len )
+tr_strndup( const void * in, int len )
 {
     char * out = NULL;
@@ -1326 +1326 @@
 
 char*
-tr_utf8clean( const char * str, ssize_t max_len, tr_bool * err )
+tr_utf8clean( const char * str, int max_len, tr_bool * err )
 {
     const char zero = '\0';
@@ -1337 +1337 @@
 
     if( max_len < 0 )
-        max_len = (ssize_t) strlen( str );
+        max_len = (int) strlen( str );
 
     while( !tr_utf8_validate ( str, max_len, &end ) )
     {
-        const ssize_t good_len = end - str;
+        const int good_len = end - str;
 
         evbuffer_add( buf, str, good_len );

trunk/libtransmission/utils.h

@@ -239 +239 @@
 
 char*          tr_utf8clean( const char  * str,
-                             ssize_t       max_len,
+                             int           max_len,
                              tr_bool     * err );
 
@@ -303 +303 @@
 
 /** @param in is a void* so that callers can pass in both signed & unsigned without a cast */
-char* tr_strndup( const void * in, ssize_t len ) TR_GNUC_MALLOC;
+char* tr_strndup( const void * in, int len ) TR_GNUC_MALLOC;
 
 /** @param in is a void* so that callers can pass in both signed & unsigned without a cast */