From cf69b110310e11457dfbfba3e99086965c1a56a1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 25 Nov 2009 19:26:30 +0000 Subject: [PATCH] (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. --- libtransmission/inout.c | 18 +++++++++--------- libtransmission/utils.c | 5 +---- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/libtransmission/inout.c b/libtransmission/inout.c index 7b58cf679..f57181a0a 100644 --- a/libtransmission/inout.c +++ b/libtransmission/inout.c @@ -146,28 +146,28 @@ readOrWriteBytes( tr_session * session, if( !err ) { 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", file->name, tr_strerror( err ) ); } } 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(); + } } return err; diff --git a/libtransmission/utils.c b/libtransmission/utils.c index eb3ea8829..ca42a927a 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -824,10 +824,7 @@ tr_wait( uint64_t delay_milliseconds ) ***/ int -tr_snprintf( char * buf, - size_t buflen, - const char * fmt, - ... ) +tr_snprintf( char * buf, size_t buflen, const char * fmt, ... ) { int len; va_list args; -- 2.40.0