From 0eb5ca187f4afc63b764e477d4aa8e866391f127 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 14 May 2008 13:07:04 +0000
Subject: [PATCH] 2008-05-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot
 com>

	Defined "sha1" as static const std::string.
	* src/MetalinkParserController.cc
	* src/MetalinkParserController.h
---
 ChangeLog                       | 6 ++++++
 src/MetalinkParserController.cc | 8 ++++++--
 src/MetalinkParserController.h  | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1985aad5..39044086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Defined "sha1" as static const std::string.
+	* src/MetalinkParserController.cc
+	* src/MetalinkParserController.h
+
 2008-05-14  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Defined message digest algorithm name as static const std::string
diff --git a/src/MetalinkParserController.cc b/src/MetalinkParserController.cc
index d6286506..31f98625 100644
--- a/src/MetalinkParserController.cc
+++ b/src/MetalinkParserController.cc
@@ -48,6 +48,8 @@
 
 namespace aria2 {
 
+const std::string MetalinkParserController::SHA1("sha1");
+
 MetalinkParserController::MetalinkParserController():
   _metalinker(new Metalinker())
 {}
@@ -257,7 +259,8 @@ void MetalinkParserController::commitChecksumTransaction()
   if(_tChecksum.isNull()) {
     return;
   }
-  if(_tEntry->checksum.isNull() || _tEntry->checksum->getAlgo() != "sha1") {
+  if(_tEntry->checksum.isNull() ||
+     _tEntry->checksum->getAlgo() != MetalinkParserController::SHA1) {
     _tEntry->checksum = _tChecksum;
   }
   _tChecksum.reset();
@@ -356,7 +359,8 @@ void MetalinkParserController::commitChunkChecksumTransaction()
   if(_tChunkChecksum.isNull()) {
     return;
   }
-  if(_tEntry->chunkChecksum.isNull() || _tEntry->chunkChecksum->getAlgo() != "sha1") {
+  if(_tEntry->chunkChecksum.isNull() ||
+     _tEntry->chunkChecksum->getAlgo() != MetalinkParserController::SHA1) {
     std::sort(_tempChunkChecksums.begin(), _tempChunkChecksums.end(), Ascend1st<std::pair<size_t, std::string> >());
     std::deque<std::string> checksums;
     std::transform(_tempChunkChecksums.begin(), _tempChunkChecksums.end(),
diff --git a/src/MetalinkParserController.h b/src/MetalinkParserController.h
index 6371d2df..30abe1d2 100644
--- a/src/MetalinkParserController.h
+++ b/src/MetalinkParserController.h
@@ -70,6 +70,7 @@ private:
   std::pair<size_t, std::string> _tempHashPair;
 #endif // ENABLE_MESSAGE_DIGEST
 
+  static const std::string SHA1;
 public:
   MetalinkParserController();