1
0
mirror of https://github.com/leethomason/tinyxml2.git synced 2026-07-22 19:52:59 +04:00

Compare commits

..

1 Commits

Author SHA1 Message Date
Lee Thomason 7589178395 minor readme fixes 2025-11-22 16:23:12 -08:00
3 changed files with 13 additions and 25 deletions
+4 -18
View File
@@ -114,9 +114,6 @@ distribution.
#define TIXML_VSNPRINTF vsnprintf
static inline int TIXML_VSCPRINTF( const char* format, va_list va )
{
if (!format) {
return 0;
}
int len = vsnprintf( 0, 0, format, va );
TIXMLASSERT( len >= 0 );
return len;
@@ -834,17 +831,7 @@ XMLNode::XMLNode( XMLDocument* doc ) :
XMLNode::~XMLNode()
{
// Fast path: this node is dying, so maintaining _firstChild/_lastChild and
// sibling _prev/_next links is unnecessary. Only _parent must be zeroed to
// satisfy the MarkInUse assertion inside DeleteNode.
XMLNode *currentChild = _firstChild;
while (currentChild != NULL) {
XMLNode *next = currentChild->_next;
currentChild->_parent = 0;
DeleteNode(currentChild);
currentChild = next;
}
DeleteChildren();
if ( _parent ) {
_parent->Unlink( this );
}
@@ -2357,10 +2344,9 @@ static FILE* callfopen( const char* filepath, const char* mode )
return fp;
}
void XMLDocument::DeleteNode( XMLNode* node ) {
if(node == 0) {
return; // check for null pointer
}
void XMLDocument::DeleteNode( XMLNode* node ) {
TIXMLASSERT( node );
TIXMLASSERT(node->_document == this );
if (node->_parent) {
node->_parent->DeleteChild( node );
}
+8
View File
@@ -42,6 +42,14 @@ distribution.
#endif
#include <stdint.h>
/*
gcc:
g++ -Wall -DTINYXML2_DEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe
Formatting, Artistic Style:
AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h
*/
#if defined( _DEBUG ) || defined (__DEBUG__)
# ifndef TINYXML2_DEBUG
# define TINYXML2_DEBUG
+1 -7
View File
@@ -2025,13 +2025,7 @@ int main( int argc, const char ** argv )
XMLTest("Parse nested elements with pedantic whitespace", false, doc.Error());
XMLTest("Pedantic whitespace", true, 0 == doc.RootElement()->FirstChildElement()->GetText());
}
//Check the robustness of the DeleteNode function in handling null pointers.
{
XMLDocument doc;
doc.DeleteNode(nullptr);
XMLTest("DeleteNode with null pointer", true, doc.Error() == XML_SUCCESS);
}
// Check sample xml can be parsed with pedantic mode
{
XMLDocument doc(true, PEDANTIC_WHITESPACE);