From 77a2cf02f1c290c524f6e4d44d62998e7d7473bf Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 30 Jun 2010 15:05:43 +0000 Subject: [PATCH] (trunk libT) fix a couple of minor warnings found by -Wfloat-equal --- libtransmission/completion.h | 3 ++- libtransmission/utils.c | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libtransmission/completion.h b/libtransmission/completion.h index bdfec49e3..265798abe 100644 --- a/libtransmission/completion.h +++ b/libtransmission/completion.h @@ -106,7 +106,8 @@ static inline float tr_cpPercentComplete( const tr_completion * cp ) static inline float tr_cpPercentDone( const tr_completion * cp ) { const double ratio = tr_getRatio( cp->sizeNow, tr_cpSizeWhenDone( cp ) ); - return (ratio == TR_RATIO_NA || ratio == TR_RATIO_INF) ? 0.0f : ratio; + const int iratio = (int)ratio; + return ((iratio == TR_RATIO_NA) || (iratio == TR_RATIO_INF)) ? 0.0f : ratio; } /** diff --git a/libtransmission/utils.c b/libtransmission/utils.c index bdaa4b783..792c65b1a 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -21,27 +21,27 @@ #endif #include -#include /* isalpha, tolower */ +#include /* isalpha(), tolower() */ #include -#include /* pow */ +#include /* pow(), fabs() */ #include #include #include -#include /* strerror, memset, memmem */ +#include /* strerror(), memset(), memmem() */ -#include /* basename */ +#include /* basename() */ #include #include #include -#include /* usleep, stat, getcwd, getpagesize */ +#include /* usleep(), stat(), getcwd(), getpagesize() */ #include "event.h" #ifdef WIN32 #include - #define WINVER WindowsXP /* freeaddrinfo(),getaddrinfo(),getnameinfo() */ - #include /* _getcwd */ - #include /* Sleep */ + #define WINVER WindowsXP /* freeaddrinfo(), getaddrinfo(), getnameinfo() */ + #include /* _getcwd() */ + #include /* Sleep() */ #endif #include "transmission.h" @@ -861,14 +861,13 @@ tr_strlcpy( char * dst, ***/ double -tr_getRatio( double numerator, - double denominator ) +tr_getRatio( double numerator, double denominator ) { double ratio; - if( denominator ) + if( fabs(denominator) > 0.01 ) ratio = numerator / denominator; - else if( numerator ) + else if( fabs(numerator) > 0.01 ) ratio = TR_RATIO_INF; else ratio = TR_RATIO_NA; -- 2.40.0