[2.2.1] Remove error check code in CopyCtor of String
authordahyeong.kim <dahyeong.kim@samsung.com>
Wed, 24 Jul 2013 06:23:31 +0000 (15:23 +0900)
committerdahyeong.kim <dahyeong.kim@samsung.com>
Wed, 24 Jul 2013 08:12:49 +0000 (17:12 +0900)
Change-Id: Ib58980c2d0ccfd3936a36b89a16e9266d8c5a9a5
Signed-off-by: dahyeong.kim <dahyeong.kim@samsung.com>
src/base/FBaseString.cpp

index ed75249..0e40454 100644 (file)
@@ -98,11 +98,6 @@ String::String(const wchar_t* pValue)
        , __pValue(null)
        , __pStringImpl(null)
 {
-       int length = (pValue != null) ? wcslen(pValue) : 0;
-
-       SysTryReturnVoidResult(NID_BASE, length >= 0, E_OUT_OF_RANGE,
-               "String has wrong length. The length has to be more bigger than 0.");
-
        if (pValue == null)
        {
                result r = InitializeToDefault(DEFAULT_CAPACITY);
@@ -110,6 +105,7 @@ String::String(const wchar_t* pValue)
        }
        else
        {
+               int length = wcslen(pValue);
                result r = InitializeToDefault(length + DEFAULT_CAPACITY);
                SysTryReturnVoidResult(NID_BASE, r == E_SUCCESS, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
@@ -156,8 +152,6 @@ String::String(const String& value)
        , __pValue(null)
        , __pStringImpl(null)
 {
-       SysTryReturnVoidResult(NID_BASE, value.__length >= 0, E_OUT_OF_RANGE, "The length has to be greater than 0.");
-
        if (*(value.__pRefCount) != UNSHAREABLE)
        {
                _String::AtomicInc(value.__pRefCount);
@@ -171,9 +165,6 @@ String::String(const String& value)
        {
                int length = wcslen(value.__pValue);
 
-               SysTryReturnVoidResult(NID_BASE, length >= 0, E_OUT_OF_RANGE,
-                       "String has wrong length. The length has to be more bigger than 0.");
-
                result r = InitializeToDefault(length + DEFAULT_CAPACITY);
                SysTryReturnVoidResult(NID_BASE, r == E_SUCCESS, E_OUT_OF_MEMORY, "Memory allocation failed.");
 
@@ -625,9 +616,9 @@ String::IndexOf(wchar_t ch, int startIndex, int& indexOf) const
 result
 String::IndexOf(const String& str, int startIndex, int& indexOf) const
 {
-       SysTryReturnResult(NID_BASE, (startIndex < __length), E_OUT_OF_RANGE,
+       SysTryReturnResult(NID_BASE, startIndex < __length, E_OUT_OF_RANGE,
                "The startIndex(%d) MUST be less than the length of this string(%d).", startIndex, __length);
-       SysTryReturnResult(NID_BASE, (startIndex >= 0), E_OUT_OF_RANGE,
+       SysTryReturnResult(NID_BASE, startIndex >= 0, E_OUT_OF_RANGE,
                "The startIndex(%d) MUST be greater than or equal to 0.", startIndex);
 
        if (str.IsEmpty())