commit 156bc1b99f5edbc55af561f9a8b44d162e968d50
author Lee Thomason <leethomason@gmail.com> Fri Nov 25 22:06:11 2016 -0800
committer GitHub <noreply@github.com> Fri Nov 25 22:06:11 2016 -0800
tree 1b1a0c8596b8c26276e920befc4e8b4ac3bd7e73
parent 5bbb6fb05219ac97b3da231ceb3ab4c954287be2
parent 0d2cef0cbaea985fc2dc7061aaaa81c96e2558ff

Merge pull request #502 from Dmitry-Me/reuseClearError

Reuse code for error clearing

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 6ce4332..96f3ad7 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1714,9 +1714,8 @@
         }

     }

     if ( !attrib ) {

-        TIXMLASSERT( sizeof( XMLAttribute ) == _document->_attributePool.ItemSize() );

-        attrib = new (_document->_attributePool.Alloc() ) XMLAttribute();

-        attrib->_memPool = &_document->_attributePool;

+        attrib = CreateAttribute();

+        TIXMLASSERT( attrib );

         if ( last ) {

             last->_next = attrib;

         }

@@ -1724,7 +1723,6 @@
             _rootAttribute = attrib;

         }

         attrib->SetName( name );

-        attrib->_memPool->SetTracked(); // always created and linked.

     }

     return attrib;

 }

@@ -1764,10 +1762,8 @@
 

         // attribute.

         if (XMLUtil::IsNameStartChar( *p ) ) {

-            TIXMLASSERT( sizeof( XMLAttribute ) == _document->_attributePool.ItemSize() );

-            XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute();

-            attrib->_memPool = &_document->_attributePool;

-			attrib->_memPool->SetTracked();

+            XMLAttribute* attrib = CreateAttribute();

+            TIXMLASSERT( attrib );

 

             p = attrib->ParseDeep( p, _document->ProcessEntities() );

             if ( !p || Attribute( attrib->Name() ) ) {

@@ -1816,6 +1812,15 @@
     pool->Free( attribute );

 }

 

+XMLAttribute* XMLElement::CreateAttribute()

+{

+    TIXMLASSERT( sizeof( XMLAttribute ) == _document->_attributePool.ItemSize() );

+    XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute();

+    attrib->_memPool = &_document->_attributePool;

+    attrib->_memPool->SetTracked();

+    return attrib;

+}

+

 //

 //	<ele></ele>

 //	<ele>foo<b>bar</b></ele>

tinyxml2.h

diff --git a/tinyxml2.h b/tinyxml2.h
index bafc4f2..0cb1347 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -1563,6 +1563,7 @@
     //void LinkAttribute( XMLAttribute* attrib );

     char* ParseAttributes( char* p );

     static void DeleteAttribute( XMLAttribute* attribute );

+    XMLAttribute* CreateAttribute();

 

     enum { BUF_SIZE = 200 };

     int _closingType;