(trunk) #3045 fix oops from last commit

This commit is contained in:
Charles Kerr
2010-07-06 20:52:54 +00:00
parent 610061f79a
commit 88c61f8cc2
3 changed files with 17 additions and 17 deletions

View File

@@ -1579,10 +1579,10 @@ static struct formatter_units size_units;
void
tr_formatter_size_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 )
{
formatter_init( &size_units, kilo, b, kb, mb, gb );
formatter_init( &size_units, kilo, kb, mb, gb, tb );
}
char*
@@ -1597,11 +1597,11 @@ unsigned int tr_speed_K = 0u;
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 );
}
char*
@@ -1617,11 +1617,11 @@ unsigned int tr_mem_K = 0u;
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 );
}
char*

View File

@@ -562,16 +562,16 @@ char* tr_realpath( const char *path, char * resolved_path );
****
***/
/* example: tr_formatter_size_init( 1024, _("B"), _("KiB"), _("MiB"), _("GiB") ); */
/* example: tr_formatter_size_init( 1024, _("KiB"), _("MiB"), _("GiB"), _("TiB") ); */
void tr_formatter_size_init( unsigned int kilo, const char * b, const char * kb,
const char * mb, const char * gb );
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 * b, const char * kb,
const char * mb, const char * gb );
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 * b, const char * kb,
const char * mb, const char * gb );
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. */
extern unsigned int tr_speed_K;

View File

@@ -338,7 +338,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
#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");
[NSApp setDelegate: self];