Changeset 9360 for branches

Timestamp:

Oct 22, 2009, 2:33:03 AM (13 years ago)

Author:

charles

Message:

(1.7x) backports for 1.76: r9177 #2379 infinite ratio shows as "nan" on optware

Location:

branches/1.7x

Files:

• NEWS (modified) (1 diff)
• libtransmission/utils.c (modified) (1 diff)

branches/1.7x/NEWS

@@ -5 +5 @@
 ==== Daemon ====
   * Fix ratio-limit bug on some uClibc systems
+  * Fix invalid JSON "nan" error on optware
 ==== GTK+ ====
   * Fix broken SIGINT (ctrl-c) handling

branches/1.7x/libtransmission/utils.c

@@ -1329 +1329 @@
 tr_truncd( double x, int decimal_places )
 {
-    const int i = (int) pow( 10, decimal_places );
-    double x2 = (int)(x*i);
+    static const int multiplier[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000 };
+    const int64_t i = multiplier[decimal_places];
+    double x2 = (int64_t)(x*i);
     return x2 / i;
 }