pegasus/src/Pegasus/Common/String.cpp - diff

Return to String.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/String.cpp between version 1.124 and 1.134

version 1.124, 2007/01/02 19:41:23

version 1.134, 2008/12/02 09:00:52

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

// IBM Corp.; EMC Corporation, The Open Group.

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; Symantec 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

// of this software and associated documentation files (the "Software"), to

// copy of this software and associated documentation files (the "Software"),

// deal in the Software without restriction, including without limitation the

// to deal in the Software without restriction, including without limitation

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// sell copies of the Software, and to permit persons to whom the Software is

// and/or sell copies of the Software, and to permit persons to whom the

// furnished to do so, subject to the following conditions:

// Software is furnished to do so, subject to the following conditions:

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// The above copyright notice and this permission notice shall be included

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// in all copies or substantial portions of the Software.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//==============================================================================

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//////////////////////////////////////////////////////////////////////////

//%/////////////////////////////////////////////////////////////////////////////

Line 39

Line 37

#include "StringRep.h"

#ifdef PEGASUS_HAS_ICU

# include <unicode/ures.h>

#include <unicode/ustring.h>

#include <unicode/uchar.h>

#endif

Line 268

Line 267

return 0;

}

#ifdef PEGASUS_STRING_NO_UTF8

static int _compareNoUTF8(const Uint16* s1, const char* s2)

{

Uint16 c1;

Line 285

return c1 - c2;

}

#endif

static inline void _copy(Uint16* s1, const Uint16* s2, size_t n)

{

Line 579

Line 580

if (rep->size == size_t(-1))

{

StringRep::free(rep);

_StringThrowBadUTF8(utf8_error_index);

_StringThrowBadUTF8((Uint32)utf8_error_index);

}

rep->data[rep->size] = '\0';

Line 596

Line 597

while (*end++)

;

return end - str - 1;

return (Uint32)(end - str - 1);

}

//==============================================================================

Line 669

Line 670

{

StringRep::free(_rep);

_rep = &StringRep::_emptyRep;

_StringThrowBadUTF8(utf8_error_index);

_StringThrowBadUTF8((Uint32)utf8_error_index);

}

_rep->size = n1 + tmp;

Line 689

Line 690

{

StringRep::free(_rep);

_rep = &StringRep::_emptyRep;

_StringThrowBadUTF8(utf8_error_index);

_StringThrowBadUTF8((Uint32)utf8_error_index);

}

_rep->size = n2 + tmp;

Line 742

Line 743

{

StringRep::free(_rep);

_rep = &StringRep::_emptyRep;

_StringThrowBadUTF8(utf8_error_index);

_StringThrowBadUTF8((Uint32)utf8_error_index);

}

_rep->data[_rep->size] = 0;

Line 788

Line 789

str[_rep->size] = '\0';

return CString(str);

#else

Uint32 n = 3 * _rep->size;

Uint32 n = (Uint32)(3 * _rep->size);

char* str = (char*)operator new(n + 1);

size_t size = _copyToUTF8(str, _rep->data, _rep->size);

str[size] = '\0';

Line 802

Line 803

size_t oldSize = _rep->size;

size_t newSize = oldSize + n;

_reserve(_rep, newSize);

_reserve(_rep, (Uint32)newSize);

_copy(_rep->data + oldSize, (Uint16*)str, n);

_rep->size = newSize;

_rep->data[newSize] = '\0';

Line 812

Line 813

String& String::append(const String& str)

{

return append((Char16*)(&(str._rep->data[0])), str._rep->size);

return append((Char16*)(&(str._rep->data[0])), (Uint32)str._rep->size);

}

String& String::append(const char* str, Uint32 size)

Line 822

Line 823

size_t oldSize = _rep->size;

size_t cap = oldSize + size;

_reserve(_rep, cap);

_reserve(_rep, (Uint32)cap);

size_t utf8_error_index;

size_t tmp = _convert(

(Uint16*)_rep->data + oldSize, str, size, utf8_error_index);

Line 831

Line 832

