Changeset 9851

Timestamp:

Jan 1, 2010, 10:40:54 PM (12 years ago)

Author:

charles

Message:

(trunk libT) sync the tr_wait_msec() calls in daemon/ and cli/

Location:

trunk

Files:

• cli/cli.c (modified) (5 diffs)
• daemon/daemon.c (modified) (1 diff)
• daemon/remote.c (modified) (1 diff)

trunk/cli/cli.c

@@ -33 +33 @@
 #include <libtransmission/makemeta.h>
 #include <libtransmission/tr-getopt.h>
-#include <libtransmission/utils.h> /* tr_wait */
+#include <libtransmission/utils.h> /* tr_wait_msec */
 #include <libtransmission/version.h>
 #include <libtransmission/web.h> /* tr_webRun */
@@ -366 +366 @@
         while( !b->isDone )
         {
-            tr_wait( 1000 );
+            tr_wait_msec( 1000 );
             printf( "." );
         }
@@ -386 +386 @@
         tr_webRun( h, torrentPath, NULL, onTorrentFileDownloaded, ctor );
         waitingOnWeb = TRUE;
-        while( waitingOnWeb ) tr_wait( 1000 );
+        while( waitingOnWeb ) tr_wait_msec( 1000 );
     }
     tr_free( fileContents );
@@ -422 +422 @@
 
             while( leftToScrape > 0 && ( ( time( NULL ) - start ) < 20 ) )
-                tr_wait( 250 );
+                tr_wait_msec( 250 );
         }
         goto cleanup;
@@ -471 +471 @@
                                              "Error:" };
 
-        tr_wait( 200 );
+        tr_wait_msec( 200 );
 
         if( gotsig )

trunk/daemon/daemon.c

@@ -418 +418 @@
 
     while( !closing ) {
-        tr_wait( 1000 ); /* sleep one second */
+        tr_wait_msec( 1000 ); /* sleep one second */
         dtr_watchdir_update( watchdir );
         pumpLogMessages( foreground );

trunk/daemon/remote.c

@@ -1470 +1470 @@
                     int e;
                     for( e=0; i<j && e<8; ++e, ++i )
-                        printf( str[k] & (1<<(7-e)) ? "1" : "0" );
+                        printf( "%c", str[k] & (1<<(7-e)) ? '1' : '0' );
                     printf( " " );
                     if( !(i%64) )