Changeset 2206 for trunk/libtransmission/makemeta.c

Timestamp:

Jun 27, 2007, 5:14:38 AM (15 years ago)

Author:

charles

Message:

add tr_torrentCanAdd() as per BentMyWookie?'s request... clear tracker error string when restarting... fix r2202 "completed" announce bug.

File:

• trunk/libtransmission/makemeta.c (modified) (5 diffs)

trunk/libtransmission/makemeta.c

@@ -64 +64 @@
     else if( S_ISREG( sb.st_mode ) )
     {
-        struct FileList * node = tr_malloc( sizeof( struct FileList ) );
+        struct FileList * node = tr_new( struct FileList, 1 );
         node->size = sb.st_size;
         node->filename = tr_strdup( buf );
@@ -118 +118 @@
     struct FileList * files;
     struct FileList * walk;
-    tr_metainfo_builder_t * ret = tr_calloc( 1, sizeof(tr_metainfo_builder_t) );
+    tr_metainfo_builder_t * ret = tr_new0( tr_metainfo_builder_t, 1 );
     ret->top = tr_strdup( topFile );
     ret->handle = handle; 
@@ -143 +143 @@
         ++ret->fileCount;
 
-    ret->files = tr_calloc(ret->fileCount, sizeof(tr_metainfo_builder_file_t));
+    ret->files = tr_new0( tr_metainfo_builder_file_t, ret->fileCount );
 
     for( i=0, walk=files; walk!=NULL; ++i )
@@ -194 +194 @@
 {
     int fileIndex = 0;
-    uint8_t *ret = (uint8_t*) tr_malloc ( SHA_DIGEST_LENGTH * b->pieceCount );
+    uint8_t *ret = tr_new( uint8_t, SHA_DIGEST_LENGTH * b->pieceCount );
     uint8_t *walk = ret;
-    uint8_t *buf = tr_malloc( b->pieceSize );
+    uint8_t *buf = tr_new( uint8_t, b->pieceSize );
     uint64_t totalRemain;
     uint64_t off = 0;
@@ -423 +423 @@
     if( lock == NULL )
     {
-        lock = tr_calloc( 1, sizeof( tr_lock_t ) );
+        lock = tr_new0( tr_lock_t, 1 );
         tr_lockInit( lock );
     }