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/DHTMessageFactoryImpl.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/DHTMessageFactoryImpl.cc')
| -rw-r--r-- | src/DHTMessageFactoryImpl.cc | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/DHTMessageFactoryImpl.cc b/src/DHTMessageFactoryImpl.cc index 61ce023b..9910abe8 100644 --- a/src/DHTMessageFactoryImpl.cc +++ b/src/DHTMessageFactoryImpl.cc @@ -83,7 +83,8 @@ DHTMessageFactoryImpl::getRemoteNode return node; } -static const Dict* getDictionary(const Dict* dict, const std::string& key) +namespace { +const Dict* getDictionary(const Dict* dict, const std::string& key) { const Dict* d = asDict(dict->get(key)); if(d) { @@ -93,8 +94,10 @@ static const Dict* getDictionary(const Dict* dict, const std::string& key) (StringFormat("Malformed DHT message. Missing %s", key.c_str()).str()); } } +} // namespace -static const String* getString(const Dict* dict, const std::string& key) +namespace { +const String* getString(const Dict* dict, const std::string& key) { const String* c = asString(dict->get(key)); if(c) { @@ -104,8 +107,10 @@ static const String* getString(const Dict* dict, const std::string& key) (StringFormat("Malformed DHT message. Missing %s", key.c_str()).str()); } } +} // namespace -static const Integer* getInteger(const Dict* dict, const std::string& key) +namespace { +const Integer* getInteger(const Dict* dict, const std::string& key) { const Integer* c = asInteger(dict->get(key)); if(c) { @@ -115,8 +120,10 @@ static const Integer* getInteger(const Dict* dict, const std::string& key) (StringFormat("Malformed DHT message. Missing %s", key.c_str()).str()); } } +} // namespace -static const String* getString(const List* list, size_t index) +namespace { +const String* getString(const List* list, size_t index) { const String* c = asString(list->get(index)); if(c) { @@ -127,8 +134,10 @@ static const String* getString(const List* list, size_t index) static_cast<unsigned long>(index)).str()); } } +} // namespace -static const Integer* getInteger(const List* list, size_t index) +namespace { +const Integer* getInteger(const List* list, size_t index) { const Integer* c = asInteger(list->get(index)); if(c) { @@ -139,8 +148,10 @@ static const Integer* getInteger(const List* list, size_t index) static_cast<unsigned long>(index)).str()); } } +} // namespace -static const List* getList(const Dict* dict, const std::string& key) +namespace { +const List* getList(const Dict* dict, const std::string& key) { const List* l = asList(dict->get(key)); if(l) { @@ -150,6 +161,7 @@ static const List* getList(const Dict* dict, const std::string& key) (StringFormat("Malformed DHT message. Missing %s", key.c_str()).str()); } } +} // namespace void DHTMessageFactoryImpl::validateID(const String* id) const { @@ -171,7 +183,8 @@ void DHTMessageFactoryImpl::validatePort(const Integer* port) const } } -static void setVersion(const SharedHandle<DHTMessage>& msg, const Dict* dict) +namespace { +void setVersion(const SharedHandle<DHTMessage>& msg, const Dict* dict) { const String* v = asString(dict->get(DHTMessage::V)); if(v) { @@ -180,6 +193,7 @@ static void setVersion(const SharedHandle<DHTMessage>& msg, const Dict* dict) msg->setVersion(A2STR::NIL); } } +} // namespace SharedHandle<DHTQueryMessage> DHTMessageFactoryImpl::createQueryMessage (const Dict* dict, const std::string& ipaddr, uint16_t port) @@ -274,7 +288,8 @@ DHTMessageFactoryImpl::createResponseMessage return msg; } -static const std::string& getDefaultVersion() +namespace { +const std::string& getDefaultVersion() { static std::string version; if(version.empty()) { @@ -286,6 +301,7 @@ static const std::string& getDefaultVersion() } return version; } +} // namespace void DHTMessageFactoryImpl::setCommonProperty (const SharedHandle<DHTAbstractMessage>& m) |
