(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.83 and 1.88

version 1.83, 2003/10/13 17:20:00 version 1.88, 2004/02/19 21:33:01
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 462 
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 638 
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 916 
Line 918 
         }         }
  
 #else #else
         if(os == cout || os == cerr){  
         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 933 
Line 934 
                 os << buffer;                 os << buffer;
                 }                 }
         }         }
         }  
         /* the following commented out section should be looked at for 2.4  
         else{  
                 CString cstr = str.getCStringUTF8();  
         const char* utf8str = cstr;  
         os << utf8str;  
         }  
         */  
 #endif // End of PEGASUS_HAS_ICU #else leg. #endif // End of PEGASUS_HAS_ICU #else leg.
  
     return os;     return os;
Line 971 
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.83  
changed lines
  Added in v.1.88
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2