Changeset 9573

Timestamp:

Nov 25, 2009, 7:26:30 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2595: "file too large error?" -- this can generate an EFBIG warning sparse preallocation is on and the peer makes an invalid request. At worst this kind of oddball case should generate a debug message notice, not a torrent error. Reported by Waldorf.

Location:

trunk/libtransmission

Files:

• inout.c (modified) (2 diffs)
• utils.c (modified) (1 diff)

trunk/libtransmission/inout.c

@@ -147 +147 @@
     {
         if( ioMode == TR_IO_READ ) {
-            int rc = tr_pread(fd, buf, buflen, fileOffset);
-            if(rc < 0) {
+            const int rc = tr_pread( fd, buf, buflen, fileOffset );
+            if( rc < 0 ) {
                 err = errno;
                 tr_torerr( tor, "read failed for \"%s\": %s",
@@ -154 +154 @@
             }
         } else if( ioMode == TR_IO_PREFETCH ) {
-            int rc = tr_prefetch(fd, fileOffset, buflen);
-            if(rc < 0) {
-                err = errno;
-                tr_torerr( tor, "prefetch failed for \"%s\": %s",
+            const int rc = tr_prefetch( fd, fileOffset, buflen );
+            if( rc < 0 ) {
+                tr_tordbg( tor, "prefetch failed for \"%s\": %s",
                            file->name, tr_strerror( err ) );
             }
         } else if( ioMode == TR_IO_WRITE ) {
-            int rc = tr_pwrite(fd, buf, buflen, fileOffset);
-            if(rc < 0) {
+            const int rc = tr_pwrite( fd, buf, buflen, fileOffset );
+            if( rc < 0 ) {
                 err = errno;
                 tr_torerr( tor, "write failed for \"%s\": %s",
                            file->name, tr_strerror( err ) );
             }
-        } else
+        } else {
             abort();
+        }
     }
 

trunk/libtransmission/utils.c

@@ -825 +825 @@
 
 int
-tr_snprintf( char *       buf,
-             size_t       buflen,
-             const char * fmt,
-             ... )
+tr_snprintf( char * buf, size_t buflen, const char * fmt, ... )
 {
     int     len;