Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 09:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

(trunk libT) fix minor compiler warning when compiling with assertions disabled

Browse Source
This commit is contained in:
Jordan Lee
2011-07-17 14:32:51 +00:00
parent efc306a8d3
commit b4960a3f29
1 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libtransmission/rpc-server.c
+49 -32
View File
@@ -924,55 +924,72 @@ tr_rpc_server *
tr_rpcInit( tr_session * session, tr_benc * settings ) tr_rpcInit( tr_session * session, tr_benc * settings )
{ {
tr_rpc_server * s; tr_rpc_server * s;
bool found;
bool boolVal; bool boolVal;
int64_t i; int64_t i;
const char *str; const char * str;
const char * key;
tr_address address; tr_address address;
s = tr_new0( tr_rpc_server, 1 ); s = tr_new0( tr_rpc_server, 1 );
s->session = session; s->session = session;
found = tr_bencDictFindBool( settings, TR_PREFS_KEY_RPC_ENABLED, &boolVal ); key = TR_PREFS_KEY_RPC_ENABLED;
assert( found ); if( !tr_bencDictFindBool( settings, key, &boolVal ) )
s->isEnabled = boolVal; tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
s->isEnabled = boolVal;
found = tr_bencDictFindInt( settings, TR_PREFS_KEY_RPC_PORT, &i ); key = TR_PREFS_KEY_RPC_PORT;
assert( found ); if( !tr_bencDictFindInt( settings, key, &i ) )
s->port = i; tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
s->port = i;
found = tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_URL, &str ); key = TR_PREFS_KEY_RPC_URL;
assert( found ); if( !tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_URL, &str ) )
s->url = tr_strdup( str ); tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
s->url = tr_strdup( str );
found = tr_bencDictFindBool( settings, TR_PREFS_KEY_RPC_WHITELIST_ENABLED, &boolVal ); key = TR_PREFS_KEY_RPC_WHITELIST_ENABLED;
assert( found ); if( !tr_bencDictFindBool( settings, key, &boolVal ) )
tr_rpcSetWhitelistEnabled( s, boolVal ); tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
tr_rpcSetWhitelistEnabled( s, boolVal );
found = tr_bencDictFindBool( settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, &boolVal ); key = TR_PREFS_KEY_RPC_AUTH_REQUIRED;
assert( found ); if( !tr_bencDictFindBool( settings, key, &boolVal ) )
tr_rpcSetPasswordEnabled( s, boolVal ); tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
tr_rpcSetPasswordEnabled( s, boolVal );
found = tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_WHITELIST, &str ); key = TR_PREFS_KEY_RPC_WHITELIST;
assert( found ); if( !tr_bencDictFindStr( settings, key, &str ) && str )
tr_rpcSetWhitelist( s, str ? str : "127.0.0.1" ); tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
tr_rpcSetWhitelist( s, str );
found = tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_USERNAME, &str ); key = TR_PREFS_KEY_RPC_USERNAME;
assert( found ); if( !tr_bencDictFindStr( settings, key, &str ) )
tr_rpcSetUsername( s, str ); tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
tr_rpcSetUsername( s, str );
found = tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_PASSWORD, &str ); key = TR_PREFS_KEY_RPC_PASSWORD;
assert( found ); if( !tr_bencDictFindStr( settings, key, &str ) )
tr_rpcSetPassword( s, str ); tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
else
tr_rpcSetPassword( s, str );
found = tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_BIND_ADDRESS, &str ); key = TR_PREFS_KEY_RPC_BIND_ADDRESS;
assert( found ); if( !tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_BIND_ADDRESS, &str ) ) {
if( !tr_address_from_string( &address, str ) ) { tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
tr_err( _( "%s is not a valid address" ), str ); address = tr_inaddr_any;
} else if( !tr_address_from_string( &address, str ) ) {
tr_nerr( MY_NAME, _( "%s is not a valid address" ), str );
address = tr_inaddr_any; address = tr_inaddr_any;
} else if( address.type != TR_AF_INET ) { } else if( address.type != TR_AF_INET ) {
tr_err( _( "%s is not an IPv4 address. RPC listeners must be IPv4" ), tr_nerr( MY_NAME, _( "%s is not an IPv4 address. RPC listeners must be IPv4" ), str );
str );
address = tr_inaddr_any; address = tr_inaddr_any;
} }
s->bindAddress = address.addr.addr4; s->bindAddress = address.addr.addr4;