summaryrefslogtreecommitdiff
path: root/src/uri.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-11-03 18:59:56 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2011-11-03 18:59:56 +0900
commit0e55fdf594c21db7759eaa3ac2fddbd6d80422b4 (patch)
treebc94d6f0f681ab35adf2656a3c5a897da0ef4f7a /src/uri.cc
parent84bc2c7ae8f14e909df0ce73463e8e24e1b0e464 (diff)
Code cleanup
Diffstat (limited to 'src/uri.cc')
-rw-r--r--src/uri.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/uri.cc b/src/uri.cc
index 4b6ec80e..b1df0e52 100644
--- a/src/uri.cc
+++ b/src/uri.cc
@@ -125,11 +125,11 @@ bool parse(UriStruct& result, const std::string& uri)
for(; queryFirst != fragmentFirst; ++queryFirst) {
if(*queryFirst == '?') break;
}
- result.query = std::string(queryFirst, fragmentFirst);
+ result.query.assign(queryFirst, fragmentFirst);
// find protocol
std::string::size_type protocolOffset = uri.find("://");
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;
if((defPort = FeatureConfig::getInstance()->
getDefaultPort(result.protocol)) == 0) {
@@ -221,9 +221,9 @@ bool parse(UriStruct& result, const std::string& uri)
}
}
if(result.ipv6LiteralAddress) {
- result.host = std::string(hostPortFirst+1, hostLast-1);
+ result.host.assign(hostPortFirst+1, hostLast-1);
} else {
- result.host = std::string(hostPortFirst, hostLast);
+ result.host.assign(hostPortFirst, hostLast);
}
// find directory and file part
std::string::const_iterator dirLast = authorityLast;
@@ -236,7 +236,7 @@ bool parse(UriStruct& result, const std::string& uri)
if(dirLast == queryFirst) {
result.file = A2STR::NIL;
} else {
- result.file = std::string(dirLast+1, queryFirst);
+ result.file.assign(dirLast+1, queryFirst);
}
// Erase duplicated slashes.
std::string::const_iterator dirFirst = authorityLast;
@@ -255,7 +255,7 @@ bool parse(UriStruct& result, const std::string& uri)
if(dirFirst == dirLast) {
result.dir = A2STR::SLASH_C;
} else {
- result.dir = std::string(dirFirst, dirLast);
+ result.dir.assign(dirFirst, dirLast);
}
return true;
}