Changeset 2104

Timestamp:

Jun 16, 2007, 9:53:43 PM (15 years ago)

Author:

charles

Message:

tighten things up a little to address bmw's complaints and mine

Location:

branches/file_selection

Files:

• cli/transmissioncli.c (modified) (1 diff)
• gtk/make-meta-ui.c (modified) (1 diff)
• libtransmission/makemeta.c (modified) (1 diff)
• libtransmission/makemeta.h (modified) (1 diff)

branches/file_selection/cli/transmissioncli.c

@@ -96 +96 @@
 progress_func( const meta_info_builder_t * builder     UNUSED,
                size_t                      pieceIndex,
-               size_t                      pieceCount,
                int                       * abortFlag   UNUSED,
                void                      * userData    UNUSED )

branches/file_selection/gtk/make-meta-ui.c

@@ -53 +53 @@
 progress_cb( const meta_info_builder_t  * builder    UNUSED,
              size_t                       pieceIndex,
-             size_t                       pieceCount,
              int                        * abortFlag,
              void                       * user_data  UNUSED)
 {
-    g_message ("%lu of %lu", pieceIndex, pieceCount);
+    g_message ("%lu of %lu", pieceIndex, builder->pieceCount);
 
     *abortFlag = *(gboolean*)user_data;

branches/file_selection/libtransmission/makemeta.c

@@ -234 +234 @@
        this will take a little tweaking to ioRecalculateHash,
        probably will get done Sunday or Monday */
-    (progress_func)( builder, 0, t.info.pieceCount, &abort, progress_func_user_data );
+    (progress_func)( builder, 0, &abort, progress_func_user_data );
 
     for( i=0; i<(size_t)t.info.pieceCount; ++i ) {

branches/file_selection/libtransmission/makemeta.h

@@ -42 +42 @@
 tr_metaInfoBuilderCreate( const char * topFile );
 
-/* set abortFlag to nonzero to abort the checksum generation */
+/** 
+ * Called periodically during the checksum generation.
+ *
+ * 'builder' is the builder passed into tr_makeMetaInfo
+ * 'pieceIndex' is the current piece having a checksum generated
+ * 'abortFlag' is an int pointer to set if the user wants to abort
+ * 'userData' is the data passed into tr_makeMetaInfo
+ */
 typedef
 void (*makemeta_progress_func)(const meta_info_builder_t * builder,
                                size_t                      pieceIndex,
-                               size_t                      pieceCount,
                                int                       * abortFlag,
                                void                      * userData );
+
+/**
+ * Builds a .torrent metainfo file.
+ *
+ * 'outputFile' if NULL, builder->top + ".torrent" will be used.
+ * 'progress_func' a client-implemented callback function (see above)
+ * 'progress_func_user_data' is passed back to the user in the progress func.
+ *     It can be used to pass a resource or handle from tr_makeMetaInfo's
+ *     caller to progress_func, or anything else.  Pass NULL if not needed.
+ */
 int
 tr_makeMetaInfo( const meta_info_builder_t  * builder,
                  makemeta_progress_func       progress_func,
                  void                       * progress_func_user_data,
-                 const char                 * outputFile_or_NULL,
+                 const char                 * outputFile,
                  const char                 * announce,
                  const char                 * comment,