Changeset 2210

Timestamp:

Jun 27, 2007, 11:22:09 PM (15 years ago)

Author:

charles

Message:

simplify tr_torrentParse() based on BWM's feedback

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (10 diffs)
• transmission.h (modified) (1 diff)

trunk/libtransmission/torrent.c

@@ -270 +270 @@
         return TR_EDUPLICATE;
 
-    if( pathIsInUse( h, destination, info->name ) )
-        return TR_ERROR_IO_DUP_DOWNLOAD;
+    if( destination && pathIsInUse( h, destination, info->name ) )
+        return TR_EDUPLICATE;
 
     return TR_OK;
@@ -280 +280 @@
                  const char         * path,
                  const char         * destination,
-                 tr_info_t          * setme_info,
-                 int                * setme_canAdd )
+                 tr_info_t          * setme_info )
 {
     int ret;
@@ -291 +290 @@
     ret = tr_metainfoParseFile( setme_info, h->tag, path, FALSE );
 
-    if( setme_canAdd )
-       *setme_canAdd = ret ? ret : infoCanAdd( h, destination, setme_info );
+    if( ret == TR_OK )
+        ret = infoCanAdd( h, destination, setme_info );
 
     return ret;
@@ -305 +304 @@
 {
     int val;
-    int err = 0;
     tr_torrent_t * tor = NULL;
 
-    if(( val = tr_torrentParse( h, destination, path, NULL, &err )))
+    if(( val = tr_torrentParse( h, destination, path, NULL )))
         *error = val;
-    else if( err )
-        *error = err;
     else if(!(( tor = tr_new0( tr_torrent_t, 1 ))))
         *error = TR_EOTHER;
@@ -326 +322 @@
                      const char         * hashStr,
                      const char         * destination,
-                     tr_info_t          * setme_info,
-                     int                * setme_canAdd )
+                     tr_info_t          * setme_info )
 {
     int ret;
@@ -337 +332 @@
     ret = tr_metainfoParseHash( setme_info, h->tag, hashStr );
 
-    if( setme_canAdd )
-       *setme_canAdd = ret ? ret : infoCanAdd( h, destination, setme_info );
+    if( ret == TR_OK )
+        ret = infoCanAdd( h, destination, setme_info );
 
     return ret;
@@ -352 +347 @@
 {
     int val;
-    int err = 0;
     tr_torrent_t * tor = NULL;
 
-    if(( val = tr_torrentParseHash( h, hashStr, destination, NULL, &err )))
+    if(( val = tr_torrentParseHash( h, hashStr, destination, NULL )))
         *error = val;
-    else if( err )
-        *error = err;
     else if(!(( tor = tr_new0( tr_torrent_t, 1 ))))
         *error = TR_EOTHER;
@@ -374 +366 @@
                      size_t               size,
                      const char         * destination,
-                     tr_info_t          * setme_info,
-                     int                * setme_canAdd )
+                     tr_info_t          * setme_info )
 {
     int ret;
@@ -385 +376 @@
     ret = tr_metainfoParseData( setme_info, h->tag, data, size, FALSE );
 
-    if( setme_canAdd )
-       *setme_canAdd = ret ? ret : infoCanAdd( h, destination, setme_info );
+    if( ret == TR_OK )
+        ret = infoCanAdd( h, destination, setme_info );
 
     return ret;
@@ -400 +391 @@
 {
     int val;
-    int err = 0;
     tr_torrent_t * tor = NULL;
 
-    if(( val = tr_torrentParseData( h, data, size, destination, NULL, &err ) ))
+    if(( val = tr_torrentParseData( h, data, size, destination, NULL )))
         *error = val;
-    else if( err )
-        *error = err;
     else if(!(( tor = tr_new0( tr_torrent_t, 1 ))))
         *error = TR_EOTHER;

trunk/libtransmission/transmission.h

@@ -275 +275 @@
  * Parses the specified metainfo file.
  *
- * Returns TR_OK or TR_INVALID based on whether or not the
- * metainfo file is successfully parsed.
+ * Returns TR_OK if it parsed and can be added to Transmission.
+ * Returns TR_INVALID if it couldn't be parsed.
+ * Returns TR_EDUPLICATE if it parsed but can't be added.
  *
- * If parsing succeeded and "setme_info" is non-NULL,
- * it will be populated with the file's information.
+ * "destination" can be NULL if you don't need to know whether
+ * or not the torrent can be added.
  *
- * If "setme_canAdd" is non-NULL, it will be set to TR_OK,
- * TR_EDUPLICATE, TR_ERROR_IO_DUP_DOWNLOAD, or TR_EINVALID.
- *
- * "destination" is used for the canAdd tests, so it can
- * be NULL if "setme_canAdd" is too.
+ " "setme_info" can be NULL if you don't need the information.
+ * If the metainfo can be parsed and setme_info is non-NULL,
+ * it will be filled with the metadata's info.
  */
 int tr_torrentParse( const tr_handle_t  * handle,
                      const char         * metainfo_filename,
                      const char         * destination,
-                     tr_info_t          * setme_info,
-                     int                * setme_canAdd ); 
+                     tr_info_t          * setme_info );
 
 /***********************************************************************