(file) Return to String.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/String.cpp between version 1.86 and 1.87.6.2

version 1.86, 2003/11/15 02:49:54 version 1.87.6.2, 2004/02/20 15:51:26
Line 464 
Line 464 
             Uint32 i = 1;             Uint32 i = 1;
             for (; i < subStrLen; i++)             for (; i < subStrLen; i++)
                 if (*pStr++ != *p++ )                 if (*pStr++ != *p++ )
                     {pStr--; break;} // break from loop                      {pStr-=i; break;} // break from loop
             if (i == subStrLen)             if (i == subStrLen)
                 return loc;                 return loc;
         }         }
Line 550 
Line 550 
     UnicodeString UniStr2((const UChar *)s2.getChar16Data(), (int32_t)s2.size());     UnicodeString UniStr2((const UChar *)s2.getChar16Data(), (int32_t)s2.size());
     UniStr1.toLower();     UniStr1.toLower();
     UniStr2.toLower();     UniStr2.toLower();
     return (UniStr2.compare(UniStr1));  
       // Note:  the ICU 2.6.1 documentation for UnicodeString::compare( ) is
       // backwards!  The API actually returns +1 if this is greater than text.
       // This is why the line below appears wrong based on the 2.6.1 docs.
       // (ref. bugzilla 1207)
       return (UniStr1.compare(UniStr2));
 #else #else
     const Char16* _s1 = s1.getChar16Data();     const Char16* _s1 = s1.getChar16Data();
     const Char16* _s2 = s2.getChar16Data();     const Char16* _s2 = s2.getChar16Data();
Line 640 
Line 645 
  
     Uint32 count;     Uint32 count;
  
     for(count = 0; ((msg16[count]) != Char16(0x00)) && (count <= n); ++count);      for(count = 0; ((msg16[count]) != Char16(0x00)) && (count < (n - 1)); ++count);
  
     _rep->c16a.append(msg16, count);     _rep->c16a.append(msg16, count);
  


Legend:
Removed from v.1.86  
changed lines
  Added in v.1.87.6.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2