瀏覽代碼

2009-05-15 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Defined MSG_CANNOT_PARSE_XML_RPC_REQUEST
	* src/ExpatXmlRpcRequestProcessor.cc
	* src/Xml2XmlRpcRequestProcessor.cc
	* src/message.h
Tatsuhiro Tsujikawa 16 年之前
父節點
當前提交
ee75995198
共有 4 個文件被更改,包括 12 次插入2 次删除
  1. 7 0
      ChangeLog
  2. 2 1
      src/ExpatXmlRpcRequestProcessor.cc
  3. 2 1
      src/Xml2XmlRpcRequestProcessor.cc
  4. 1 0
      src/message.h

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2009-05-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Defined MSG_CANNOT_PARSE_XML_RPC_REQUEST
+	* src/ExpatXmlRpcRequestProcessor.cc
+	* src/Xml2XmlRpcRequestProcessor.cc
+	* src/message.h
+
 2009-05-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Defined const BDEs to avoid duplicate instantiation.

+ 2 - 1
src/ExpatXmlRpcRequestProcessor.cc

@@ -41,6 +41,7 @@
 #include "XmlRpcRequestParserStateMachine.h"
 #include "Util.h"
 #include "DlAbortEx.h"
+#include "message.h"
 
 namespace aria2 {
 
@@ -111,7 +112,7 @@ XmlRpcRequestProcessor::parseMemory(const std::string& xml)
   XML_ParserFree(parser);
 
   if(r == XML_STATUS_ERROR) {
-    throw DlAbortEx("Failed to parse xml-rpc request.");
+    throw DlAbortEx(MSG_CANNOT_PARSE_XML_RPC_REQUEST);
   }
   return XmlRpcRequest(_stm->getMethodName(), _stm->getCurrentFrameValue());
 }

+ 2 - 1
src/Xml2XmlRpcRequestProcessor.cc

@@ -41,6 +41,7 @@
 #include "XmlRpcRequestParserStateMachine.h"
 #include "Util.h"
 #include "DlAbortEx.h"
+#include "message.h"
 
 namespace aria2 {
 
@@ -140,7 +141,7 @@ XmlRpcRequestProcessor::parseMemory(const std::string& xml)
   int r = xmlSAXUserParseMemory(&mySAXHandler, sessionData.get(),
 				xml.data(), xml.size());
   if(r != 0) {
-    throw DlAbortEx("Failed to parse xml-rpc request.");
+    throw DlAbortEx(MSG_CANNOT_PARSE_XML_RPC_REQUEST);
   }
   return XmlRpcRequest(_stm->getMethodName(), _stm->getCurrentFrameValue());
 }

+ 1 - 0
src/message.h

@@ -171,6 +171,7 @@
 #define MSG_NOT_TORRENT_METALINK _("This file is neither Torrent nor Metalink"\
 				   " file. Skipping.")
 #define MSG_GID_NOT_PROVIDED "GID is not provided."
+#define MSG_CANNOT_PARSE_XML_RPC_REQUEST "Failed to parse xml-rpc request."
 
 #define EX_TIME_OUT _("Timeout.")
 #define EX_INVALID_CHUNK_SIZE _("Invalid chunk size.")