(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.77 and 1.87

version 1.77, 2003/09/10 19:40:16 version 1.87, 2003/11/20 23:49:55
Line 1 
Line 1 
 //%/////////////////////////////////////////////////////////////////////////////  //%2003////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software, Hewlett-Packard Company, IBM,  // Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development
 // The Open Group, Tivoli Systems  // Company, L. P., IBM Corp., The Open Group, Tivoli Systems.
   // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
   // IBM Corp.; EMC Corporation, The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 35 
Line 37 
 #include "InternalException.h" #include "InternalException.h"
 #include <iostream> #include <iostream>
 #include <fstream> #include <fstream>
 #ifndef PEGASUS_REMOVE_DEPRECATED  #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
 #include "System.h"  // for strcasecmp #include "System.h"  // for strcasecmp
 #endif #endif
  
Line 62 
Line 64 
  
 CString::CString(const CString& cstr) CString::CString(const CString& cstr)
 { {
       _rep = 0;
   
       if (cstr._rep)
       {
     _rep = (void*)new char[strlen((char*)cstr._rep)+1];     _rep = (void*)new char[strlen((char*)cstr._rep)+1];
     strcpy((char*)_rep, (char*)cstr._rep);     strcpy((char*)_rep, (char*)cstr._rep);
 } }
   }
  
 CString::CString(char* cstr) CString::CString(char* cstr)
     : _rep(cstr)     : _rep(cstr)
Line 74 
Line 81 
 CString::~CString() CString::~CString()
 { {
     if (_rep)     if (_rep)
       {
         delete [] (char*)_rep;         delete [] (char*)_rep;
 } }
   }
  
 CString& CString::operator=(const CString& cstr) CString& CString::operator=(const CString& cstr)
 { {
       if (&cstr != this)
       {
           if (_rep)
           {
               delete [] (char*)_rep;
               _rep = 0;
           }
           if (cstr._rep)
           {
     _rep = (char*)new char[strlen((char*)cstr._rep)+1];     _rep = (char*)new char[strlen((char*)cstr._rep)+1];
     strcpy((char*)_rep, (char*)cstr._rep);     strcpy((char*)_rep, (char*)cstr._rep);
           }
       }
     return *this;     return *this;
 } }
  
Line 234 
Line 254 
  
 String& String::operator=(const String& str) String& String::operator=(const String& str)
 { {
     return assign(str);      if (&str != this)
       {
           assign(str);
       }
       return *this;
 } }
  
 String& String::assign(const String& str) String& String::assign(const String& str)
Line 463 
Line 487 
 } }
  
 // ATTN-RK-P3-20020509: Define case-sensitivity for non-English characters // ATTN-RK-P3-20020509: Define case-sensitivity for non-English characters
   // ATTN-CEC-20030913: ICU code added, but uses the server's locale.  Look at adding
   // a toLower( ) with Locale parameter - like ICU's toLower( )
 void String::toLower() void String::toLower()
 { {
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
     Char16* utf16str;      UnicodeString UniStr((const UChar *)_rep->c16a.getData());
     UnicodeString UniStr((const UChar *)_rep->c16a.getData(), (int32_t)size());      UniStr.toLower();
     UniStr.append((UChar)'\0');     UniStr.append((UChar)'\0');
     UniStr = UniStr.toLower();  
     utf16str = (Char16 *)UniStr.getTerminatedBuffer();  
     assign(utf16str);  
     // DEVELOPER NOTE: do not delete utf16str, this is handled by ICU  
  
       assign((Char16*)UniStr.getBuffer());
 #else #else
     for (Char16* p = &_rep->c16a[0]; *p; p++)     for (Char16* p = &_rep->c16a[0]; *p; p++)
     {     {
Line 525 
Line 548 
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
     UnicodeString UniStr1((const UChar *)s1.getChar16Data(), (int32_t)s1.size());     UnicodeString UniStr1((const UChar *)s1.getChar16Data(), (int32_t)s1.size());
     UnicodeString UniStr2((const UChar *)s2.getChar16Data(), (int32_t)s2.size());     UnicodeString UniStr2((const UChar *)s2.getChar16Data(), (int32_t)s2.size());
     UniStr1 = UniStr1.toLower();      UniStr1.toLower();
     UniStr2 = UniStr2.toLower();      UniStr2.toLower();
     return (UniStr2.compare(UniStr1));     return (UniStr2.compare(UniStr1));
 #else #else
     const Char16* _s1 = s1.getChar16Data();     const Char16* _s1 = s1.getChar16Data();
Line 569 
Line 592 
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
     UnicodeString UniStr1((const UChar *)str1.getChar16Data(), (int32_t)str1.size());     UnicodeString UniStr1((const UChar *)str1.getChar16Data(), (int32_t)str1.size());
     UnicodeString UniStr2((const UChar *)str2.getChar16Data(), (int32_t)str2.size());     UnicodeString UniStr2((const UChar *)str2.getChar16Data(), (int32_t)str2.size());
     UniStr1 = UniStr1.toLower();      UniStr1.toLower();
     UniStr2 = UniStr2.toLower();      UniStr2.toLower();
     return (UniStr1 == UniStr2);     return (UniStr1 == UniStr2);
 #else #else
     if (str1.size() != str2.size())     if (str1.size() != str2.size())
Line 617 
Line 640 
  
     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);
  
Line 630 
Line 653 
  
 CString String::getCStringUTF8() const CString String::getCStringUTF8() const
 { {
     Uint32 n = 3*size();      Uint32 n = 3*size() + 1;
     char* str = new char[n];     char* str = new char[n];
  
     const Char16* msg16 = getChar16Data();     const Char16* msg16 = getChar16Data();
Line 684 
Line 707 
         special characters in the pattern: *?\[] (see the manual         special characters in the pattern: *?\[] (see the manual
         entry for details on what these mean).         entry for details on what these mean).
  
   
   Side effects: None.   Side effects: None.
  */  */
  
Line 876 
Line 900 
     os << utf8str;     os << utf8str;
  
 #elif defined(PEGASUS_HAS_ICU) #elif defined(PEGASUS_HAS_ICU)
           if(os == cout || os == cerr){
     char *buf = NULL;     char *buf = NULL;
     const int size = str.size() * 6;     const int size = str.size() * 6;
     UnicodeString UniStr((const UChar *)str.getChar16Data(), (int32_t)str.size());     UnicodeString UniStr((const UChar *)str.getChar16Data(), (int32_t)str.size());
Line 887 
Line 911 
     os << buf;     os << buf;
     os.flush();     os.flush();
     delete [] buf;     delete [] buf;
           }else{
                   CString cstr = str.getCStringUTF8();
           const char* utf8str = cstr;
           os << utf8str;
           }
  
 #else #else
   
   
     for (Uint32 i = 0, n = str.size(); i < n; i++)     for (Uint32 i = 0, n = str.size(); i < n; i++)
     {     {
         Uint16 code = str[i];         Uint16 code = str[i];
Line 937 
Line 964 
     return String::compare(str1, str2) >= 0;     return String::compare(str1, str2) >= 0;
 } }
  
 #ifndef PEGASUS_REMOVE_DEPRECATED  #ifdef PEGASUS_USE_DEPRECATED_INTERFACES
 int CompareNoCase(const char* s1, const char* s2) int CompareNoCase(const char* s1, const char* s2)
 { {
     return System::strcasecmp(s1, s2);     return System::strcasecmp(s1, s2);

Legend:
Removed from v.1.77  
changed lines
  Added in v.1.87
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2