Changeset 8808

Timestamp:

Jul 14, 2009, 8:09:46 PM (13 years ago)

Author:

charles

Message:

(trunk) #2271: rounding problem in printf()

Location:

trunk

Files:

• cli/cli.c (modified) (2 diffs)
• gtk/details.c (modified) (1 diff)
• gtk/file-list.c (modified) (1 diff)
• gtk/torrent-cell-renderer.c (modified) (4 diffs)
• gtk/tr-torrent.c (modified) (2 diffs)
• libtransmission/utils.c (modified) (3 diffs)
• libtransmission/utils.h (modified) (1 diff)

trunk/cli/cli.c

@@ -236 +236 @@
         tr_snprintf( buf, buflen,
                      "Verifying local files (%.2f%%, %.2f%% valid)",
-                     100 * st->recheckProgress,
-                     100.0 * st->percentDone );
+                     tr_truncd( 100 * st->recheckProgress, 2 ),
+                     tr_truncd( 100 * st->percentDone, 2 ) );
     }
     else if( st->activity & TR_STATUS_DOWNLOAD )
@@ -247 +247 @@
             "Progress: %.1f%%, dl from %d of %d peers (%.0f KB/s), "
             "ul to %d (%.0f KB/s) [%s]",
-            st->percentDone * 100.0,
+            tr_truncd( 100 * st->percentDone, 1 ),
             st->peersSendingToUs,
             st->peersConnected,

trunk/gtk/details.c

@@ -796 +796 @@
             tr_strlsize( unver, haveUnchecked,             sizeof( unver ) );
             if( haveUnchecked )
-                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$.1f%%); %3$s Unverified" ), total, ratio, unver );
+                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$.1f%%); %3$s Unverified" ), total, tr_truncd( ratio, 1 ), unver );
             else
-                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$.1f%%)" ), total, ratio );
+                g_snprintf( buf, sizeof( buf ), _( "%1$s (%2$.1f%%)" ), total, tr_truncd( ratio, 1 ) );
             str = buf;
         }

trunk/gtk/file-list.c

@@ -19 +19 @@
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h> /* tr_getRatio */
 
 #include "file-list.h"

trunk/gtk/torrent-cell-renderer.c

@@ -12 +12 @@
 
 #include "assert.h"
-#include <string.h> /* strcmp */
+#include <string.h> /* strcmp() */
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libtransmission/transmission.h>
+#include <libtransmission/utils.h> /* tr_truncd() */
 #include "hig.h"
 #include "icons.h"
@@ -62 +63 @@
             tr_strlsize( buf1, haveTotal, sizeof( buf1 ) ),
             tr_strlsize( buf2, torStat->sizeWhenDone, sizeof( buf2 ) ),
-            torStat->percentDone * 100.0 );
+            tr_truncd( torStat->percentDone * 100.0, 2 ) );
     }
     else if( !isSeed )
@@ -75 +76 @@
             tr_strlsize( buf1, haveTotal, sizeof( buf1 ) ),
             tr_strlsize( buf2, info->totalSize, sizeof( buf2 ) ),
-            torStat->percentComplete * 100.0,
+            tr_truncd( torStat->percentComplete * 100.0, 2 ),
             tr_strlsize( buf3, torStat->uploadedEver, sizeof( buf3 ) ),
             tr_strlratio( buf4, torStat->ratio, sizeof( buf4 ) ) );
@@ -176 +177 @@
         case TR_STATUS_CHECK:
             g_string_append_printf( gstr,
-                                    _(
-                                        "Verifying local data (%.1f%% tested)" ),
-                                    torStat->recheckProgress * 100.0 );
+                                    _( "Verifying local data (%.1f%% tested)" ),
+                                    tr_truncd( torStat->recheckProgress * 100.0, 1 ) );
             break;
 

trunk/gtk/tr-torrent.c

@@ -30 +30 @@
 
 #include <libtransmission/transmission.h>
+#include <libtransmission/utils.h> /* tr_truncd() */
 
 #include "tr-prefs.h"
@@ -230 +231 @@
         case TR_STATUS_CHECK_WAIT:
             top =
-                g_strdup_printf( _(
-                                     "Waiting to verify local data (%.1f%% tested)" ),
-                                 st->recheckProgress * 100.0 );
+                g_strdup_printf( _( "Waiting to verify local data (%.1f%% tested)" ),
+                                 tr_truncd( 100 * st->recheckProgress, 1 ) );
             break;
 
         case TR_STATUS_CHECK:
             top =
-                g_strdup_printf( _(
-                                     "Verifying local data (%.1f%% tested)" ),
-                                 st->recheckProgress * 100.0 );
+                g_strdup_printf( _( "Verifying local data (%.1f%% tested)" ),
+                                 tr_truncd( 100 * st->recheckProgress, 1 ) );
             break;
 

trunk/libtransmission/utils.c

@@ -18 +18 @@
 #include <ctype.h> /* isalpha, tolower */
 #include <errno.h>
+#include <math.h> /* pow */
 #include <stdarg.h>
 #include <stdio.h>
@@ -1326 +1327 @@
 ***/
 
-static void
-printf_double_without_rounding( char * buf, int buflen, double d, int places )
-{
-    char * pch;
-    char tmp[128];
-    int len;
-    tr_snprintf( tmp, sizeof( tmp ), "%'.64f", d );
-    pch = tmp;
-    while( isdigit( *pch ) ) ++pch; /* walk to the decimal point */
-    ++pch; /* walk over the decimal point */
-    pch += places;
-    len = MIN( buflen - 1, pch - tmp );
-    memcpy( buf, tmp, len );
-    buf[len] = '\0';
+double
+tr_truncd( double x, int decimal_places )
+{
+    const int i = (int) pow( 10, decimal_places );
+    double x2 = (int)(x*i);
+    return x2 / i;
 }
 
@@ -1350 +1343 @@
         tr_strlcpy( buf, infinity, buflen );
     else if( ratio < 10.0 )
-        printf_double_without_rounding( buf, buflen, ratio, 2 );
+        tr_snprintf( buf, buflen, "%.2f", tr_truncd( ratio, 2 ) );
     else if( ratio < 100.0 )
-        printf_double_without_rounding( buf, buflen, ratio, 1 );
+        tr_snprintf( buf, buflen, "%.1f", tr_truncd( ratio, 1 ) );
     else
         tr_snprintf( buf, buflen, "%'.0f", ratio );

trunk/libtransmission/utils.h

@@ -393 +393 @@
 void* tr_int2ptr( int );
 
+/* truncate a double value at a given number of decimal places.
+   this can be used to prevent a printf() call from rounding up:
+   call with the decimal_places argument equal to the number of
+   decimal places in the printf()'s precision:
+   
+   - printf("%.2f%%",           99.999    ) ==> "100.00%"
+   - printf("%.2f%%", tr_truncd(99.999, 2)) ==>  "99.99%"
+*/
+double tr_truncd( double x, int decimal_places );
+
 /**
  * @param buf the buffer to write the string to