AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed cppcheck warnings

This commit is contained in:
PKEuS 2012-07-16 03:08:47 -07:00
parent 21be882810
commit c28ba3aeab
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tinyxml2.cpp
View File

@ -190,8 +190,6 @@ const char* StrPair::GetStr()
*q++ = LF;
}
else if ( (flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) {
int i=0;
// Entities handled by tinyXML2:
// - special entities in the entity table [in/out]
// - numeric character reference [in]
@ -207,7 +205,8 @@ const char* StrPair::GetStr()
TIXMLASSERT( q <= p );
}
else {
for( i=0; i<NUM_ENTITIES; ++i ) {
int i=0;
for(; i<NUM_ENTITIES; ++i ) {
if ( strncmp( p+1, entities[i].pattern, entities[i].length ) == 0
&& *(p+entities[i].length+1) == ';' )
{
@ -768,7 +767,7 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd )
// We read the end tag. Return it to the parent.
if ( node->ToElement() && node->ToElement()->ClosingType() == XMLElement::CLOSING ) {
if ( parentEnd ) {
*parentEnd = ((XMLElement*)node)->value;
*parentEnd = static_cast<XMLElement*>(node)->value;
}
DELETE_NODE( node );
return p;

14
tinyxml2.h
View File

@ -587,7 +587,7 @@ protected:
XMLNode( XMLDocument* );
virtual ~XMLNode();
XMLNode( const XMLNode& ); // not supported
void operator=( const XMLNode& ); // not supported
XMLNode& operator=( const XMLNode& ); // not supported
XMLDocument* document;
XMLNode* parent;
@ -641,7 +641,7 @@ protected:
XMLText( XMLDocument* doc ) : XMLNode( doc ), isCData( false ) {}
virtual ~XMLText() {}
XMLText( const XMLText& ); // not supported
void operator=( const XMLText& ); // not supported
XMLText& operator=( const XMLText& ); // not supported
private:
bool isCData;
@ -666,7 +666,7 @@ protected:
XMLComment( XMLDocument* doc );
virtual ~XMLComment();
XMLComment( const XMLComment& ); // not supported
void operator=( const XMLComment& ); // not supported
XMLComment& operator=( const XMLComment& ); // not supported
private:
};
@ -700,7 +700,7 @@ protected:
XMLDeclaration( XMLDocument* doc );
virtual ~XMLDeclaration();
XMLDeclaration( const XMLDeclaration& ); // not supported
void operator=( const XMLDeclaration& ); // not supported
XMLDeclaration& operator=( const XMLDeclaration& ); // not supported
};
@ -728,7 +728,7 @@ protected:
XMLUnknown( XMLDocument* doc );
virtual ~XMLUnknown();
XMLUnknown( const XMLUnknown& ); // not supported
void operator=( const XMLUnknown& ); // not supported
XMLUnknown& operator=( const XMLUnknown& ); // not supported
};
@ -1265,7 +1265,7 @@ public:
/// Copy constructor
XMLHandle( const XMLHandle& ref ) { node = ref.node; }
/// Assignment
XMLHandle operator=( const XMLHandle& ref ) { node = ref.node; return *this; }
XMLHandle& operator=( const XMLHandle& ref ) { node = ref.node; return *this; }
/// Get the first child of this handle.
XMLHandle FirstChild() { return XMLHandle( node ? node->FirstChild() : 0 ); }
@ -1311,7 +1311,7 @@ public:
XMLConstHandle( const XMLNode& _node ) { node = &_node; }
XMLConstHandle( const XMLConstHandle& ref ) { node = ref.node; }
XMLConstHandle operator=( const XMLConstHandle& ref ) { node = ref.node; return *this; }
XMLConstHandle& operator=( const XMLConstHandle& ref ) { node = ref.node; return *this; }
const XMLConstHandle FirstChild() const { return XMLConstHandle( node ? node->FirstChild() : 0 ); }
const XMLConstHandle FirstChildElement( const char* value=0 ) const { return XMLConstHandle( node ? node->FirstChildElement( value ) : 0 ); }

6
xmltest.cpp
View File

@ -411,8 +411,6 @@ int main( int /*argc*/, const char ** /*argv*/ )
doc.SaveFile( "resources/utf8testout.xml" );
// Check the round trip.
char savedBuf[256];
char verifyBuf[256];
int okay = 0;
@ -429,8 +427,10 @@ int main( int /*argc*/, const char ** /*argv*/ )
if ( saved && verify )
{
okay = 1;
char verifyBuf[256];
while ( fgets( verifyBuf, 256, verify ) )
{
char savedBuf[256];
fgets( savedBuf, 256, saved );
NullLineEndings( verifyBuf );
NullLineEndings( savedBuf );
@ -568,9 +568,9 @@ int main( int /*argc*/, const char ** /*argv*/ )
"<psg context=\"Line 5 has &quot;quotation marks&quot; and &apos;apostrophe marks&apos;."
" It also has &lt;, &gt;, and &amp;, as well as a fake copyright \xC2\xA9.\"/>\n",
buf, false );
}
fclose( textfile );
}
}
{
// Suppress entities.