diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c index b128489bb..9009b5637 100644 --- a/libtransmission/makemeta.c +++ b/libtransmission/makemeta.c @@ -380,7 +380,7 @@ tr_realMakeMetaInfo ( tr_metainfo_builder * builder ) val = tr_bencDictAdd( &top, "announce" ); tr_bencInitStrDup( val, builder->announce ); - if( tr_httpParseUrl( builder->announce, -1, NULL, NULL, NULL ) ) + if( tr_httpParseURL( builder->announce, -1, NULL, NULL, NULL ) ) { builder->result = TR_MAKEMETA_URL; } diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c index ad1ccd90e..12408c834 100644 --- a/libtransmission/metainfo.c +++ b/libtransmission/metainfo.c @@ -477,7 +477,7 @@ static int getannounce( tr_info * inf, tr_benc * meta ) while( isspace( *pch ) ) ++pch; - if( tr_httpParseUrl( pch, -1, &address, &port, &announce ) ) + if( tr_httpParseURL( pch, -1, &address, &port, &announce ) ) { tr_err( _( "Invalid announce URL \"%s\"" ), val->val.s.s ); return TR_EINVALID; @@ -550,7 +550,7 @@ tr_trackerInfoInit( tr_tracker_info * info, const char * address, int address_len ) { - int ret = tr_httpParseUrl( address, address_len, + int ret = tr_httpParseURL( address, address_len, &info->address, &info->port, &info->announce ); diff --git a/libtransmission/utils.c b/libtransmission/utils.c index 616020a0d..7e6710103 100644 --- a/libtransmission/utils.c +++ b/libtransmission/utils.c @@ -981,7 +981,7 @@ tr_sha1_to_hex( char * out, const uint8_t * sha1 ) ***/ int -tr_httpParseUrl( const char * url_in, int len, +tr_httpParseURL( const char * url_in, int len, char ** setme_host, int * setme_port, char ** setme_path ) diff --git a/libtransmission/utils.h b/libtransmission/utils.h index 455a26191..9650f7e0a 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -163,7 +163,7 @@ int tr_compareUint32( uint32_t a, uint32_t b ); void tr_sha1_to_hex( char * out, const uint8_t * sha1 ); -int tr_httpParseUrl( const char * url, +int tr_httpParseURL( const char * url, int url_len, char ** setme_host, int * setme_port,