tng 2002/11/28 11:21:08
Modified: c/src/xercesc/util XMLString.cpp
Log:
Performance: Sometimes calling stringLen can help performance ....
Revision Changes Path
1.13 +12 -10 xml-xerces/c/src/xercesc/util/XMLString.cpp
Index: XMLString.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLString.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XMLString.cpp 28 Nov 2002 17:37:47 -0000 1.12
+++ XMLString.cpp 28 Nov 2002 19:21:08 -0000 1.13
@@ -618,17 +618,21 @@
*/
bool XMLString::isValidNCName(const XMLCh* const name) {
- if ( !name || !*name )
+ if (XMLString::stringLen(name) == 0
+ || XMLString::indexOf(name, chColon) != -1) {
return false;
+ }
const XMLCh* tempName = name;
XMLCh firstChar = *tempName++;
if (!XMLReader::isXMLLetter(firstChar) && firstChar != chUnderscore) {
+
return false;
}
while(*tempName) {
+
if (*tempName == chColon || !XMLReader::isNameChar(*tempName++)) {
return false;
}
@@ -646,7 +650,7 @@
*/
bool XMLString::isValidName(const XMLCh* const name) {
- if (!name || !*name)
+ if (XMLString::stringLen(name) == 0)
return false;
const XMLCh* tempName = name;
@@ -673,7 +677,7 @@
bool XMLString::isValidEncName(const XMLCh* const name)
{
- if (!name || !*name)
+ if ( XMLString::stringLen(name) == 0 )
return false;
const XMLCh* tempName = name;
@@ -707,9 +711,6 @@
*/
bool XMLString::isValidQName(const XMLCh* const name)
{
- if (!name)
- return false;
-
int strLen = XMLString::stringLen(name);
if (strLen == 0)
return false;
@@ -1167,10 +1168,12 @@
int XMLString::patternMatch( const XMLCh* const toSearch
, const XMLCh* const pattern)
{
- if (!toSearch || !*toSearch || !pattern || !*pattern)
+ if (!toSearch || !*toSearch )
return -1;
const int patnLen = XMLString::stringLen(pattern);
+ if ( !patnLen )
+ return -1;
const XMLCh* srcPtr = toSearch;
const XMLCh* patnStart = toSearch;
@@ -1589,11 +1592,10 @@
//
void XMLString::replaceWS(XMLCh* const toConvert)
{
- // If no string, then its a failure
- if (( !toConvert ) || ( !*toConvert ))
+ int strLen = XMLString::stringLen(toConvert);
+ if (strLen == 0)
return;
- int strLen = XMLString::stringLen(toConvert);
XMLCh* retBuf = new XMLCh[strLen+1];
XMLCh* retPtr = &(retBuf[0]);
XMLCh* startPtr = toConvert;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
