Changeset 2259

Timestamp:

Jul 1, 2007, 1:50:14 AM (15 years ago)

Author:

charles

Message:

replace the unhelpful error message "error: insufficient resources" with more descriptive cases

Location:

trunk/libtransmission

Files:

• ipcparse.c (modified) (1 diff)
• transmission.h (modified) (1 diff)
• utils.c (modified) (2 diffs)

trunk/libtransmission/ipcparse.c

@@ -800 +800 @@
                     tr_bencInitStr( item, "io-space", -1, 1 );
                 }
-                else if( TR_ERROR_ISSET( TR_ERROR_IO_RESOURCES, error ) )
-                {
-                    tr_bencInitStr( item, "io-resources", -1, 1 );
+                else if( TR_ERROR_ISSET( TR_ERROR_IO_FILE_TOO_BIG, error ) )
+                {
+                    tr_bencInitStr( item, "io-file-too-big", -1, 1 );
+                }
+                else if( TR_ERROR_ISSET( TR_ERROR_IO_OPEN_FILES, error ) )
+                {
+                    tr_bencInitStr( item, "io-open-files", -1, 1 );
                 }
                 else if( TR_ERROR_ISSET( TR_ERROR_IO_MASK, error ) )

trunk/libtransmission/transmission.h

@@ -78 +78 @@
 /* I/O errors */
 #define TR_ERROR_IO_MASK            0x000000FF
-#define TR_ERROR_IO_PARENT          0x80000001
-#define TR_ERROR_IO_PERMISSIONS     0x80000002
-#define TR_ERROR_IO_SPACE           0x80000004
-#define TR_ERROR_IO_RESOURCES       0x80000008
-#define TR_ERROR_IO_DUP_DOWNLOAD    0x8000000A
-#define TR_ERROR_IO_OTHER           0x80000010
+#define TR_ERROR_IO_PARENT          ((1<<31) | (1<<0))
+#define TR_ERROR_IO_PERMISSIONS     ((1<<31) | (1<<1))
+#define TR_ERROR_IO_SPACE           ((1<<31) | (1<<2))
+#define TR_ERROR_IO_FILE_TOO_BIG    ((1<<31) | (1<<3))
+#define TR_ERROR_IO_OPEN_FILES      ((1<<31) | (1<<4))
+#define TR_ERROR_IO_DUP_DOWNLOAD    ((1<<31) | (1<<5))
+#define TR_ERROR_IO_OTHER           ((1<<31) | (1<<6))
 /* Misc */
 #define TR_ERROR_TC_MASK            0x00000F00

trunk/libtransmission/utils.c

@@ -343 +343 @@
             return TR_ERROR_IO_SPACE;
         case EMFILE:
+            return TR_ERROR_IO_FILE_TOO_BIG;
         case EFBIG:
-            return TR_ERROR_IO_RESOURCES;
+            return TR_ERROR_IO_OPEN_FILES;
         default:
             tr_dbg( "generic i/o errno from errno: %s", strerror( errno ) );
@@ -370 +371 @@
         case TR_ERROR_IO_DUP_DOWNLOAD:
             return "Already active transfer with same name and download folder";
-        case TR_ERROR_IO_RESOURCES:
-            return "Insufficient resources";
+        case TR_ERROR_IO_FILE_TOO_BIG:
+            return "File too large";
+        case TR_ERROR_IO_OPEN_FILES:
+            return "Too many open files";
         case TR_ERROR_IO_OTHER:
             return "Generic I/O error";