Changeset 1215

Timestamp:

Dec 14, 2006, 3:28:17 PM (16 years ago)

Author:

titer

Message:

Return the proper errors from tr_ioRead and tr_ioWrite

Location:

branches/io/libtransmission

Files:

• inout.c (modified) (11 diffs)
• inout.h (modified) (1 diff)
• transmission.h (modified) (1 diff)

branches/io/libtransmission/inout.c

@@ -106 +106 @@
 /***********************************************************************
  * tr_ioRead
- ***********************************************************************
- *
  **********************************************************************/
 int tr_ioRead( tr_io_t * io, int index, int begin, int length,
@@ -123 +121 @@
 /***********************************************************************
  * tr_ioWrite
- ***********************************************************************
- *
  **********************************************************************/
 int tr_ioWrite( tr_io_t * io, int index, int begin, int length,
@@ -137 +133 @@
     int            pieceSize;
     int            startBlock, endBlock;
+    int            ret;
 
     if( io->pieceSlot[index] < 0 )
@@ -148 +145 @@
         (uint64_t) inf->pieceSize + (uint64_t) begin;
 
-    if( writeBytes( io, offset, length, buf ) )
-    {
-        return 1;
+    if( ( ret = writeBytes( io, offset, length, buf ) ) )
+    {
+        return ret;
     }
 
@@ -327 +324 @@
     int    file;
     iofunc readOrWrite = isWrite ? (iofunc) write : (iofunc) read;
+    int    ret = 0;
 
     /* Release the torrent lock so the UI can still update itself if
@@ -336 +334 @@
     {
         tr_err( "readOrWriteBytes: trying to write more than a piece" );
-        goto fail;
+        ret = TR_ERROR_ASSERT;
+        goto cleanup;
     }
 
@@ -354 +353 @@
         tr_err( "readOrWriteBytes: offset out of range (%"PRIu64", %d, %d)",
                 offset, size, isWrite );
-        goto fail;
+        ret = TR_ERROR_ASSERT;
+        goto cleanup;
     }
 
@@ -376 +376 @@
             if( file < 0 )
             {
-                goto fail;
+                ret = file;
+                goto cleanup;
             }
 
@@ -383 +384 @@
             {
                 tr_fdFileRelease( tor->fdlimit, file );
-                goto fail;
+                ret = TR_ERROR_IO_OTHER;
+                goto cleanup;
             }
 
@@ -390 +392 @@
             {
                 tr_fdFileRelease( tor->fdlimit, file );
-                goto fail;
+                ret = TR_ERROR_IO_OTHER;
+                goto cleanup;
             }
 
@@ -404 +407 @@
     }
 
+cleanup:
     tr_lockLock( &tor->lock );
-    return 0;
-
-fail:
-    tr_lockLock( &tor->lock );
-    return 1;
+    return ret;
 }
 

branches/io/libtransmission/inout.h

@@ -31 +31 @@
 
 tr_io_t * tr_ioInit        ( tr_torrent_t * );
+
+/***********************************************************************
+ * tr_ioRead, tr_ioWrite
+ ***********************************************************************
+ * Reads or writes the block specified by the piece index, the offset in
+ * that piece and the size of the block. Returns 0 if successful, 
+ * TR_ERROR_ASSERT if the parameters are incorrect, one of the
+ * TR_ERROR_IO_* otherwise.
+ **********************************************************************/
 int       tr_ioRead        ( tr_io_t *, int, int, int, uint8_t * );
 int       tr_ioWrite       ( tr_io_t *, int, int, int, uint8_t * );
+
 void      tr_ioClose       ( tr_io_t * );
 void      tr_ioSaveResume  ( tr_io_t * );

branches/io/libtransmission/transmission.h

@@ -56 +56 @@
  * Error codes
  **********************************************************************/
+/* General errors */
+#define TR_ERROR_ASSERT         -1
+/* I/O errors */
 #define TR_ERROR_IO_PARENT      -10
 #define TR_ERROR_IO_PERMISSIONS -11