Changeset 7594 for trunk/libtransmission/peer-io.c

Timestamp:

Jan 3, 2009, 4:57:40 AM (13 years ago)

Author:

charles

Message:

(trunk libT) use ssize_t where appropriate in tr_peerIoFlush()

File:

• trunk/libtransmission/peer-io.c (modified) (9 diffs)

trunk/libtransmission/peer-io.c

@@ -234 +234 @@
 }
 
-static int
+static ssize_t
 tr_evbuffer_write( tr_peerIo * io, int fd, size_t howmuch )
 {
+    int e;
+    ssize_t n;
     struct evbuffer * buffer = io->outbuf;
-    int n = MIN( EVBUFFER_LENGTH( buffer ), howmuch );
-    int e;
+
+    howmuch = MIN( EVBUFFER_LENGTH( buffer ), howmuch );
 
     errno = 0;
@@ -248 +250 @@
 #endif
     e = errno;
-    dbgmsg( io, "wrote %d to peer (%s)", n, (n==-1?strerror(e):"") );
-
-    if( n == -1 )
-        return -1;
-    if (n == 0)
-        return 0;
-    evbuffer_drain( buffer, n );
+    dbgmsg( io, "wrote %zd to peer (%s)", n, (n==-1?strerror(e):"") );
+
+    if( n > 0 )
+        evbuffer_drain( buffer, n );
 
     return n;
@@ -729 +728 @@
 ***/
 
-static int
+static ssize_t
 tr_peerIoTryRead( tr_peerIo * io, size_t howmuch )
 {
-    int res = 0;
+    ssize_t res = 0;
 
     if(( howmuch = tr_bandwidthClamp( &io->bandwidth, TR_DOWN, howmuch )))
@@ -741 +740 @@
         e = errno;
 
-        dbgmsg( io, "read %d from peer (%s)", res, (res==-1?strerror(e):"") );
+        dbgmsg( io, "read %zd from peer (%s)", res, (res==-1?strerror(e):"") );
 
         if( EVBUFFER_LENGTH( io->inbuf ) )
@@ -751 +750 @@
             if( res == 0 )
                 what |= EVBUFFER_EOF;
-            dbgmsg( io, "tr_peerIoTryRead got an error. res is %d, what is %hd, errno is %d (%s)", res, what, e, strerror( e ) );
+            dbgmsg( io, "tr_peerIoTryRead got an error. res is %zd, what is %hd, errno is %d (%s)", res, what, e, strerror( e ) );
             io->gotError( io, what, io->userData );
         }
@@ -759 +758 @@
 }
 
-static int
+static ssize_t
 tr_peerIoTryWrite( tr_peerIo * io, size_t howmuch )
 {
-    int n = 0;
+    ssize_t n = 0;
 
     if(( howmuch = tr_bandwidthClamp( &io->bandwidth, TR_UP, howmuch )))
@@ -768 +767 @@
         int e;
         errno = 0;
-        n = tr_evbuffer_write( io, io->socket, (int)howmuch );
+        n = tr_evbuffer_write( io, io->socket, howmuch );
         e = errno;
 
@@ -777 +776 @@
         {
             const short what = EVBUFFER_WRITE | EVBUFFER_ERROR;
-            dbgmsg( io, "tr_peerIoTryWrite got an error. res is %d, what is %hd, errno is %d (%s)", n, what, e, strerror( e ) );
+            dbgmsg( io, "tr_peerIoTryWrite got an error. res is %zd, what is %hd, errno is %d (%s)", n, what, e, strerror( e ) );
             io->gotError( io, what, io->userData );
         }
@@ -785 +784 @@
 }
 
-int
+ssize_t
 tr_peerIoFlush( tr_peerIo  * io, tr_direction dir, size_t limit )
 {
-    int bytesUsed;
+    ssize_t bytesUsed;
 
     assert( tr_isPeerIo( io ) );
     assert( tr_isDirection( dir ) );
 
-    if( dir==TR_DOWN )
+    if( dir == TR_DOWN )
         bytesUsed = tr_peerIoTryRead( io, limit );
     else
         bytesUsed = tr_peerIoTryWrite( io, limit );
 
-    dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %d", (int)dir, limit, bytesUsed );
+    dbgmsg( io, "flushing peer-io, direction %d, limit %zu, bytesUsed %zd", (int)dir, limit, bytesUsed );
     return bytesUsed;
 }