tng         2002/09/24 13:19:34

  Modified:    c/src/xercesc/util XMLUri.cpp
  Log:
  Performance: check for null string directly isntead of calling XMLString::stringLen
  
  Revision  Changes    Path
  1.5       +7 -7      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLUri.cpp        23 Sep 2002 18:41:00 -0000      1.4
  +++ XMLUri.cpp        24 Sep 2002 20:19:34 -0000      1.5
  @@ -438,7 +438,7 @@
           // string or a fragment (e.g. "?y" or "#s") -
           // see <http://www.ics.uci.edu/~fielding/url/test1.html> which
           // identified this as a bug in the RFC
  -        if ((!fPath || XMLString::stringLen(fPath) == 0) &&
  +        if ((!fPath || !*fPath) &&
               fScheme == 0 &&
               fHost == 0)
           {
  @@ -483,7 +483,7 @@
           }
   
           // check for absolute path - RFC 2396 5.2 #5
  -        if (XMLString::stringLen(fPath) > 0 &&
  +        if ((fPath && *fPath) &&
               XMLString::startsWith(fPath, SINGLE_SLASH))
           {
               return;
  @@ -654,13 +654,13 @@
       ArrayJanitor<XMLCh> portName(portStr);
       int port = -1;
   
  -    if ((XMLString::stringLen(host) > 0) &&   // non empty host
  +    if ((host && *host) &&   // non empty host
           (index != -1)                    &&   // ":" found
           (start < end)                     )   // ":" is not the last
       {
           XMLString::subString(portStr, &(uriSpec[start]), 0, end-start);
   
  -        if (XMLString::stringLen(portStr) > 0)
  +        if (portStr && *portStr)
           {
               try
               {
  @@ -936,7 +936,7 @@
   
       //sometimes we get passed a empty string rather than a null.
       //Other procedures rely on it being null
  -    if(XMLString::stringLen(newUserInfo) > 0) {
  +    if(newUserInfo && *newUserInfo) {
           fUserInfo = XMLString::replicate(newUserInfo);
       }
   
  @@ -1246,7 +1246,7 @@
       XMLCh* tmpAddr = XMLString::replicate(addrString);
       ArrayJanitor<XMLCh>  janName(tmpAddr);
       XMLString::trim(tmpAddr);
  -    if ((XMLString::stringLen(tmpAddr) == 0) ||
  +    if ((!tmpAddr || !*tmpAddr) ||
           (XMLString::stringLen(tmpAddr) > 255) )
           return false;
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to