Resolve the "Klocwork" detected defect and add debug feature.

[platform/framework/native/appfw.git] / src / locales / FLclLocale.cpp

diff --git a/src/locales/FLclLocale.cpp b/src/locales/FLclLocale.cpp
index 6f7ee09..03ce769 100644 (file)
--- a/src/locales/FLclLocale.cpp
+++ b/src/locales/FLclLocale.cpp
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -33,10 +32,6 @@ using namespace Tizen::Base;
 
 namespace Tizen { namespace Locales
 {
-
-static const LanguageCode LanguageMaxReserved = static_cast <LanguageCode> (LANGUAGE_INVALID_RESERVED - 1);
-static const CountryCode CountryMaxReserved = static_cast <CountryCode> (COUNTRY_INVALID_RESERVED - 1);
-
 static const char* LanguageCodeString3LetterArray[LANGUAGE_MAX+2] =
 {
        "aar", /**< Afar */
@@ -810,19 +805,6 @@ Locale::Locale(LanguageCode languageCode, CountryCode countryCode, const String*
        , __countryCode((countryCode < COUNTRY_MAX && countryCode >= COUNTRY_AF) ? countryCode : COUNTRY_INVALID)
        , __pLocaleImpl(null)
 {
-       if (Tizen::App::_AppInfo::GetApiVersion() < _API_VERSION_2_1)
-       {
-               // LANGUAGE_INVALID_RESERVED-1 is LANGUAGE_MAX of tizen 2.0
-               if (__languageCode >= LanguageMaxReserved)
-               {
-                       __languageCode = LANGUAGE_INVALID;
-               }
-               // COUNTRY_INVALID_RESERVED-1 is COUNTRY_MAX of tizen 2.0
-               if (__countryCode >= CountryMaxReserved)
-               {
-                       __countryCode = COUNTRY_INVALID;
-               }
-       }
        const char* pLanguage = (__languageCode != LANGUAGE_INVALID) ? LanguageCodeString3LetterArray[__languageCode] : null;
        const char* pCountry = (__countryCode != COUNTRY_INVALID) ? CountryCodeString2LetterArray[__countryCode] : null;
 
@@ -990,12 +972,9 @@ Locale::GetHashCode(void) const
 LanguageCode
 Locale::StringToLanguageCode(const String& languageCodeString)
 {
-       LanguageCode invalidLanguageCode = LANGUAGE_INVALID;
-       LanguageCode maxLangageCode = LANGUAGE_MAX;
-
        if (!languageCodeString.IsEmpty())
        {
-               for (int i = 0; i < maxLangageCode; i++)
+               for (int i = 0; i < LANGUAGE_MAX; i++)
                {
                        if (languageCodeString == LanguageCodeString3LetterArray[i])
                        {
@@ -1008,19 +987,16 @@ Locale::StringToLanguageCode(const String& languageCodeString)
                SysLog(NID_LCL,"languageCodeString is empty string");
        }
 
-       return invalidLanguageCode;
+       return LANGUAGE_INVALID;
 }
 
 
 CountryCode
 Locale::StringToCountryCode(const String& countryCodeString)
 {
-       CountryCode invalidCountryCode = COUNTRY_INVALID;
-       CountryCode maxCountryCode = COUNTRY_MAX;
-
        if(!countryCodeString.IsEmpty())
        {
-               for (int i = 0; i < maxCountryCode; i++)
+               for (int i = 0; i < COUNTRY_MAX; i++)
                {
                        if (countryCodeString == CountryCodeString2LetterArray[i])
                        {
@@ -1033,7 +1009,7 @@ Locale::StringToCountryCode(const String& countryCodeString)
                SysLog(NID_LCL,"countryCodeString is empty string");
        }
 
-       return invalidCountryCode;
+       return COUNTRY_INVALID;
 }
 
 
@@ -1094,9 +1070,7 @@ Locale::ThreeLetterCountryCodeStringToCountryCode(const String& countryCodeStrin
 {
        if (countryCodeString.GetLength() == 3)
        {
-               CountryCode maxCountryCode = COUNTRY_MAX;
-
-               for (int i = 0; i < maxCountryCode; i++)
+               for (int i = 0; i < COUNTRY_MAX; i++)
                {
                        String countryCode(_LocaleImpl::Get3LetterCountryCodeString(CountryCodeString2LetterArray[i]));
                        if (countryCodeString.Equals(countryCode, false))
@@ -1105,7 +1079,6 @@ Locale::ThreeLetterCountryCodeStringToCountryCode(const String& countryCodeStrin
                        }
                }
        }
-
        return COUNTRY_INVALID;
 }