{

StringRep::free(_rep);

_rep = &StringRep::_emptyRep;

_StringThrowBadUTF8(utf8_error_index);

_StringThrowBadUTF8((Uint32)utf8_error_index);

}

_rep->size += tmp;

Line 843

Line 844

void String::remove(Uint32 index, Uint32 n)

{

if (n == PEG_NOT_FOUND)

n = _rep->size - index;

n = (Uint32)(_rep->size - index);

_checkBounds(index + n, _rep->size);

Line 870

Line 871

if (index < _rep->size)

{

if (n == PEG_NOT_FOUND || n > _rep->size - index)

n = _rep->size - index;

n = (Uint32)(_rep->size - index);

return String((Char16*)(_rep->data + index), n);

}

Line 1232

Line 1233

Boolean String::equal(const String& s1, const String& s2)

{

return s1._rep->size == s2._rep->size && memcmp(s1._rep->data,

return (s1._rep == s2._rep) ||

s2._rep->data, s1._rep->size * sizeof(Uint16)) == 0;

(s1._rep->size == s2._rep->size) &&

memcmp(s1._rep->data,

s2._rep->data,

s1._rep->size * sizeof(Uint16)) == 0;

}

Boolean String::equal(const String& s1, const char* s2)

Line 1262

Line 1266

PEGASUS_STD(ostream)& operator<<(PEGASUS_STD(ostream)& os, const String& str)

{

#if defined(PEGASUS_OS_OS400)

CString cstr = str.getCString();

const char* utf8str = cstr;

os << utf8str;

return os;

#else

#if defined(PEGASUS_HAS_ICU)

if (InitializeICU::initICUSuccessful())

Line 1305

Line 1301

}

return os;

#endif // PEGASUS_OS_OS400

}

void StringAppendCharAux(StringRep*& _rep)

Line 1328

Line 1323

_rep = tmp;

}

void AssignASCII(String& s, const char* str, Uint32 n)

{

class StringLayout

{

public:

StringRep* rep;

};

StringLayout* that = reinterpret_cast<StringLayout*>(&s);

_checkNullPointer(str);

if (n > that->rep->cap || that->rep->refs.get() != 1)

{

StringRep::unref(that->rep);

that->rep = StringRep::alloc(n);

}

_copy(that->rep->data, str, n);

that->rep->size = n;

that->rep->data[that->rep->size] = 0;

}

PEGASUS_NAMESPACE_END

Line 1456

Line 1474

This avoids slower UTF8 processing when not needed.

================================================================================

TO-DO:

(+) [DONE] Use PEGASUS_USE_EXPERIMENTAL_INTERFACES

(+) [DONE] Submit BUG-2754 (Windows buffer limit).

(+) [DONE] Eliminate char versions of find() and append().

(+) [DONE] Remove PEGASUS_MAX_PRINTABLE_CHARACTER from Config.h

(+) [DONE] Change _next_pow_2() to _roundUpToPow2().

(+) [DONE] Change '99' to '2' in StringRep constructor (comment as well).

(+) [DONE] Comment StringRep allocation layout.

(+) [DONE] Conceal private inline functions.

(+) [DONE] Shorten inclusion of StringInline.h in String.h.

(+) [DONE] Change USE_INTERNAL_INLINE TO DISABLE_INTERNAL_INLINE or get

rid of altogether.

(+) [DONE] useCamelNotationOnAllFunctionNames.

(+) [DONE] Check for overlow condition in StringRep::alloc().

(+) [DONE] Remove tabs (used vim ":set expandtab" and ":retab").

(+) [DONE] Fix throw-related memory leak.

(+) [DONE] Look at PEP223 for coding security guidelines.

(+) [DONE] Use old AtomicInt for now (new AtomicInt part of bug #4250).

(+) [DONE] Removed appendASCII() and the ASCII form of the constructor.

(+) DOC++ String.h - will open new bug?

(+) Added PEGASUS_DISABLE_INTERNAL_INLINES macro (to permit suppression

on certain platforms).

================================================================================

Legend:

Removed from v.1.124
changed lines
	Added in v.1.134

No CVS admin address has been configured