Merge "Update GetPackageAppInfoListN() API." into tizen_2.1

diff --git a/inc/FBaseColArrayList.h b/inc/FBaseColArrayList.h
index 1991f74..eef2c9c 100644 (file)
--- a/inc/FBaseColArrayList.h
+++ b/inc/FBaseColArrayList.h
@@ -92,7 +92,7 @@ namespace Tizen { namespace Base { namespace Collection
  *
  *             // Deallocates all objects
  *             // Because the destructor calls RemoveAll() internally, you do not need to call RemoveAll() to destroy all elements at the end.
- *             list.RemoveAll();
+ *             // list.RemoveAll();
  *     }
  * @endcode
  */

diff --git a/inc/FBaseColHashMap.h b/inc/FBaseColHashMap.h
index 9ce0f3a..8b011a6 100644 (file)
--- a/inc/FBaseColHashMap.h
+++ b/inc/FBaseColHashMap.h
@@ -85,8 +85,7 @@ class _HashMapEntry;
  *
  *             // Deallocates all objects
  *             // Because the destructor calls RemoveAll() internally, you do not need to call RemoveAll() to destroy all elements at the end.
- *             map.RemoveAll();
- *
+ *             // map.RemoveAll();
  *     }
  * @endcode
  */

diff --git a/inc/FBaseColLinkedList.h b/inc/FBaseColLinkedList.h
index 1dff891..19c49ac 100644 (file)
--- a/inc/FBaseColLinkedList.h
+++ b/inc/FBaseColLinkedList.h
@@ -87,7 +87,7 @@ class _ListNode;
  *
  *             // Deallocates all objects
  *             // Because the destructor calls RemoveAll() internally, you do not need to call RemoveAll() to destroy all elements at the end.
- *             list.RemoveAll();
+ *             // list.RemoveAll();
  *     }
  * @endcode
  */

diff --git a/inc/FBaseColMultiHashMap.h b/inc/FBaseColMultiHashMap.h
index 727ae4a..597d8d9 100644 (file)
--- a/inc/FBaseColMultiHashMap.h
+++ b/inc/FBaseColMultiHashMap.h
@@ -94,7 +94,7 @@ class _MultiHashMapEntry;
  *
  *             // Deallocates all objects
  *             // Because the destructor calls RemoveAll() internally, you do not need to call RemoveAll() to destroy all elements at the end.
- *             map.RemoveAll();
+ *             // map.RemoveAll();
  *     }
  * @endcode
  */

diff --git a/inc/FSecCertICertificateSelector.h b/inc/FSecCertICertificateSelector.h
index ce67118..88fce15 100644 (file)
--- a/inc/FSecCertICertificateSelector.h
+++ b/inc/FSecCertICertificateSelector.h
@@ -69,7 +69,7 @@ public:
         *
         * @param[in]   certificateType         The certificate type
         */
-       virtual void SetType(const CertificateType certificateType) = 0;
+       virtual void SetType(CertificateType certificateType) = 0;
 
 protected:
        //

diff --git a/inc/FSecCertX509CertificateSelector.h b/inc/FSecCertX509CertificateSelector.h
index 7b02597..c78438e 100644 (file)
--- a/inc/FSecCertX509CertificateSelector.h
+++ b/inc/FSecCertX509CertificateSelector.h
@@ -79,7 +79,7 @@ public:
         *
         * @param[in]   certificateType         The certificate type
         */
-       virtual void SetType(const CertificateType certificateType);
+       virtual void SetType(CertificateType certificateType);
 
 private:
        X509CertificateSelector(const X509CertificateSelector& rhs);

diff --git a/src/base/runtime/FBaseRt_MutexImpl.cpp b/src/base/runtime/FBaseRt_MutexImpl.cpp
index 3611f4a..6a9f206 100755 (executable)
--- a/src/base/runtime/FBaseRt_MutexImpl.cpp
+++ b/src/base/runtime/FBaseRt_MutexImpl.cpp
@@ -85,11 +85,7 @@ _MutexImpl::CreateNonRecursiveMutex(void)
        return E_SUCCESS;
 
 CATCH:
-       if (pMutex != null)
-       {
-               free(pMutex);
-       }
-
+       free(pMutex);
        return r;
 
 }

diff --git a/src/locales/FLcl_LocaleManagerImpl.cpp b/src/locales/FLcl_LocaleManagerImpl.cpp
index 2c4b365..ff97ee7 100644 (file)
--- a/src/locales/FLcl_LocaleManagerImpl.cpp
+++ b/src/locales/FLcl_LocaleManagerImpl.cpp
@@ -479,6 +479,8 @@ _LocaleManagerImpl::GetSystemTimeZone(void)
 {
        char tz[PATH_MAX + 1];
        int len = readlink("/opt/etc/localtime", tz, PATH_MAX);
+
+       SysTryReturn(NID_LCL, len > 0, TimeZone(-1, ""), E_SYSTEM, "It is failed to get System Time Zone");
        tz[len] = '\0';
        SysTryReturn(NID_LCL, len > 20, TimeZone(-1, ""), E_SYSTEM, "It is failed to get System Time Zone");