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

Avoid temporary string

pull/2/head
Tatsuhiro Tsujikawa 2011-11-08 23:53:12 +09:00
parent 7f8724c501
commit bdaa87c73b
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cookie_helper.cc
View File

@ -243,12 +243,16 @@ bool parse
if(nvEnd != end) { if(nvEnd != end) {
++nvEnd; ++nvEnd;
} }
static const char A2_EXPIRES[] = "expires";
static const char A2_MAX_AGE[] = "max-age";
static const char A2_DOMAIN[] = "domain";
static const char A2_PATH[] = "path";
static const char A2_SECURE[] = "secure";
static const char A2_HTTPONLY[] = "httponly";
for(std::string::const_iterator i = nvEnd; i != end;) { for(std::string::const_iterator i = nvEnd; i != end;) {
std::string::const_iterator j = std::find(i, end, ';'); std::string::const_iterator j = std::find(i, end, ';');
std::string::const_iterator eq = std::find(i, j, '='); std::string::const_iterator eq = std::find(i, j, '=');
p = util::stripIter(i, eq); p = util::stripIter(i, eq);
std::string attrName(p.first, p.second);
util::lowercase(attrName);
std::pair<std::string::const_iterator, std::pair<std::string::const_iterator,
std::string::const_iterator> attrp; std::string::const_iterator> attrp;
if(eq == j) { if(eq == j) {
@ -260,13 +264,13 @@ bool parse
if(j != end) { if(j != end) {
++i; ++i;
} }
if(attrName == "expires") { if(util::strieq(p.first, p.second, A2_EXPIRES, vend(A2_EXPIRES)-1)) {
if(parseDate(expiryTime, attrp.first, attrp.second)) { if(parseDate(expiryTime, attrp.first, attrp.second)) {
foundExpires = true; foundExpires = true;
} else { } else {
return false; return false;
} }
} else if(attrName == "max-age") { } else if(util::strieq(p.first, p.second, A2_MAX_AGE, vend(A2_MAX_AGE)-1)) {
if(attrp.first == attrp.second || if(attrp.first == attrp.second ||
(!in(static_cast<unsigned char>(*attrp.first), 0x30u, 0x39u) && (!in(static_cast<unsigned char>(*attrp.first), 0x30u, 0x39u) &&
*attrp.first != '-')) { *attrp.first != '-')) {
@ -295,7 +299,7 @@ bool parse
} else { } else {
return false; return false;
} }
} else if(attrName == "domain") { } else if(util::strieq(p.first, p.second, A2_DOMAIN, vend(A2_DOMAIN)-1)) {
if(attrp.first == attrp.second) { if(attrp.first == attrp.second) {
return false; return false;
} }
@ -306,15 +310,15 @@ bool parse
return false; return false;
} }
cookieDomain.assign(noDot, end); cookieDomain.assign(noDot, end);
} else if(attrName == "path") { } else if(util::strieq(p.first, p.second, A2_PATH, vend(A2_PATH)-1)) {
if(goodPath(attrp.first, attrp.second)) { if(goodPath(attrp.first, attrp.second)) {
cookiePath.assign(attrp.first, attrp.second); cookiePath.assign(attrp.first, attrp.second);
} else { } else {
cookiePath = defaultPath; cookiePath = defaultPath;
} }
} else if(attrName == "secure") { } else if(util::strieq(p.first, p.second, A2_SECURE, vend(A2_SECURE)-1)) {
secure = true; secure = true;
} else if(attrName == "httponly") { } else if(util::strieq(p.first, p.second, A2_HTTPONLY, vend(A2_HTTPONLY)-1)) {
httpOnly = true; httpOnly = true;
} }
} }