(trunk) #4138 "use stdbool.h instead of tr_bool" -- done.

This commit is contained in:
Jordan Lee
2011-03-22 15:19:54 +00:00
parent e04a64ca02
commit b4d36aeb54
100 changed files with 1420 additions and 1442 deletions

View File

@@ -66,14 +66,14 @@
time_t __tr_current_time = 0;
tr_msg_level __tr_message_level = TR_MSG_ERR;
static tr_bool messageQueuing = FALSE;
static bool messageQueuing = false;
static tr_msg_list * messageQueue = NULL;
static tr_msg_list ** messageQueueTail = &messageQueue;
static int messageQueueCount = 0;
#ifndef WIN32
/* make null versions of these win32 functions */
static inline int IsDebuggerPresent( void ) { return FALSE; }
static inline int IsDebuggerPresent( void ) { return false; }
static inline void OutputDebugString( const void * unused UNUSED ) { }
#endif
@@ -95,7 +95,7 @@ getMessageLock( void )
void*
tr_getLog( void )
{
static tr_bool initialized = FALSE;
static bool initialized = false;
static FILE * file = NULL;
if( !initialized )
@@ -115,7 +115,7 @@ tr_getLog( void )
default:
file = NULL; break;
}
initialized = TRUE;
initialized = true;
}
return file;
@@ -128,12 +128,12 @@ tr_setMessageLevel( tr_msg_level level )
}
void
tr_setMessageQueuing( tr_bool enabled )
tr_setMessageQueuing( bool enabled )
{
messageQueuing = enabled;
}
tr_bool
bool
tr_getMessageQueuing( void )
{
return messageQueuing != 0;
@@ -207,7 +207,7 @@ tr_getLogTimeStr( char * buf, int buflen )
return buf;
}
tr_bool
bool
tr_deepLoggingIsActive( void )
{
static int8_t deepLoggingIsActive = -1;
@@ -838,21 +838,21 @@ tr_strstrip( char * str )
return str;
}
tr_bool
bool
tr_str_has_suffix( const char *str, const char *suffix )
{
size_t str_len;
size_t suffix_len;
if( !str )
return FALSE;
return false;
if( !suffix )
return TRUE;
return true;
str_len = strlen( str );
suffix_len = strlen( suffix );
if( str_len < suffix_len )
return FALSE;
return false;
return !evutil_ascii_strncasecmp( str + str_len - suffix_len, suffix, suffix_len );
}
@@ -993,7 +993,7 @@ tr_hex_to_sha1( uint8_t * out, const char * in )
****
***/
static tr_bool
static bool
isValidURLChars( const char * url, int url_len )
{
const char * c;
@@ -1008,20 +1008,20 @@ isValidURLChars( const char * url, int url_len )
"{}|\\^[]`"; /* unwise */
if( url == NULL )
return FALSE;
return false;
for( c=url, end=c+url_len; c && *c && c!=end; ++c )
if( !strchr( rfc2396_valid_chars, *c ) )
return FALSE;
return false;
return TRUE;
return true;
}
/** @brief return TRUE if the URL is a http or https or UDP one that Transmission understands */
tr_bool
/** @brief return true if the URL is a http or https or UDP one that Transmission understands */
bool
tr_urlIsValidTracker( const char * url )
{
tr_bool valid;
bool valid;
char * scheme = NULL;
const int len = url ? strlen(url) : 0;
@@ -1034,11 +1034,11 @@ tr_urlIsValidTracker( const char * url )
return valid;
}
/** @brief return TRUE if the URL is a http or https or ftp or sftp one that Transmission understands */
tr_bool
/** @brief return true if the URL is a http or https or ftp or sftp one that Transmission understands */
bool
tr_urlIsValid( const char * url, int url_len )
{
tr_bool valid;
bool valid;
char * scheme = NULL;
if( ( url_len < 0 ) && ( url != NULL ) )
url_len = strlen( url );
@@ -1052,7 +1052,7 @@ tr_urlIsValid( const char * url, int url_len )
return valid;
}
tr_bool
bool
tr_addressIsIP( const char * address )
{
tr_address tempAddr;
@@ -1228,11 +1228,11 @@ tr_lowerBound( const void * key,
size_t nmemb,
size_t size,
int (* compar)(const void* key, const void* arrayMember),
tr_bool * exact_match )
bool * exact_match )
{
size_t first = 0;
const char * cbase = base;
tr_bool exact = FALSE;
bool exact = false;
while( nmemb != 0 )
{
@@ -1242,7 +1242,7 @@ tr_lowerBound( const void * key,
if( c <= 0 ) {
if( c == 0 )
exact = TRUE;
exact = true;
nmemb = half;
} else {
first = middle + 1;
@@ -1348,11 +1348,11 @@ struct number_range
* This should be a single number (ex. "6") or a range (ex. "6-9").
* Anything else is an error and will return failure.
*/
static tr_bool
static bool
parseNumberSection( const char * str, int len, struct number_range * setme )
{
long a, b;
tr_bool success;
bool success;
char * end;
const int error = errno;
char * tmp = tr_strndup( str, len );
@@ -1360,18 +1360,18 @@ parseNumberSection( const char * str, int len, struct number_range * setme )
errno = 0;
a = b = strtol( tmp, &end, 10 );
if( errno || ( end == tmp ) ) {
success = FALSE;
success = false;
} else if( *end != '-' ) {
success = TRUE;
success = true;
} else {
const char * pch = end + 1;
b = strtol( pch, &end, 10 );
if( errno || ( pch == end ) )
success = FALSE;
success = false;
else if( *end ) /* trailing data */
success = FALSE;
success = false;
else
success = TRUE;
success = true;
}
tr_free( tmp );
@@ -1405,7 +1405,7 @@ tr_parseNumberRange( const char * str_in, int len, int * setmeCount )
char * str = tr_strndup( str_in, len );
const char * walk;
tr_list * ranges = NULL;
tr_bool success = TRUE;
bool success = true;
walk = str;
while( walk && *walk && success ) {
@@ -1520,7 +1520,7 @@ tr_strratio( char * buf, size_t buflen, double ratio, const char * infinity )
***/
int
tr_moveFile( const char * oldpath, const char * newpath, tr_bool * renamed )
tr_moveFile( const char * oldpath, const char * newpath, bool * renamed )
{
int in;
int out;
@@ -1587,7 +1587,7 @@ tr_moveFile( const char * oldpath, const char * newpath, tr_bool * renamed )
return 0;
}
tr_bool
bool
tr_is_same_file( const char * filename1, const char * filename2 )
{
struct stat sb1, sb2;