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/bencode2.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/bencode2.cc')
| -rw-r--r-- | src/bencode2.cc | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/src/bencode2.cc b/src/bencode2.cc index 83dbd684..1075fc92 100644 --- a/src/bencode2.cc +++ b/src/bencode2.cc @@ -44,9 +44,12 @@ namespace aria2 { namespace bencode2 { -static SharedHandle<ValueBase> decodeiter(std::istream& ss, size_t depth); +namespace { +SharedHandle<ValueBase> decodeiter(std::istream& ss, size_t depth); +} // namespace -static void checkdelim(std::istream& ss, const char delim = ':') +namespace { +void checkdelim(std::istream& ss, const char delim = ':') { char d; if(!(ss.get(d) && d == delim)) { @@ -55,8 +58,10 @@ static void checkdelim(std::istream& ss, const char delim = ':') delim).str()); } } +} // namespace -static std::string decoderawstring(std::istream& ss) +namespace { +std::string decoderawstring(std::istream& ss) { int length; ss >> length; @@ -79,13 +84,17 @@ static std::string decoderawstring(std::istream& ss) } return str; } +} // namespace -static SharedHandle<ValueBase> decodestring(std::istream& ss) +namespace { +SharedHandle<ValueBase> decodestring(std::istream& ss) { return String::g(decoderawstring(ss)); } +} // namespace -static SharedHandle<ValueBase> decodeinteger(std::istream& ss) +namespace { +SharedHandle<ValueBase> decodeinteger(std::istream& ss) { Integer::ValueType iv; ss >> iv; @@ -96,8 +105,10 @@ static SharedHandle<ValueBase> decodeinteger(std::istream& ss) checkdelim(ss, 'e'); return Integer::g(iv); } +} // namespace -static SharedHandle<ValueBase> decodedict(std::istream& ss, size_t depth) +namespace { +SharedHandle<ValueBase> decodedict(std::istream& ss, size_t depth) { SharedHandle<Dict> dict = Dict::g(); char c; @@ -113,8 +124,10 @@ static SharedHandle<ValueBase> decodedict(std::istream& ss, size_t depth) throw DL_ABORT_EX("Bencode decoding failed:" " Unexpected EOF in dict context. 'e' expected."); } +} // namespace -static SharedHandle<ValueBase> decodelist(std::istream& ss, size_t depth) +namespace { +SharedHandle<ValueBase> decodelist(std::istream& ss, size_t depth) { SharedHandle<List> list = List::g(); char c; @@ -129,15 +142,19 @@ static SharedHandle<ValueBase> decodelist(std::istream& ss, size_t depth) throw DL_ABORT_EX("Bencode decoding failed:" " Unexpected EOF in list context. 'e' expected."); } +} // namespace -static void checkDepth(size_t depth) +namespace { +void checkDepth(size_t depth) { if(depth >= MAX_STRUCTURE_DEPTH) { throw DL_ABORT_EX("Bencode decoding failed: Structure is too deep."); } } +} // namespace -static SharedHandle<ValueBase> decodeiter(std::istream& ss, size_t depth) +namespace { +SharedHandle<ValueBase> decodeiter(std::istream& ss, size_t depth) { checkDepth(depth); char c; @@ -157,6 +174,7 @@ static SharedHandle<ValueBase> decodeiter(std::istream& ss, size_t depth) return decodestring(ss); } } +} // namespace SharedHandle<ValueBase> decode(std::istream& in) { |
