(trunk libT) semantic cleanup: int -> tr_bool
This commit is contained in:
parent
6b0d98a695
commit
f1419a95c0
|
@ -539,14 +539,14 @@ onEnabledChanged( void * vserver )
|
|||
|
||||
void
|
||||
tr_rpcSetEnabled( tr_rpc_server * server,
|
||||
int isEnabled )
|
||||
tr_bool isEnabled )
|
||||
{
|
||||
server->isEnabled = isEnabled != 0;
|
||||
server->isEnabled = isEnabled;
|
||||
|
||||
tr_runInEventThread( server->session, onEnabledChanged, server );
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_rpcIsEnabled( const tr_rpc_server * server )
|
||||
{
|
||||
return server->isEnabled;
|
||||
|
@ -599,12 +599,12 @@ tr_rpcGetWhitelist( const tr_rpc_server * server )
|
|||
|
||||
void
|
||||
tr_rpcSetWhitelistEnabled( tr_rpc_server * server,
|
||||
int isEnabled )
|
||||
tr_bool isEnabled )
|
||||
{
|
||||
server->isWhitelistEnabled = isEnabled != 0;
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_rpcGetWhitelistEnabled( const tr_rpc_server * server )
|
||||
{
|
||||
return server->isWhitelistEnabled;
|
||||
|
@ -646,13 +646,13 @@ tr_rpcGetPassword( const tr_rpc_server * server )
|
|||
|
||||
void
|
||||
tr_rpcSetPasswordEnabled( tr_rpc_server * server,
|
||||
int isEnabled )
|
||||
tr_bool isEnabled )
|
||||
{
|
||||
server->isPasswordEnabled = isEnabled != 0;
|
||||
dbgmsg( "setting 'password enabled' to %d", isEnabled );
|
||||
server->isPasswordEnabled = isEnabled;
|
||||
dbgmsg( "setting 'password enabled' to %d", (int)isEnabled );
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_rpcIsPasswordEnabled( const tr_rpc_server * server )
|
||||
{
|
||||
return server->isPasswordEnabled;
|
||||
|
@ -682,12 +682,12 @@ tr_rpcClose( tr_rpc_server ** ps )
|
|||
}
|
||||
|
||||
tr_rpc_server *
|
||||
tr_rpcInit( tr_handle * session,
|
||||
int isEnabled,
|
||||
tr_rpcInit( tr_handle * session,
|
||||
tr_bool isEnabled,
|
||||
tr_port port,
|
||||
int isWhitelistEnabled,
|
||||
tr_bool isWhitelistEnabled,
|
||||
const char * whitelist,
|
||||
int isPasswordEnabled,
|
||||
tr_bool isPasswordEnabled,
|
||||
const char * username,
|
||||
const char * password )
|
||||
{
|
||||
|
|
|
@ -20,34 +20,34 @@
|
|||
typedef struct tr_rpc_server tr_rpc_server;
|
||||
|
||||
tr_rpc_server * tr_rpcInit( struct tr_handle * session,
|
||||
int isEnabled,
|
||||
tr_bool isEnabled,
|
||||
tr_port port,
|
||||
int isWhitelistEnabled,
|
||||
const char * whitelist,
|
||||
int isPasswordEnabled,
|
||||
const char * username,
|
||||
const char * password );
|
||||
tr_bool isWhitelistEnabled,
|
||||
const char * whitelist,
|
||||
tr_bool isPasswordEnabled,
|
||||
const char * username,
|
||||
const char * password );
|
||||
|
||||
void tr_rpcClose( tr_rpc_server ** freeme );
|
||||
|
||||
void tr_rpcSetEnabled( tr_rpc_server * server,
|
||||
int isEnabled );
|
||||
tr_bool isEnabled );
|
||||
|
||||
int tr_rpcIsEnabled( const tr_rpc_server * server );
|
||||
tr_bool tr_rpcIsEnabled( const tr_rpc_server * server );
|
||||
|
||||
void tr_rpcSetPort( tr_rpc_server * server,
|
||||
tr_port port );
|
||||
|
||||
tr_port tr_rpcGetPort( const tr_rpc_server * server );
|
||||
|
||||
int tr_rpcSetTest( const tr_rpc_server * server,
|
||||
const char * whitelist,
|
||||
char ** allocme_errmsg );
|
||||
int tr_rpcSetTest( const tr_rpc_server * server,
|
||||
const char * whitelist,
|
||||
char ** allocme_errmsg );
|
||||
|
||||
void tr_rpcSetWhitelistEnabled( tr_rpc_server * server,
|
||||
int isEnabled );
|
||||
tr_bool isEnabled );
|
||||
|
||||
int tr_rpcGetWhitelistEnabled( const tr_rpc_server * server );
|
||||
tr_bool tr_rpcGetWhitelistEnabled( const tr_rpc_server * server );
|
||||
|
||||
void tr_rpcSetWhitelist( tr_rpc_server * server,
|
||||
const char * whitelist );
|
||||
|
@ -65,9 +65,9 @@ void tr_rpcSetUsername( tr_rpc_server * server,
|
|||
char* tr_rpcGetUsername( const tr_rpc_server * server );
|
||||
|
||||
void tr_rpcSetPasswordEnabled( tr_rpc_server * server,
|
||||
int isEnabled );
|
||||
tr_bool isEnabled );
|
||||
|
||||
int tr_rpcIsPasswordEnabled( const tr_rpc_server * session );
|
||||
tr_bool tr_rpcIsPasswordEnabled( const tr_rpc_server * session );
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1187,12 +1187,12 @@ tr_torrentNext( tr_handle * session,
|
|||
|
||||
void
|
||||
tr_sessionSetRPCEnabled( tr_session * session,
|
||||
int isEnabled )
|
||||
tr_bool isEnabled )
|
||||
{
|
||||
tr_rpcSetEnabled( session->rpcServer, isEnabled );
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_sessionIsRPCEnabled( const tr_session * session )
|
||||
{
|
||||
return tr_rpcIsEnabled( session->rpcServer );
|
||||
|
@ -1235,7 +1235,7 @@ tr_sessionGetRPCWhitelist( const tr_session * session )
|
|||
|
||||
void
|
||||
tr_sessionSetRPCWhitelistEnabled( tr_session * session,
|
||||
int isEnabled )
|
||||
tr_bool isEnabled )
|
||||
{
|
||||
tr_rpcSetWhitelistEnabled( session->rpcServer, isEnabled );
|
||||
}
|
||||
|
@ -1275,7 +1275,7 @@ tr_sessionGetRPCUsername( const tr_session * session )
|
|||
|
||||
void
|
||||
tr_sessionSetRPCPasswordEnabled( tr_session * session,
|
||||
int isEnabled )
|
||||
tr_bool isEnabled )
|
||||
{
|
||||
tr_rpcSetPasswordEnabled( session->rpcServer, isEnabled );
|
||||
}
|
||||
|
|
|
@ -85,7 +85,7 @@ tr_torrentFindFromHashString( tr_handle * handle,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentExists( const tr_handle * handle,
|
||||
const uint8_t * torrentHash )
|
||||
{
|
||||
|
@ -181,11 +181,11 @@ tr_torrentGetSpeedLimit( const tr_torrent * tor,
|
|||
return tr_bandwidthGetDesiredSpeed( tor->bandwidth, dir );
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentIsPieceTransferAllowed( const tr_torrent * tor,
|
||||
tr_direction direction )
|
||||
{
|
||||
int isEnabled = FALSE;
|
||||
tr_bool isEnabled = FALSE;
|
||||
|
||||
switch( tr_torrentGetSpeedMode( tor, direction ) )
|
||||
{
|
||||
|
@ -685,19 +685,19 @@ tr_torrentChangeMyPort( tr_torrent * tor )
|
|||
tr_trackerChangeMyPort( tor->tracker );
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentIsPrivate( const tr_torrent * tor )
|
||||
{
|
||||
return tor
|
||||
&& tor->info.isPrivate;
|
||||
&& tor->info.isPrivate;
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentAllowsPex( const tr_torrent * tor )
|
||||
{
|
||||
return tor
|
||||
&& tor->session->isPexEnabled
|
||||
&& !tr_torrentIsPrivate( tor );
|
||||
&& tor->session->isPexEnabled
|
||||
&& !tr_torrentIsPrivate( tor );
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1025,7 +1025,7 @@ tr_torrentResetTransferStats( tr_torrent * tor )
|
|||
void
|
||||
tr_torrentSetHasPiece( tr_torrent * tor,
|
||||
tr_piece_index_t pieceIndex,
|
||||
int has )
|
||||
tr_bool has )
|
||||
{
|
||||
tr_torrentLock( tor );
|
||||
|
||||
|
@ -1355,7 +1355,7 @@ tr_torrentRecheckCompleteness( tr_torrent * tor )
|
|||
tr_torrentUnlock( tor );
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentIsSeed( const tr_torrent * tor )
|
||||
{
|
||||
return tor->completeness != TR_LEECH;
|
||||
|
@ -1511,7 +1511,7 @@ void
|
|||
tr_torrentInitFileDLs( tr_torrent * tor,
|
||||
tr_file_index_t * files,
|
||||
tr_file_index_t fileCount,
|
||||
int doDownload )
|
||||
tr_bool doDownload )
|
||||
{
|
||||
tr_file_index_t i;
|
||||
|
||||
|
@ -1528,7 +1528,7 @@ void
|
|||
tr_torrentSetFileDLs( tr_torrent * tor,
|
||||
tr_file_index_t * files,
|
||||
tr_file_index_t fileCount,
|
||||
int doDownload )
|
||||
tr_bool doDownload )
|
||||
{
|
||||
tr_torrentLock( tor );
|
||||
tr_torrentInitFileDLs( tor, files, fileCount, doDownload );
|
||||
|
@ -1571,7 +1571,7 @@ _tr_block( const tr_torrent * tor,
|
|||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentReqIsValid( const tr_torrent * tor,
|
||||
tr_piece_index_t index,
|
||||
uint32_t offset,
|
||||
|
@ -1617,7 +1617,7 @@ tr_pieceOffset( const tr_torrent * tor,
|
|||
****
|
||||
***/
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentIsPieceChecked( const tr_torrent * tor,
|
||||
tr_piece_index_t piece )
|
||||
{
|
||||
|
@ -1625,9 +1625,9 @@ tr_torrentIsPieceChecked( const tr_torrent * tor,
|
|||
}
|
||||
|
||||
void
|
||||
tr_torrentSetPieceChecked( tr_torrent * tor,
|
||||
tr_piece_index_t piece,
|
||||
int isChecked )
|
||||
tr_torrentSetPieceChecked( tr_torrent * tor,
|
||||
tr_piece_index_t piece,
|
||||
tr_bool isChecked )
|
||||
{
|
||||
if( isChecked )
|
||||
tr_bitfieldAdd( tor->checkedPieces, piece );
|
||||
|
@ -1638,7 +1638,7 @@ tr_torrentSetPieceChecked( tr_torrent * tor,
|
|||
void
|
||||
tr_torrentSetFileChecked( tr_torrent * tor,
|
||||
tr_file_index_t fileIndex,
|
||||
int isChecked )
|
||||
tr_bool isChecked )
|
||||
{
|
||||
const tr_file * file = &tor->info.files[fileIndex];
|
||||
const tr_piece_index_t begin = file->firstPiece;
|
||||
|
@ -1650,7 +1650,7 @@ tr_torrentSetFileChecked( tr_torrent * tor,
|
|||
tr_bitfieldRemRange ( tor->checkedPieces, begin, end );
|
||||
}
|
||||
|
||||
int
|
||||
tr_bool
|
||||
tr_torrentIsFileChecked( const tr_torrent * tor,
|
||||
tr_file_index_t fileIndex )
|
||||
{
|
||||
|
@ -1658,7 +1658,7 @@ tr_torrentIsFileChecked( const tr_torrent * tor,
|
|||
const tr_piece_index_t begin = file->firstPiece;
|
||||
const tr_piece_index_t end = file->lastPiece + 1;
|
||||
tr_piece_index_t i;
|
||||
int isChecked = TRUE;
|
||||
tr_bool isChecked = TRUE;
|
||||
|
||||
for( i = begin; isChecked && i < end; ++i )
|
||||
if( !tr_torrentIsPieceChecked( tor, i ) )
|
||||
|
|
|
@ -49,9 +49,9 @@ int tr_ctorGetSave( const tr_ctor * ctor );
|
|||
void tr_torrentInitFileDLs( tr_torrent * tor,
|
||||
tr_file_index_t * files,
|
||||
tr_file_index_t fileCount,
|
||||
int do_download );
|
||||
tr_bool do_download );
|
||||
|
||||
int tr_torrentIsPrivate( const tr_torrent * );
|
||||
tr_bool tr_torrentIsPrivate( const tr_torrent * );
|
||||
|
||||
void tr_torrentRecheckCompleteness( tr_torrent * );
|
||||
|
||||
|
@ -59,17 +59,17 @@ void tr_torrentResetTransferStats( tr_torrent * );
|
|||
|
||||
void tr_torrentSetHasPiece( tr_torrent * tor,
|
||||
tr_piece_index_t pieceIndex,
|
||||
int has );
|
||||
tr_bool has );
|
||||
|
||||
void tr_torrentLock( const tr_torrent * session );
|
||||
|
||||
void tr_torrentUnlock( const tr_torrent * session );
|
||||
|
||||
int tr_torrentIsSeed( const tr_torrent * session );
|
||||
tr_bool tr_torrentIsSeed( const tr_torrent * session );
|
||||
|
||||
void tr_torrentChangeMyPort( tr_torrent * session );
|
||||
|
||||
int tr_torrentExists( const tr_session * session,
|
||||
tr_bool tr_torrentExists( const tr_session * session,
|
||||
const uint8_t * hash );
|
||||
|
||||
tr_torrent* tr_torrentFindFromId( tr_session * session,
|
||||
|
@ -84,9 +84,9 @@ tr_torrent* tr_torrentFindFromHashString( tr_session * session,
|
|||
tr_torrent* tr_torrentFindFromObfuscatedHash( tr_session * session,
|
||||
const uint8_t * hash );
|
||||
|
||||
int tr_torrentAllowsPex( const tr_torrent * );
|
||||
tr_bool tr_torrentAllowsPex( const tr_torrent * );
|
||||
|
||||
int tr_torrentIsPieceTransferAllowed( const tr_torrent * torrent,
|
||||
tr_bool tr_torrentIsPieceTransferAllowed( const tr_torrent * torrent,
|
||||
tr_direction direction );
|
||||
|
||||
/* get the index of this piece's first block */
|
||||
|
@ -120,7 +120,7 @@ tr_block_index_t _tr_block( const tr_torrent * tor,
|
|||
tr_piece_index_t index,
|
||||
uint32_t offset );
|
||||
|
||||
int tr_torrentReqIsValid( const tr_torrent * tor,
|
||||
tr_bool tr_torrentReqIsValid( const tr_torrent * tor,
|
||||
tr_piece_index_t index,
|
||||
uint32_t offset,
|
||||
uint32_t length );
|
||||
|
@ -137,19 +137,19 @@ void tr_torrentInitFilePriority( tr_torrent * tor,
|
|||
|
||||
int tr_torrentCountUncheckedPieces( const tr_torrent * );
|
||||
|
||||
int tr_torrentIsPieceChecked( const tr_torrent * tor,
|
||||
tr_bool tr_torrentIsPieceChecked( const tr_torrent * tor,
|
||||
tr_piece_index_t piece );
|
||||
|
||||
int tr_torrentIsFileChecked( const tr_torrent * tor,
|
||||
tr_bool tr_torrentIsFileChecked( const tr_torrent * tor,
|
||||
tr_file_index_t file );
|
||||
|
||||
void tr_torrentSetPieceChecked( tr_torrent * tor,
|
||||
tr_piece_index_t piece,
|
||||
int isChecked );
|
||||
tr_bool isChecked );
|
||||
|
||||
void tr_torrentSetFileChecked( tr_torrent * tor,
|
||||
tr_file_index_t file,
|
||||
int isChecked );
|
||||
tr_bool isChecked );
|
||||
|
||||
void tr_torrentUncheck( tr_torrent * tor );
|
||||
|
||||
|
|
|
@ -289,12 +289,12 @@ const char * tr_sessionGetDownloadDir( const tr_session * session );
|
|||
* queried by tr_sessionIsRPCEnabled().
|
||||
*/
|
||||
void tr_sessionSetRPCEnabled( tr_session * session,
|
||||
int isEnabled );
|
||||
tr_bool isEnabled );
|
||||
|
||||
/** @brief Get whether or not RPC calls are allowed in this session.
|
||||
@see tr_sessionInit()
|
||||
@see tr_sessionSetRPCEnabled() */
|
||||
int tr_sessionIsRPCEnabled( const tr_session * session );
|
||||
tr_bool tr_sessionIsRPCEnabled( const tr_session * session );
|
||||
|
||||
/** @brief Specify which port to listen for RPC requests on.
|
||||
@see tr_sessionInit()
|
||||
|
@ -325,7 +325,7 @@ void tr_sessionSetRPCWhitelist( tr_session * session,
|
|||
char* tr_sessionGetRPCWhitelist( const tr_session * );
|
||||
|
||||
void tr_sessionSetRPCWhitelistEnabled( tr_session * session,
|
||||
int isEnabled );
|
||||
tr_bool isEnabled );
|
||||
|
||||
tr_bool tr_sessionGetRPCWhitelistEnabled( const tr_session * session );
|
||||
|
||||
|
@ -344,7 +344,7 @@ char* tr_sessionGetRPCPassword( const tr_session * session );
|
|||
char* tr_sessionGetRPCUsername( const tr_session * session );
|
||||
|
||||
void tr_sessionSetRPCPasswordEnabled( tr_session * session,
|
||||
int isEnabled );
|
||||
tr_bool isEnabled );
|
||||
|
||||
tr_bool tr_sessionIsRPCPasswordEnabled( const tr_session * session );
|
||||
|
||||
|
@ -900,7 +900,7 @@ int tr_torrentGetFileDL( const tr_torrent * torrent,
|
|||
void tr_torrentSetFileDLs( tr_torrent * torrent,
|
||||
tr_file_index_t * files,
|
||||
tr_file_index_t fileCount,
|
||||
int do_download );
|
||||
tr_bool do_download );
|
||||
|
||||
|
||||
const tr_info * tr_torrentInfo( const tr_torrent * torrent );
|
||||
|
|
Loading…
Reference in New Issue