From 29d5651cd54bdc61bf5412451ca6510c54be2c84 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 13 May 2008 16:58:40 +0000 Subject: [PATCH] 2008-05-14 Tatsuhiro Tsujikawa Made USER_AGENT const. Made "/" static const std::string. * src/A2STR.cc * src/A2STR.h * src/HttpRequest.cc * src/HttpRequest.h --- ChangeLog | 8 ++++++++ src/A2STR.cc | 2 ++ src/A2STR.h | 1 + src/HttpRequest.cc | 6 +++--- src/HttpRequest.h | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb4d8fe6..b1b0a3f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-05-14 Tatsuhiro Tsujikawa + + Made USER_AGENT const. Made "/" static const std::string. + * src/A2STR.cc + * src/A2STR.h + * src/HttpRequest.cc + * src/HttpRequest.h + 2008-05-14 Tatsuhiro Tsujikawa Made string listeral to static const std::string: diff --git a/src/A2STR.cc b/src/A2STR.cc index fcb69c5b..061940da 100644 --- a/src/A2STR.cc +++ b/src/A2STR.cc @@ -44,4 +44,6 @@ const std::string A2STR::CR_C("\r"); const std::string A2STR::LF_C("\n"); +const std::string A2STR::SLASH_C("/"); + } // namespace aria2 diff --git a/src/A2STR.h b/src/A2STR.h index c53f5bc4..f25877cf 100644 --- a/src/A2STR.h +++ b/src/A2STR.h @@ -51,6 +51,7 @@ public: static const std::string LF_C; + static const std::string SLASH_C; }; } // namespace aria2 diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 5b92b9b5..9815d873 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -49,7 +49,7 @@ namespace aria2 { -std::string HttpRequest::USER_AGENT = "aria2"; +const std::string HttpRequest::USER_AGENT("aria2"); HttpRequest::HttpRequest():entityLength(0), authEnabled(false), @@ -137,10 +137,10 @@ std::string HttpRequest::createRequest() const if(getProtocol() == Request::PROTO_FTP || proxyEnabled) { requestLine += getCurrentURI(); } else { - if(getDir() == "/") { + if(getDir() == A2STR::SLASH_C) { requestLine += getDir(); } else { - requestLine += getDir()+"/"; + requestLine += getDir()+A2STR::SLASH_C; } requestLine += getFile()+getQuery(); } diff --git a/src/HttpRequest.h b/src/HttpRequest.h index 58798c1d..5b6a2748 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -50,7 +50,7 @@ class Option; class HttpRequest { private: - static std::string USER_AGENT; + static const std::string USER_AGENT; SharedHandle request;