diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-10-30 16:02:15 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-10-30 16:02:15 +0000 |
| commit | 236e64cb25a054eed3fa8888168e71d09decf561 (patch) | |
| tree | 230c86632d06252af05a1803b63417f7873033f3 /src/AbstractCommand.cc | |
| parent | 6ecfa4aad1d49b14039aec1004539019462ec095 (diff) | |
2010-10-30 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use unnamed namespace instead of static keyword.
* src/AbstractCommand.cc
* src/AdaptiveURISelector.cc
* src/Base64.cc
* src/BitfieldMan.cc
* src/BtDependency.cc
* src/ConsoleStatCalc.cc
* src/ContentTypeRequestGroupCriteria.cc
* src/CookieStorage.cc
* src/DHTMessageFactoryImpl.cc
* src/DHTRoutingTableDeserializer.cc
* src/DefaultBtAnnounce.cc
* src/DefaultBtProgressInfoFile.cc
* src/DefaultPeerStorage.cc
* src/DefaultPieceStorage.cc
* src/DownloadCommand.cc
* src/DownloadEngine.cc
* src/EpollEventPoll.cc
* src/ExpatMetalinkProcessor.cc
* src/ExpatXmlRpcRequestProcessor.cc
* src/FileEntry.cc
* src/HttpRequest.cc
* src/HttpRequestCommand.cc
* src/HttpResponseCommand.cc
* src/KqueueEventPoll.cc
* src/LongestSequencePieceSelector.cc
* src/MetalinkParserStateV3Impl.cc
* src/MetalinkParserStateV4Impl.cc
* src/MultiDiskAdaptor.cc
* src/MultiUrlRequestInfo.cc
* src/OptionParser.cc
* src/PeerSessionResource.cc
* src/PortEventPoll.cc
* src/Request.cc
* src/RequestGroupMan.cc
* src/SelectEventPoll.cc
* src/SessionSerializer.cc
* src/SimpleLogFormatter.cc
* src/Sqlite3CookieParser.cc
* src/TrackerWatcherCommand.cc
* src/XML2SAXMetalinkProcessor.cc
* src/Xml2XmlRpcRequestProcessor.cc
* src/XmlRpcMethod.cc
* src/XmlRpcMethodImpl.cc
* src/XmlRpcResponse.cc
* src/base32.cc
* src/bencode2.cc
* src/bittorrent_helper.cc
* src/download_helper.cc
* src/main.cc
* src/messageDigest.cc
* src/option_processing.cc
* src/util.cc
* test/AnnounceListTest.cc
* test/BtRegistryTest.cc
* test/DHTBucketTest.cc
* test/DHTRoutingTableTest.cc
* test/DefaultBtAnnounceTest.cc
* test/FileEntryTest.cc
* test/FtpConnectionTest.cc
* test/MSEHandshakeTest.cc
* test/MagnetTest.cc
* test/XmlRpcMethodTest.cc
* test/array_funTest.cc
Diffstat (limited to 'src/AbstractCommand.cc')
| -rw-r--r-- | src/AbstractCommand.cc | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc index 8fc74f81..c83ef87b 100644 --- a/src/AbstractCommand.cc +++ b/src/AbstractCommand.cc @@ -521,8 +521,9 @@ void AbstractCommand::setWriteCheckSocketIf } } +namespace { // Returns proxy option value for the given protocol. -static const std::string& getProxyOptionFor +const std::string& getProxyOptionFor (const std::string& proxyPref, const SharedHandle<Option>& option) { if(option->defined(proxyPref)) { @@ -531,10 +532,12 @@ static const std::string& getProxyOptionFor return option->get(PREF_ALL_PROXY); } } +} // namespace +namespace { // Returns proxy URI for given protocol. If no proxy URI is defined, // then returns an empty string. -static const std::string& getProxyUri +const std::string& getProxyUri (const std::string& protocol, const SharedHandle<Option>& option) { if(protocol == Request::PROTO_HTTP) { @@ -547,16 +550,19 @@ static const std::string& getProxyUri return A2STR::NIL; } } +} // namespace +namespace { // Returns true if proxy is defined for the given protocol. Otherwise // returns false. -static bool isProxyRequest +bool isProxyRequest (const std::string& protocol, const SharedHandle<Option>& option) { const std::string& proxyUri = getProxyUri(protocol, option); uri::UriStruct us; return !proxyUri.empty() && uri::parse(us, proxyUri); } +} // namespace namespace { class DomainMatch { @@ -576,8 +582,9 @@ public: }; } // namespace -static bool inNoProxy(const SharedHandle<Request>& req, - const std::string& noProxy) +namespace { +bool inNoProxy(const SharedHandle<Request>& req, + const std::string& noProxy) { std::vector<std::string> entries; util::split(noProxy, std::back_inserter(entries), ",", true); @@ -616,6 +623,7 @@ static bool inNoProxy(const SharedHandle<Request>& req, } return false; } +} // namespace bool AbstractCommand::isProxyDefined() const { |
