neilg 2004/01/12 08:25:10
Modified: c/src/xercesc/validators/datatype
AbstractStringValidator.cpp
DecimalDatatypeValidator.cpp
ListDatatypeValidator.cpp
UnionDatatypeValidator.cpp
Log:
remove use of static buffers
Revision Changes Path
1.20 +8 -3
xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp
Index: AbstractStringValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AbstractStringValidator.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractStringValidator.cpp 6 Jan 2004 18:13:59 -0000 1.19
+++ AbstractStringValidator.cpp 12 Jan 2004 16:25:09 -0000 1.20
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.20 2004/01/12 16:25:09 neilg
+ * remove use of static buffers
+ *
* Revision 1.19 2004/01/06 18:13:59 peiyongz
* using the no-exception-thrown ctor
*
@@ -158,10 +161,10 @@
XERCES_CPP_NAMESPACE_BEGIN
static const int BUF_LEN = 64;
-static XMLCh value1[BUF_LEN+1];
-static XMLCh value2[BUF_LEN+1];
#define REPORT_FACET_ERROR(val1, val2, except_code, manager) \
+ XMLCh value1[BUF_LEN+1]; \
+ XMLCh value2[BUF_LEN+1]; \
XMLString::binToText(val1, value1, BUF_LEN, 10, manager); \
XMLString::binToText(val2, value2, BUF_LEN, 10, manager); \
ThrowXMLwithMemMgr2(InvalidDatatypeFacetException \
@@ -171,6 +174,8 @@
, manager);
#define REPORT_VALUE_ERROR(data, val1, val2, except_code, manager) \
+ XMLCh value1[BUF_LEN+1]; \
+ XMLCh value2[BUF_LEN+1]; \
XMLString::binToText(val1, value1, BUF_LEN, 10, manager); \
XMLString::binToText(val2, value2, BUF_LEN, 10, manager); \
ThrowXMLwithMemMgr3(InvalidDatatypeValueException \
1.25 +22 -3
xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp
Index: DecimalDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DecimalDatatypeValidator.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DecimalDatatypeValidator.cpp 6 Jan 2004 18:13:59 -0000 1.24
+++ DecimalDatatypeValidator.cpp 12 Jan 2004 16:25:09 -0000 1.25
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.25 2004/01/12 16:25:09 neilg
+ * remove use of static buffers
+ *
* Revision 1.24 2004/01/06 18:13:59 peiyongz
* using the no-exception-thrown ctor
*
@@ -203,8 +206,6 @@
XERCES_CPP_NAMESPACE_BEGIN
static const int BUF_LEN = 64;
-static XMLCh value1[BUF_LEN+1];
-static XMLCh value2[BUF_LEN+1];
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -365,6 +366,8 @@
{
if ( fFractionDigits > fTotalDigits )
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(getFractionDigits(), value1, BUF_LEN, 10, manager);
XMLString::binToText(getTotalDigits(), value2, BUF_LEN, 10, manager);
ThrowXMLwithMemMgr2(InvalidDatatypeFacetException
@@ -395,6 +398,8 @@
if ( (( baseFacetsDefined & DatatypeValidator::FACET_TOTALDIGITS) != 0) &&
( fTotalDigits > numBase->fTotalDigits ))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(fTotalDigits, value1, BUF_LEN, 10, manager);
XMLString::binToText(numBase->fTotalDigits, value2, BUF_LEN, 10,
manager);
ThrowXMLwithMemMgr2(InvalidDatatypeFacetException
@@ -408,6 +413,8 @@
(( numBase->getFixed() & DatatypeValidator::FACET_TOTALDIGITS) != 0) &&
( fTotalDigits != numBase->fTotalDigits ))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(fTotalDigits, value1, BUF_LEN, 10, manager);
XMLString::binToText(numBase->fTotalDigits, value2, BUF_LEN, 10,
manager);
ThrowXMLwithMemMgr2(InvalidDatatypeFacetException
@@ -424,6 +431,8 @@
if ( (( baseFacetsDefined & DatatypeValidator::FACET_FRACTIONDIGITS) != 0)
&&
( fFractionDigits > numBase->fFractionDigits ))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(fFractionDigits, value1, BUF_LEN, 10, manager);
XMLString::binToText(numBase->fFractionDigits, value2, BUF_LEN, 10,
manager);
ThrowXMLwithMemMgr2(InvalidDatatypeFacetException
@@ -437,6 +446,8 @@
if ( (( baseFacetsDefined & DatatypeValidator::FACET_TOTALDIGITS) != 0) &&
( fFractionDigits > numBase->fTotalDigits ))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(fFractionDigits, value1, BUF_LEN, 10, manager);
XMLString::binToText(numBase->fTotalDigits, value2, BUF_LEN, 10,
manager);
ThrowXMLwithMemMgr2(InvalidDatatypeFacetException
@@ -451,6 +462,8 @@
(( numBase->getFixed() & DatatypeValidator::FACET_FRACTIONDIGITS) != 0)
&&
( fFractionDigits != numBase->fFractionDigits ))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(fFractionDigits, value1, BUF_LEN, 10, manager);
XMLString::binToText(numBase->fFractionDigits, value2, BUF_LEN, 10,
manager);
ThrowXMLwithMemMgr2(InvalidDatatypeFacetException
@@ -618,6 +631,8 @@
{
if ( compareData->getScale() > fFractionDigits )
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10,
manager);
XMLString::binToText(fFractionDigits, value2, BUF_LEN, 10, manager);
ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
@@ -633,6 +648,8 @@
{
if ( compareData->getTotalDigit() > fTotalDigits )
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(compareData->getTotalDigit(), value1, BUF_LEN,
10, manager);
XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
@@ -652,6 +669,8 @@
if ( compareData->getScale() > fTotalDigits )
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(compareData->getScale(), value1, BUF_LEN, 10,
manager);
XMLString::binToText(fTotalDigits, value2, BUF_LEN, 10, manager);
ThrowXMLwithMemMgr3(InvalidDatatypeFacetException
1.20 +11 -4
xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.cpp
Index: ListDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/ListDatatypeValidator.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ListDatatypeValidator.cpp 6 Jan 2004 18:13:59 -0000 1.19
+++ ListDatatypeValidator.cpp 12 Jan 2004 16:25:09 -0000 1.20
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.20 2004/01/12 16:25:09 neilg
+ * remove use of static buffers
+ *
* Revision 1.19 2004/01/06 18:13:59 peiyongz
* using the no-exception-thrown ctor
*
@@ -155,8 +158,6 @@
XERCES_CPP_NAMESPACE_BEGIN
static const int BUF_LEN = 64;
-static XMLCh value1[BUF_LEN+1];
-static XMLCh value2[BUF_LEN+1];
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -314,6 +315,8 @@
if (((thisFacetsDefined & DatatypeValidator::FACET_MAXLENGTH) != 0) &&
(tokenNumber > getMaxLength()))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(tokenNumber, value1, BUF_LEN, 10, manager);
XMLString::binToText(getMaxLength(), value2, BUF_LEN, 10, manager);
@@ -328,6 +331,8 @@
if (((thisFacetsDefined & DatatypeValidator::FACET_MINLENGTH) != 0) &&
(tokenNumber < getMinLength()))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(tokenNumber, value1, BUF_LEN, 10, manager);
XMLString::binToText(getMinLength(), value2, BUF_LEN, 10, manager);
@@ -342,6 +347,8 @@
if (((thisFacetsDefined & DatatypeValidator::FACET_LENGTH) != 0) &&
(tokenNumber != AbstractStringValidator::getLength()))
{
+ XMLCh value1[BUF_LEN+1];
+ XMLCh value2[BUF_LEN+1];
XMLString::binToText(tokenNumber, value1, BUF_LEN, 10, manager);
XMLString::binToText(AbstractStringValidator::getLength(), value2, BUF_LEN,
10, manager);
1.24 +6 -3
xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp
Index: UnionDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/UnionDatatypeValidator.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- UnionDatatypeValidator.cpp 6 Jan 2004 18:13:59 -0000 1.23
+++ UnionDatatypeValidator.cpp 12 Jan 2004 16:25:09 -0000 1.24
@@ -57,6 +57,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.24 2004/01/12 16:25:09 neilg
+ * remove use of static buffers
+ *
* Revision 1.23 2004/01/06 18:13:59 peiyongz
* using the no-exception-thrown ctor
*
@@ -158,7 +161,6 @@
XERCES_CPP_NAMESPACE_BEGIN
static const unsigned int BUF_LEN = 64;
-static XMLCh value1[BUF_LEN+1];
// ---------------------------------------------------------------------------
// Constructors and Destructor
@@ -227,6 +229,7 @@
if (baseValidator->getType() != DatatypeValidator::Union)
{
+ XMLCh value1[BUF_LEN+1];
XMLString::binToText(baseValidator->getType(), value1, BUF_LEN, 10,
manager);
ThrowXMLwithMemMgr1(InvalidDatatypeFacetException
, XMLExcepts::FACET_Union_invalid_baseValidatorType
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
