diff options
| author | Nils Maier <maierman@web.de> | 2014-04-17 01:36:19 +0200 |
|---|---|---|
| committer | Nils Maier <maierman@web.de> | 2014-04-17 18:02:42 +0200 |
| commit | 010131161ebdea22e5b6eb4fd0740e8e6da3df67 (patch) | |
| tree | 3a768bbd2796056c65de9630a6ab6946d4eda43f /src/Metalink2RequestGroup.cc | |
| parent | befd799d177c2860ea4e9c6cf8c744342c394427 (diff) | |
Remove ENABLE_MESSAGE_DIGEST, since we got the internal md, always
Diffstat (limited to 'src/Metalink2RequestGroup.cc')
| -rw-r--r-- | src/Metalink2RequestGroup.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Metalink2RequestGroup.cc b/src/Metalink2RequestGroup.cc index 5daa6bdc..6463aae6 100644 --- a/src/Metalink2RequestGroup.cc +++ b/src/Metalink2RequestGroup.cc @@ -64,10 +64,8 @@ # include "BtDependency.h" # include "download_helper.h" #endif // ENABLE_BITTORRENT -#ifdef ENABLE_MESSAGE_DIGEST -# include "Checksum.h" -# include "ChunkChecksum.h" -#endif // ENABLE_MESSAGE_DIGEST +#include "Checksum.h" +#include "ChunkChecksum.h" namespace aria2 { @@ -255,15 +253,11 @@ Metalink2RequestGroup::createRequestGroup // If piece hash is specified in the metalink, // make segment size equal to piece hash size. int32_t pieceLength; -#ifdef ENABLE_MESSAGE_DIGEST if(!entry->chunkChecksum) { pieceLength = option->getAsInt(PREF_PIECE_LENGTH); } else { pieceLength = entry->chunkChecksum->getPieceLength(); } -#else - pieceLength = option->getAsInt(PREF_PIECE_LENGTH); -#endif // ENABLE_MESSAGE_DIGEST dctx = std::make_shared<DownloadContext> (pieceLength, entry->getLength(), @@ -274,7 +268,6 @@ Metalink2RequestGroup::createRequestGroup if(option->getAsBool(PREF_METALINK_ENABLE_UNIQUE_PROTOCOL)) { dctx->getFirstFileEntry()->setUniqueProtocol(true); } -#ifdef ENABLE_MESSAGE_DIGEST if(entry->checksum) { dctx->setDigest(entry->checksum->getHashType(), entry->checksum->getDigest()); @@ -285,7 +278,6 @@ Metalink2RequestGroup::createRequestGroup std::begin(entry->chunkChecksum->getPieceHashes()), std::end(entry->chunkChecksum->getPieceHashes())); } -#endif // ENABLE_MESSAGE_DIGEST dctx->setSignature(entry->popSignature()); rg->setNumConcurrentCommand (entry->maxConnections < 0 ? |