Changeset 10956

Timestamp:

Jul 6, 2010, 8:52:54 PM (13 years ago)

Author:

charles

Message:

(trunk) #3045 fix oops from last commit

Location:

trunk

Files:

• libtransmission/utils.c (modified) (3 diffs)
• libtransmission/utils.h (modified) (1 diff)
• macosx/Controller.m (modified) (1 diff)

trunk/libtransmission/utils.c

@@ -1580 +1580 @@
 void
 tr_formatter_size_init( unsigned int kilo,
-                        const char * b, const char * kb,
-                        const char * mb, const char * gb )
-{
-    formatter_init( &size_units, kilo, b, kb, mb, gb );
+                        const char * kb, const char * mb,
+                        const char * gb, const char * tb )
+{
+    formatter_init( &size_units, kilo, kb, mb, gb, tb );
 }
 
@@ -1598 +1598 @@
 void
 tr_formatter_speed_init( unsigned int kilo,
-                         const char * b, const char * kb,
-                         const char * mb, const char * gb )
+                         const char * kb, const char * mb,
+                         const char * gb, const char * tb )
 {
     tr_speed_K = kilo;
-    formatter_init( &speed_units, kilo, b, kb, mb, gb );
+    formatter_init( &speed_units, kilo, kb, mb, gb, tb );
 }
 
@@ -1618 +1618 @@
 void
 tr_formatter_mem_init( unsigned int kilo,
-                       const char * b, const char * kb,
-                       const char * mb, const char * gb )
+                       const char * kb, const char * mb,
+                       const char * gb, const char * tb )
 {
     tr_mem_K = kilo;
-    formatter_init( &mem_units, kilo, b, kb, mb, gb );
+    formatter_init( &mem_units, kilo, kb, mb, gb, tb );
 }
 

trunk/libtransmission/utils.h

@@ -563 +563 @@
 ***/
 
-/* example: tr_formatter_size_init( 1024, _("B"), _("KiB"), _("MiB"), _("GiB") ); */
-
-void tr_formatter_size_init( unsigned int kilo, const char * b, const char * kb,
-                                                const char * mb, const char * gb );
-
-void tr_formatter_speed_init( unsigned int kilo, const char * b, const char * kb,
-                                                 const char * mb, const char * gb );
-
-void tr_formatter_mem_init( unsigned int kilo, const char * b, const char * kb,
-                                               const char * mb, const char * gb );
+/* example: tr_formatter_size_init( 1024, _("KiB"), _("MiB"), _("GiB"), _("TiB") ); */
+
+void tr_formatter_size_init( unsigned int kilo, const char * kb, const char * mb,
+                                                const char * gb, const char * tb );
+
+void tr_formatter_speed_init( unsigned int kilo, const char * kb, const char * mb,
+                                                 const char * gb, const char * tb );
+
+void tr_formatter_mem_init( unsigned int kilo, const char * kb, const char * mb,
+                                               const char * gb, const char * tb );
 
 /* format a speed into a user-readable string. */

trunk/macosx/Controller.m

@@ -339 +339 @@
         #warning localize and make consistent
         tr_formatter_size_init(1024, "KB", "MB", "GB", "TB");
-        tr_formatter_speed_init(1024, "B/s", "KB/s", "MB/s", "GB/s", "TB/s");
+        tr_formatter_speed_init(1024, "KB/s", "MB/s", "GB/s", "TB/s");
         tr_formatter_mem_init(1024, "KB", "MB", "GB", "TB");