From 9f9f61579ce81c5288427f5a709022f3d878ed5e Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 1 Oct 2006 12:22:28 +0000 Subject: [PATCH] Unused. --- stepmania/src/XmlFile.cpp | 16 ---------------- stepmania/src/XmlFile.h | 14 +------------- stepmania/src/XmlFileUtil.cpp | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/stepmania/src/XmlFile.cpp b/stepmania/src/XmlFile.cpp index 3962e16002..153df966f7 100644 --- a/stepmania/src/XmlFile.cpp +++ b/stepmania/src/XmlFile.cpp @@ -140,8 +140,6 @@ unsigned XNode::LoadAttributes( const RString &xml, PARSEINFO *pi, unsigned iOff if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_ATTR_NO_VALUE; pi->error_string = ssprintf( "<%s> attribute has error ", m_sName.c_str() ); } return string::npos; @@ -189,8 +187,6 @@ unsigned XNode::LoadAttributes( const RString &xml, PARSEINFO *pi, unsigned iOff if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_ATTR_NO_VALUE; pi->error_string = ssprintf( "<%s> attribute text: couldn't find matching quote", sName.c_str() ); } return string::npos; @@ -246,8 +242,6 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_ALONE_NOT_CLOSED; pi->error_string = "Unterminated comment"; } @@ -288,8 +282,6 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_ALONE_NOT_CLOSED; pi->error_string = "Element must be closed."; } @@ -321,8 +313,6 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_NOT_CLOSED; pi->error_string = ssprintf( "%s must be closed with ", m_sName.c_str(), m_sName.c_str() ); } // error cos not exist CloseTag @@ -372,8 +362,6 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_NOT_CLOSED; pi->error_string = ssprintf( "it must be closed with ", m_sName.c_str() ); } // error @@ -395,8 +383,6 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_NOT_NESTED; pi->error_string = ssprintf( "'<%s> ... ' is not well-formed.", m_sName.c_str(), closename.c_str() ); } return string::npos; @@ -414,8 +400,6 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset ) if( !pi->error_occur ) { pi->error_occur = true; - pi->error_pointer = xml; - pi->error_code = PIE_NOT_CLOSED; pi->error_string = ssprintf( "it must be closed with ", m_sName.c_str() ); } return string::npos; diff --git a/stepmania/src/XmlFile.h b/stepmania/src/XmlFile.h index 62348b042f..767cb7fc82 100644 --- a/stepmania/src/XmlFile.h +++ b/stepmania/src/XmlFile.h @@ -35,16 +35,6 @@ typedef multimap XNodes; Var##Iter != (pNode)->m_childs.end(); \ ++Var##Iter ) -enum PCODE -{ - PIE_PARSE_WELL_FORMED = 0, - PIE_ALONE_NOT_CLOSED, - PIE_NOT_CLOSED, - PIE_NOT_NESTED, - PIE_ATTR_NO_VALUE, - PIE_READ_ERROR -}; - // Parse info. struct PARSEINFO { @@ -52,11 +42,9 @@ struct PARSEINFO bool entity_value; // [set] do convert from reference to entity? ( < -> < ) bool error_occur; // [get] is occurance of error? - const char* error_pointer; // [get] error position of xml source - PCODE error_code; // [get] error code RString error_string; // [get] error string - PARSEINFO() { trim_value = true; entity_value = true; error_occur = false; error_pointer = NULL; error_code = PIE_PARSE_WELL_FORMED; } + PARSEINFO() { trim_value = true; entity_value = true; error_occur = false; } }; // display optional environment diff --git a/stepmania/src/XmlFileUtil.cpp b/stepmania/src/XmlFileUtil.cpp index 927ac9203b..748b0a90f4 100644 --- a/stepmania/src/XmlFileUtil.cpp +++ b/stepmania/src/XmlFileUtil.cpp @@ -13,8 +13,6 @@ bool XmlFileUtil::LoadFromFileShowErrors( XNode &xml, RageFileBasic &f ) if( f.Read( s ) == -1 ) { pi.error_occur = true; - pi.error_pointer = NULL; - pi.error_code = PIE_READ_ERROR; pi.error_string = f.GetError(); goto error;