neilg 2004/01/12 08:23:39
Modified: c/src/xercesc/util XMLUri.cpp XMLAbstractDoubleFloat.cpp
Log:
remove use of static buffers
Revision Changes Path
1.21 +12 -2 xml-xerces/c/src/xercesc/util/XMLUri.cpp
Index: XMLUri.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUri.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XMLUri.cpp 17 Dec 2003 00:18:35 -0000 1.20
+++ XMLUri.cpp 12 Jan 2004 16:23:39 -0000 1.21
@@ -136,7 +136,6 @@
// Local methods and data
// ---------------------------------------------------------------------------
static const int BUF_LEN = 64;
-static XMLCh value1[BUF_LEN+1];
//
// "Scheme"
@@ -911,6 +910,7 @@
!XMLString::isHex(uriSpec[index+1]) ||
!XMLString::isHex(uriSpec[index+2]))
{
+ XMLCh value1[BUF_LEN+1];
XMLString::moveChars(value1, &(uriSpec[index]), 3);
value1[3] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -923,6 +923,7 @@
else if (!isUnreservedCharacter(testChar) &&
!isPathCharacter(testChar))
{
+ XMLCh value1[BUF_LEN+1];
value1[0] = testChar;
value1[1] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -954,6 +955,7 @@
!XMLString::isHex(uriSpec[index+1]) ||
!XMLString::isHex(uriSpec[index+2]))
{
+ XMLCh value1[BUF_LEN+1];
XMLString::moveChars(value1, &(uriSpec[index]), 3);
value1[3] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -971,6 +973,7 @@
else if (!isUnreservedCharacter(testChar) &&
!isReservedCharacter(testChar))
{
+ XMLCh value1[BUF_LEN+1];
value1[0] = testChar;
value1[1] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -1012,6 +1015,7 @@
!XMLString::isHex(uriSpec[index+1]) ||
!XMLString::isHex(uriSpec[index+2]))
{
+ XMLCh value1[BUF_LEN+1];
XMLString::moveChars(value1, &(uriSpec[index]), 3);
value1[3] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -1024,6 +1028,7 @@
else if (!isUnreservedCharacter(testChar) &&
!isReservedCharacter(testChar))
{
+ XMLCh value1[BUF_LEN+1];
value1[0] = testChar;
value1[1] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -1062,6 +1067,7 @@
!XMLString::isHex(uriSpec[index+1]) ||
!XMLString::isHex(uriSpec[index+2]))
{
+ XMLCh value1[BUF_LEN+1];
XMLString::moveChars(value1, &(uriSpec[index]), 3);
value1[3] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -1074,6 +1080,7 @@
else if (!isUnreservedCharacter(testChar) &&
!isReservedCharacter(testChar))
{
+ XMLCh value1[BUF_LEN+1];
value1[0] = testChar;
value1[1] = chNull;
ThrowXMLwithMemMgr2(MalformedURLException
@@ -1233,6 +1240,7 @@
{
if (!getHost())
{
+ XMLCh value1[BUF_LEN+1];
XMLString::binToText(newPort, value1, BUF_LEN, 10, fMemoryManager);
ThrowXMLwithMemMgr2(MalformedURLException
, XMLExcepts::XMLNUM_URI_NullHost
@@ -1243,6 +1251,7 @@
}
else if (newPort != -1)
{
+ XMLCh value1[BUF_LEN+1];
XMLString::binToText(newPort, value1, BUF_LEN, 10, fMemoryManager);
ThrowXMLwithMemMgr1(MalformedURLException
, XMLExcepts::XMLNUM_URI_PortNo_Invalid
@@ -1453,6 +1462,7 @@
}
else
{
+ XMLCh value1[BUF_LEN+1];
value1[0] = chPercent;
value1[1] = *(tmpStr+1);
value1[2] = *(tmpStr+2);
1.24 +6 -3 xml-xerces/c/src/xercesc/util/XMLAbstractDoubleFloat.cpp
Index: XMLAbstractDoubleFloat.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLAbstractDoubleFloat.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLAbstractDoubleFloat.cpp 3 Jan 2004 00:03:18 -0000 1.23
+++ XMLAbstractDoubleFloat.cpp 12 Jan 2004 16:23:39 -0000 1.24
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.24 2004/01/12 16:23:39 neilg
+ * remove use of static buffers
+ *
* Revision 1.23 2004/01/03 00:03:18 peiyongz
* parseContent
*
@@ -155,7 +158,6 @@
// local data member
// ---------------------------------------------------------------------------
static const int BUF_LEN = 64;
-static XMLCh value1[BUF_LEN+1];
static XMLCh expSign[] = {chLatin_e, chLatin_E, chNull};
@@ -385,6 +387,7 @@
return INDETERMINATE;
default:
+ XMLCh value1[BUF_LEN+1];
XMLString::binToText(specialValue->fType, value1, 16, 10, manager);
ThrowXMLwithMemMgr1(NumberFormatException
, XMLExcepts::XMLNUM_DBL_FLT_InvalidType
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
