Changeset 6306 for trunk/cli/cli.c

Timestamp:

Jul 9, 2008, 3:31:35 PM (14 years ago)

Author:

charles

Message:

code cleanup

File:

• trunk/cli/cli.c (modified) (9 diffs)

trunk/cli/cli.c

@@ -55 +55 @@
 static sig_atomic_t  manualUpdate     = 0;
 
-static const char   * torrentPath   = NULL;
-static const char   * downloadDir   = NULL;
+static const char   * torrentPath  = NULL;
+static const char   * downloadDir  = NULL;
 static const char   * finishCall   = NULL;
 static const char   * announce     = NULL;
@@ -166 +166 @@
                   inf->pieceSize, inf->totalSize % inf->pieceSize );
 
-    if( inf->comment[0] )
+    if( inf->comment && *inf->comment )
         fprintf( out, "comment:\t%s\n", inf->comment );
-    if( inf->creator[0] )
+    if( inf->creator && *inf->creator )
         fprintf( out, "creator:\t%s\n", inf->creator );
     if( inf->isPrivate )
@@ -175 +175 @@
     fprintf( out, "file(s):\n" );
     for( ff=0; ff<inf->fileCount; ++ff )
-        fprintf( out, "\t%s (%"PRIu64")\n", inf->files[ff].name, inf->files[ff].length );
+        fprintf( out, "\t%s (%"PRIu64")\n", inf->files[ff].name,
+                                            inf->files[ff].length );
 }
 
@@ -214 +215 @@
                   st->rateUpload, ratioStr );
     }
-    else if( st->status & TR_STATUS_STOPPED )
-    {
-        *buf = '\0';
-    }
+    else *buf = '\0';
 }
 
@@ -297 +295 @@
     {
         int err;
-        tr_metainfo_builder * builder = tr_metaInfoBuilderCreate( h, sourceFile );
+        tr_metainfo_builder * b = tr_metaInfoBuilderCreate( h, sourceFile );
         tr_tracker_info ti;
         ti.tier = 0;
         ti.announce = (char*) announce;
-        tr_makeMetaInfo( builder, torrentPath, &ti, 1, comment, isPrivate );
-        while( !builder->isDone ) {
+        tr_makeMetaInfo( b, torrentPath, &ti, 1, comment, isPrivate );
+        while( !b->isDone ) {
             tr_wait( 1000 );
             printf( "." );
         }
-        err = builder->result;
-        tr_metaInfoBuilderFree( builder );
+        err = b->result;
+        tr_metaInfoBuilderFree( b );
         return err;
     }
@@ -339 +337 @@
                     ++leftToScrape;
                     tr_webRun( h, url, NULL, scrapeDoneFunc, host );
+                    tr_free( host );
                     tr_free( url );
                 }
@@ -394 +393 @@
         if( gotsig ) {
             gotsig = 0;
-fprintf( stderr, "stopping torrent...\n" );
+            printf( "stopping torrent...\n" );
             tr_torrentStop( tor );
         }
@@ -401 +400 @@
             manualUpdate = 0;
             if ( !tr_torrentCanManualUpdate( tor ) )
-                fprintf( stderr, "\rReceived SIGHUP, but can't send a manual update now\n" );
+                fprintf( stderr, "\nReceived SIGHUP, but can't send a manual update now\n" );
             else {
-                fprintf( stderr, "\rReceived SIGHUP: manual update scheduled\n" );
+                fprintf( stderr, "\nReceived SIGHUP: manual update scheduled\n" );
                 tr_torrentManualUpdate( tor );
             }
@@ -413 +412 @@
 
         getStatusStr( st, line, sizeof( line ) );
-        printf( "%-*s\n", LINEWIDTH, line );
+        printf( "\r%-*s", LINEWIDTH, line );
         if( st->error )
-            printf( "%s\n", st->errorString );
+            printf( "\n%s\n", st->errorString );
     }