From d34f52c43b8c20bfa3201dea558a3a67088eb99f Mon Sep 17 00:00:00 2001
From: Lee Thomason <leethomason@gmail.com>
Date: Fri, 20 Jan 2012 12:55:24 -0800
Subject: [PATCH] switching over to StrPair

---
 tinyxml2.cpp |   4 +---
 tinyxml2.h   |  18 +++++++++++-------
 tinyxml2.suo | Bin 29184 -> 29184 bytes
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 4a3152a..091f328 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -88,9 +88,7 @@ const char* XMLBase::ParseText( char* p, const char* endTag, char** next )
 }
 
 
-char* XMLBase::ParseName( char* in, StrPair* pair );
-
-const char* XMLBase::ParseName( char* p, char** next )
+char* XMLBase::ParseName( char* p, StrPair* pair )
 {
 	char* start = p;
 	char* nextTag = 0;
diff --git a/tinyxml2.h b/tinyxml2.h
index f081758..fe3979e 100644
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -48,6 +48,7 @@ struct CharBuffer
 // FIXME: refactor to be the basis for all string handling.
 class StrPair
 {
+public:
 	enum {
 		NEEDS_FLUSH = 0x01,
 		NEEDS_ENTITY_PROCESSING = 0x02,
@@ -55,7 +56,7 @@ class StrPair
 	};
 
 	StrPair() : flags( 0 ), start( 0 ), end( 0 ) {}
-	void Init( const char* start, char* end, int flags; ) {
+	void Init( const char* start, char* end, int flags ) {
 		this->start = start; this->end = end; this->flags = flags | NEEDS_FLUSH;
 	}
 	const char* GetStr();
@@ -80,6 +81,9 @@ protected:
 
 	inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX )  {
 		int n = 0;
+		if ( p == q ) {
+			return true;
+		}
 		while( *p && *q && *p == *q && n<nChar ) {
 			++p; ++q; ++n;
 		}
@@ -138,14 +142,14 @@ public:
 
 	virtual void Print( FILE* cfile, int depth );
 
-	const char* Value() const { return value; }
+	const char* Value() { return value.GetStr(); }
 
 	char* ParseDeep( char* );
 
 protected:
 
 private:
-	const char* value;
+	StrPair value;
 };
 
 
@@ -153,14 +157,14 @@ class XMLAttribute : public XMLBase
 {
 	friend class XMLElement;
 public:
-	XMLAttribute( XMLElement* element ) : value( 0 ), next( 0 ) {}
+	XMLAttribute( XMLElement* element ) : next( 0 ) {}
 	virtual ~XMLAttribute()	{}
 	virtual void Print( FILE* cfile );
 
 private:
 	char* ParseDeep( char* p );
 
-	const char* value;
+	StrPair value;
 	XMLAttribute* next;
 };
 
@@ -171,7 +175,7 @@ public:
 	XMLElement( XMLDocument* doc );
 	virtual ~XMLElement();
 
-	const char* Name() const { return name; }
+	const char* Name() { return name.GetStr(); }
 	virtual void Print( FILE* cfile, int depth );
 
 	virtual XMLElement* ToElement() { return this; }
@@ -182,7 +186,7 @@ public:
 protected:
 
 private:
-	const char* name;
+	StrPair name;
 	bool closing;
 	XMLAttribute* rootAttribute;
 	XMLAttribute* lastAttribute;
diff --git a/tinyxml2.suo b/tinyxml2.suo
index 5924ebfae30fe097e5ee14695aef36dd9bed8353..2a9ea15f0b30c79acbe82b24c9b6f69d1246574f 100644
GIT binary patch
delta 2045
zcmYjSZA?>F7`}G`7OdSBur@bcy_U8VXs@@lz_ol8s0syYL9D>!Lq&p!wZr{TlLh8}
zELj%OKE|kV%8WlIOD2L_+($Br{#Z=5mBg5BSqNGD;oPzr;xA)l?>#MKw>jy(=bZQJ
zd7k&2@hANF6MniSgWrrT8Jjbo_q_k`%h`7_c4z7A9LK#$1F>Pp>{8CWE}LJbM@Ua$
zDKD87$mF;+9L!O5W@C`o(HFOVWqs7xhWnBSFN_hLX1FQ6u$JQr=yeB9ZVF}d>*&?6
zVzRV}Ofo#P@0!Lk@nLlRjO9L$hP>+Q(i<opslngdjks>zhYo8PGfo-(eR@nbn=^;V
zfep8u9-1*=+%2*h3$9r`m@YJ+rOAZvY&x=2k@RGt(<b1NUByDX4lfHN1l=+w?LOq&
zd-1>)fzOeE-r;0>9@dy)DAVy<F;>_GYlV!#LNog}7n=D1=1QtzbY4NwBV)QcAMHiC
zlv^);Dz4&3v7yL~mpuyZ6pKjIsCcx^jBv3I14S3ehYG=&h1Vr|iX<axbz~pp;`Ad>
zDOxS!j@)dmw)beL__=rs76wfSxHBkA8Be`>Ja-vcmO_mlmtAI@?^99l%EtjEz~X81
zA;m;{q*-2G=J{nTmYA^Mwyxp0GSs;b;XznMAe4ng<t{TREwvFK8c@aP@XCog5m!qs
ztYXz`CJY4x%)W#-hgJtMFla`<TSBZ)#~;VCcNcC1Rs7>~@dvP>sS<Lfgejk%Ae9j*
zccq~gp(_^|9a`k+GJ*MtI3z^N%(S-(pH*lfL;NH*JC8vb7VxUvK^8ttsv;}1Q_W{y
z7n?*F)LbH<3Lp7RRF4me-$Et(@pzkNL&T5>#yz^VGN-{A!<@~7#U?$}ZAN^f1}SG5
zQe`=VHR-o9OwLq_M6X8R-6|7Blo4n!GCG>c$63m241t3J;dlui2l;c_nC#ABqNb0@
zL9yn*(v#0--DvY_@^r0IT!69aE>`!wpuA4zR;WMAylJ+tYpwjLRSDgwwX)rk&jM$y
zg&$xmng~YgloV4cW|~y|R%c`(y-fe%fXrY@*15=JuB3v96^KzIQ*{I8?Uh8A#4HMN
zu8$hFKF0h6Lb+^DJ^C7288m?g0U!Hw*xuuq3#YnkDxybZdk%p(!0i0iTwDz52{J#b
zg1HP#zg5g@=NhQULtKnTiU^6td+Ie2h!eO)a`Ct3;^huK*=VGtIy;MXwnlS!=P-jH
zZZ)I6QA+P()Z*1n0}eEP!J-91B4rXqys4gbR_Y9}u`@&3BVei`AKlG*+zE9MHZ`~y
zVx5y{$tQjK=}2)hxu0)wX;O!DB!~Zm%GJ^nS<p$lnAXw}mUbj;Va}DH0V8c9gfJa8
zt%J0;9j6OrTnRg2amGo<7Ao~J^A+AD@*|9pc)P3tof#xu4W(zwSubkc;i^s1P=txL
zR@RwAZN&t(0^z80RZT+-B(2b?h?S{t(k{T)VPx;g-44p5iq`c1Q`$+^2T4VMe|G>$
zMUTby)Y101!_4ZLv^z1`kvcfX_ZYF%5#`TdLO6`^E(@Q)ThU>Bzqbf8(d%>xT$p{j
zcOAd+Qz|3%i1%*OOCF7&wv4M?Mq@{MP5bMnv4utu<jI%l9!Fc$jnBJ*z}wGoy1E|m
z5j__6Q375Wo%>Y2o{4^>M_ko`rAOjVq?;r{4g0OS6<_sG+3qSjlpL)5NClPV7Sfan
ztZXG{T))zC+9g!Oe4OYtvSUfR8Ke;dY1oqJZ_KdJ26hjQ_P6obyqP}rD^pAR=d&_7
zN&6fgF2>T(JiEhQ94_ax8+n?hrxD&GKVpW?kVkfnH-)9&?@?CyJIuOXyFlV2CIpYZ
zf|8N(hN2)4tHF4zdBZPXXIpQ6@WZv6m$vq<sd{{SGxi_M!@sd#g@@&*p8bCNG`c;1
ksLG$cd2HdYW1ZQ&hHU{2Ep?2>+cJ5Z_C;yVF2xP}f8JM_Q2+n{

delta 2025
zcmYjSZA?>F7`|5vwxxEpbhYWaQfjFM+NMP;ceGwwdWTY=(zVo2s0cBLh)780jB{wr
z5`PS_4>8-48C=Zf7Plyv#h68xxgY)+Dam3oe{3d0W8C79uw_{m-Fr_ddYhZubI$wy
zJnwr(=lIb%{z|KYx1d~6R;1fHpZH?>up(KkbZ{J}r5A(!&glj9tP-~sek_*G6pKY1
zw~~W3Elj;C@yh4)tX>kturYyXX#-ZQZB*#w&HnzXRUEgD{z`afZHx{#Wld2PUqU;t
zENM*-n@$wrbb9ra^)|2K$vmei94(Y-S755ihn!E1@SFOgK00{~XEQ+zCDf`OZis#y
z_cjvt3?@=u+;7p~sL#UWtT>zU(~gU+9O!oRU?L+R?l2-{C)rvp{$6Lpsfu<uE4uK5
zV=sCg0`@sw_^Bd`N3A;Cb($cp_u||27W&3;tvZDHCM|^Z8a|At;WwanO)}5VLJn-N
z)Ijo+WtS5pRp)TZBcQ#?fyv4v=&cNqb{eVbJ<MV*LbBC57=(J%c=XJ3&h4UTya+dG
zaMEpDDR4dLZY{$v`%L^fJoN{Wb1QJn=Va0|q8?8q?TS8bn)g2E70)?tBTjfSkUU{r
zYw}Xj?qJcsmxYn@JCNES@2N3X<E29A5Vq7Jwn5Fpd0b<m^L-SK?B0~Ejbo~|4;Li?
z=NoOf998lWlm~W^Vm)*L14cIPr7C%`WuqImy3d#qTZe(wT94U^23!wVnZ$Ur8S%|(
zc9OsvVJq3F#lLlCbk$3^m=xgiXqK@&N$3)4gw3d5xysAQhz}BWL8_z$^ARO4;%bwh
z5-BDd`enU#MEng9r5BclaUmIm7&K89lz4rB6=l3xgYlq=A4hrJA^3W1D>?2Xipr00
z)TolZwa^>JRl5gwNmtJCS;!4XzzbW42077+RGSY&qLUR=X53AW8dlNHu$K#bbCZP?
zU1remCIi#W`E)QR^vr{cJRHS^$_y?w*q8@d%h_OOyc~&m$%BA<5hKKi@+H`G2-WBr
z7HPa5KA6{xxEUMHH@f&<in@;AbuyVK%WAQ4kYV#MYQbVs#!i9BsEL3UAY?QQ6%`U~
zLFz9nRjQY&6vCKfWK8r)b{748mjR;P$e$q&$UP<JY-GANLZgGl`>0iqOT=8c5A&G!
zGh2jXiI*$%>S1O<&Ubz@^`1wrq#hTy3{V#No(#kse2CTmVY7i*7B}ngWwSPqUo_v{
zZsJ%3u@>q}>bQq7XTJZ5H`fD3T#jjo`T`!eRLPlU!^I`t+<q=kCoP3s%Ghr^pyofp
zn$}KyXSc%F=3p-5;2yP_sqpn^jJuiPD+yONPFS?1sf)dM5_c_&#vR&a7MdA1$D1t-
zXCvV}Mm&2D;eIU*!jEY^u!NBg-?Up9P7<3_qmmipZy7O{=w*@LNL1zL1O+pc(93+v
zhD~rMG<@GnCY%Innwsc1MkNbAOcn-^0imRxmB!bm!yFl&NOduTM^Y9x#*THE**MhJ
zsaF@kIl%%xquY;}Z5Dn4W$Aw0+E$IJ^rtlOC#D~7E8&gRBvg3n=}(Ma>4og%4x=$%
zIH&JUdgWO!fy@Q6J4X@OQH`&50^+Ve7`eaREl^?eL>SmzXcxJS403^rlBC_p2w~_n
zL($d5AED;y#9XHh?V0=t5i&HWi3s@?&0iF{rID$@SeKO%UJT|5ucRTfF1u%oqKr(l
zJ8pPSf>&`?TCOc@Ep*Qo7x6ZEN%t5Q`es$UeBD(n3+xwoRg9-4Juz%J@FTwWnK6?w
zu+EfwW?=V=dGrA>zk#Nj4)+E$#P)o`LjzVw2mgalp;+O27YU_^(ZQBA4{qM*8M$@i
z<aDHD;;+wp?%L4ZQ;I(af7bna=bxnaYTtvyzvYgf7T+&r2frWMuHwom4Ee5=6T<LN
MLcX)77l$<b|H`4BWdHyG