[sword-cvs] sword/include swbuf.h,1.13,1.14 utilxml.h,1.4,1.5

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/include
In directory www:/tmp/cvs-serv9597/include

Modified Files:
	swbuf.h utilxml.h 
Log Message:
no message

Index: swbuf.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/swbuf.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** swbuf.h	26 May 2003 04:32:45 -0000	1.13
--- swbuf.h	26 Jun 2003 04:33:31 -0000	1.14
***************
*** 47,51 ****
  			allocSize = newsize + 5;
  			long size = (end - buf);
! 			buf = (char *)realloc(buf, allocSize);
  			end = (buf + size);
  		}
--- 47,51 ----
  			allocSize = newsize + 5;
  			long size = (end - buf);
! 			buf = (char *)((buf) ? realloc(buf, allocSize) : calloc(allocSize, 1));
  			end = (buf + size);
  		}

Index: utilxml.h
===================================================================
RCS file: /usr/local/cvsroot/sword/include/utilxml.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utilxml.h	18 Jun 2003 20:14:59 -0000	1.4
--- utilxml.h	26 Jun 2003 04:33:31 -0000	1.5
***************
*** 43,49 ****
  	mutable bool endTag;
  	mutable MapStringPair attributes;
! 
  	void parse() const;
! 
  	
  public:
--- 43,50 ----
  	mutable bool endTag;
  	mutable MapStringPair attributes;
! 	mutable SWBuf junkBuf;
! 	
  	void parse() const;
! 	const char *getPart(const char *buf, int partNum = 0, char partSplit = '|') const;
  	
  public:
***************
*** 64,68 ****
  
  	const ListString getAttributeNames() const;
! 	const char *getAttribute(const char *attribName) const;
  	const char *setAttribute(const char *attribName, const char *attribValue);
  	const char *toString() const;
--- 65,70 ----
  
  	const ListString getAttributeNames() const;
! 	int getAttributePartCount(const char *attribName, char partSplit = '|') const;
! 	const char *getAttribute(const char *attribName, int partNum = -1, char partSplit = '|') const;
  	const char *setAttribute(const char *attribName, const char *attribValue);
  	const char *toString() const;