From 66983ddc70e6b2055da5576931b2d47453e119ae Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Fri, 1 Jan 2010 22:40:54 +0000
Subject: [PATCH] (trunk libT) sync the tr_wait_msec() calls in daemon/ and
 cli/

---
 cli/cli.c       | 10 +++++-----
 daemon/daemon.c |  2 +-
 daemon/remote.c |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cli/cli.c b/cli/cli.c
index c8cb1ac44..c961eb201 100644
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -32,7 +32,7 @@
 #include <libtransmission/bencode.h>
 #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 */
 
@@ -365,7 +365,7 @@ main( int     argc,
         tr_makeMetaInfo( b, torrentPath, announce, announceCount, comment, isPrivate );
         while( !b->isDone )
         {
-            tr_wait( 1000 );
+            tr_wait_msec( 1000 );
             printf( "." );
         }
 
@@ -385,7 +385,7 @@ main( int     argc,
     } else if( !memcmp( torrentPath, "http", 4 ) ) {
         tr_webRun( h, torrentPath, NULL, onTorrentFileDownloaded, ctor );
         waitingOnWeb = TRUE;
-        while( waitingOnWeb ) tr_wait( 1000 );
+        while( waitingOnWeb ) tr_wait_msec( 1000 );
     }
     tr_free( fileContents );
 
@@ -421,7 +421,7 @@ main( int     argc,
             fprintf( stderr, "scraping %d trackers:\n", leftToScrape );
 
             while( leftToScrape > 0 && ( ( time( NULL ) - start ) < 20 ) )
-                tr_wait( 250 );
+                tr_wait_msec( 250 );
         }
         goto cleanup;
     }
@@ -470,7 +470,7 @@ main( int     argc,
                                              "Tracker gave an error:",
                                              "Error:" };
 
-        tr_wait( 200 );
+        tr_wait_msec( 200 );
 
         if( gotsig )
         {
diff --git a/daemon/daemon.c b/daemon/daemon.c
index 031fc3277..d0f2c386c 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -417,7 +417,7 @@ main( int argc, char ** argv )
 #endif
 
     while( !closing ) {
-        tr_wait( 1000 ); /* sleep one second */
+        tr_wait_msec( 1000 ); /* sleep one second */
         dtr_watchdir_update( watchdir );
         pumpLogMessages( foreground );
     }
diff --git a/daemon/remote.c b/daemon/remote.c
index 6a1f79b84..ddae5ba84 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1469,7 +1469,7 @@ printDetails( tr_benc * top )
                 for( i=k=0; k<len; ++k ) {
                     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) )
                         printf( "\n  " );