github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Code cleanup

pull/2/head
Tatsuhiro Tsujikawa 2011-11-03 18:59:56 +09:00
parent 84bc2c7ae8
commit 0e55fdf594
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/uri.cc
View File

@ -125,11 +125,11 @@ bool parse(UriStruct& result, const std::string& uri)
for(; queryFirst != fragmentFirst; ++queryFirst) { for(; queryFirst != fragmentFirst; ++queryFirst) {
if(*queryFirst == '?') break; if(*queryFirst == '?') break;
} }
result.query = std::string(queryFirst, fragmentFirst); result.query.assign(queryFirst, fragmentFirst);
// find protocol // find protocol
std::string::size_type protocolOffset = uri.find("://"); std::string::size_type protocolOffset = uri.find("://");
if(protocolOffset == std::string::npos) return false; if(protocolOffset == std::string::npos) return false;
result.protocol = std::string(uri.begin(), uri.begin()+protocolOffset); result.protocol.assign(uri.begin(), uri.begin()+protocolOffset);
uint16_t defPort; uint16_t defPort;
if((defPort = FeatureConfig::getInstance()-> if((defPort = FeatureConfig::getInstance()->
getDefaultPort(result.protocol)) == 0) { getDefaultPort(result.protocol)) == 0) {
@ -221,9 +221,9 @@ bool parse(UriStruct& result, const std::string& uri)
} }
} }
if(result.ipv6LiteralAddress) { if(result.ipv6LiteralAddress) {
result.host = std::string(hostPortFirst+1, hostLast-1); result.host.assign(hostPortFirst+1, hostLast-1);
} else { } else {
result.host = std::string(hostPortFirst, hostLast); result.host.assign(hostPortFirst, hostLast);
} }
// find directory and file part // find directory and file part
std::string::const_iterator dirLast = authorityLast; std::string::const_iterator dirLast = authorityLast;
@ -236,7 +236,7 @@ bool parse(UriStruct& result, const std::string& uri)
if(dirLast == queryFirst) { if(dirLast == queryFirst) {
result.file = A2STR::NIL; result.file = A2STR::NIL;
} else { } else {
result.file = std::string(dirLast+1, queryFirst); result.file.assign(dirLast+1, queryFirst);
} }
// Erase duplicated slashes. // Erase duplicated slashes.
std::string::const_iterator dirFirst = authorityLast; std::string::const_iterator dirFirst = authorityLast;
@ -255,7 +255,7 @@ bool parse(UriStruct& result, const std::string& uri)
if(dirFirst == dirLast) { if(dirFirst == dirLast) {
result.dir = A2STR::SLASH_C; result.dir = A2STR::SLASH_C;
} else { } else {
result.dir = std::string(dirFirst, dirLast); result.dir.assign(dirFirst, dirLast);
} }
return true; return true;
} }