mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk daemon) #1881: Displayed ratio should be truncated, not rounded

This commit is contained in:
Charles Kerr 2009-03-04 16:02:50 +00:00
parent c2fc713111
commit c30983ff96
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon/remote.c
View File

@ -658,6 +658,20 @@ etaToString( char * buf,
#define MEGABYTE_FACTOR ( 1024.0 * 1024.0 ) #define MEGABYTE_FACTOR ( 1024.0 * 1024.0 )
#define GIGABYTE_FACTOR ( 1024.0 * 1024.0 * 1024.0 ) #define GIGABYTE_FACTOR ( 1024.0 * 1024.0 * 1024.0 )
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 = strchr( tmp, '.' );
pch += places + 1;
len = MIN( buflen - 1, pch - tmp );
memcpy( buf, tmp, len );
buf[len] = '\0';
}
static char* static char*
strlratio2( char * buf, double ratio, size_t buflen ) strlratio2( char * buf, double ratio, size_t buflen )
{ {
@ -666,9 +680,9 @@ strlratio2( char * buf, double ratio, size_t buflen )
else if( (int)ratio == TR_RATIO_INF ) else if( (int)ratio == TR_RATIO_INF )
tr_strlcpy( buf, "Inf", buflen ); tr_strlcpy( buf, "Inf", buflen );
else if( ratio < 10.0 ) else if( ratio < 10.0 )
tr_snprintf( buf, buflen, "%'.2f", ratio ); printf_double_without_rounding( buf, buflen, ratio, 2 );
else if( ratio < 100.0 ) else if( ratio < 100.0 )
tr_snprintf( buf, buflen, "%'.1f", ratio ); printf_double_without_rounding( buf, buflen, ratio, 1 );
else else
tr_snprintf( buf, buflen, "%'.0f", ratio ); tr_snprintf( buf, buflen, "%'.0f", ratio );
return buf; return buf;