commit a60caa28ccb20569034a9ee23460ecc8943636d5
author Dmitry-Me <wipedout@yandex.ru> Tue Nov 22 18:28:08 2016 +0300
committer Dmitry-Me <wipedout@yandex.ru> Tue Nov 22 18:28:08 2016 +0300
tree a5c5010d0d8e1c6e56b47a2f32c45e050eacddd0
parent f80d78d9385ef08d70181e286328a89b64532f70

Reuse attribute creation code

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 826eb9b..941bd37 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>