[content] Fix null check codes

[platform/framework/native/content.git] / src / FCnt_ContentSearchImpl.cpp

diff --git a/src/FCnt_ContentSearchImpl.cpp b/src/FCnt_ContentSearchImpl.cpp
index 3ef0155..fe20dfc 100644 (file)
--- a/src/FCnt_ContentSearchImpl.cpp
+++ b/src/FCnt_ContentSearchImpl.cpp
@@ -21,8 +21,6 @@
  * This file contains implementation of the %_ContentSearchImpl class.\r
  */\r
 \r
-// includes\r
-\r
 #include <time.h>\r
 #include <FBaseSysLog.h>\r
 #include <FBaseInteger.h>\r
@@ -36,7 +34,6 @@
 #include <FCnt_ContentUtility.h>\r
 #include <FCnt_ContentSearchImpl.h>\r
 \r
-// using namespace\r
 using namespace Tizen::Base;\r
 using namespace Tizen::Base::Collection;\r
 using namespace Tizen::Base::Utility;\r
@@ -175,15 +172,12 @@ _ContentSearchImpl::CreateQueryFilter(bool isAndAppendReq) const
        {\r
                //CopyToCharArrayN: utility function, converts a osp string to char*\r
                pInputCond = std::unique_ptr<char[]>(_StringConverter::CopyToCharArrayN(inputCondition));\r
-               SysTryReturnResult(NID_CNT, (pInputCond.get())[0], E_OUT_OF_MEMORY, "pInputCond is NULL.");\r
+               SysTryReturnResult(NID_CNT, pInputCond, E_OUT_OF_MEMORY, "pInputCond is NULL.");\r
 \r
                SysLog(NID_CNT, "pInputCond = %s", pInputCond.get());\r
 \r
-               if ((pInputCond.get())[0])\r
-               {\r
-                       ret = media_filter_set_condition(*(pFilterHandle.get()), pInputCond.get(), MEDIA_CONTENT_COLLATE_DEFAULT);\r
-                       SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, E_SYSTEM, "Failed to perform media_filter_set_condition operation.");\r
-               }\r
+               ret = media_filter_set_condition(*(pFilterHandle.get()), pInputCond.get(), MEDIA_CONTENT_COLLATE_DEFAULT);\r
+               SysTryReturnResult(NID_CNT, ret == MEDIA_CONTENT_ERROR_NONE, E_SYSTEM, "Failed to perform media_filter_set_condition operation.");\r
        }\r
 \r
        if (!__inputColumnName.IsEmpty()) // SortColumn is optional in case of SearchN\r
@@ -195,7 +189,7 @@ _ContentSearchImpl::CreateQueryFilter(bool isAndAppendReq) const
                //CopyToCharArrayN: utility function, converts a osp string to char*\r
 \r
                pSortCol = std::unique_ptr<char[]>(_StringConverter::CopyToCharArrayN(slpColumn));\r
-               SysTryReturnResult(NID_CNT, (pSortCol.get())[0], E_OUT_OF_MEMORY, "pSortCol is NULL.");\r
+               SysTryReturnResult(NID_CNT, pSortCol, E_OUT_OF_MEMORY, "pSortCol is NULL.");\r
 \r
                if (__inputSortOrder == SORT_ORDER_ASCENDING)\r
                {\r
@@ -348,7 +342,7 @@ _ContentSearchImpl::ReplaceOspColumnNameWithSlp(void) const
        SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "AppendEscapeKeywordForLikeQuery failed.");\r
 \r
        r = ReplaceDateTimeStringWithInt();\r
-       SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "ReplaceDateTimeStringWithInt failed.");\r
+       SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_INVALID_ARG, "ReplaceDateTimeStringWithInt failed.");\r
 \r
        // replace splApostrophe string with actual\r
        r = __inputExpr.Replace(splApostrophe, "''");\r
@@ -450,7 +444,7 @@ _ContentSearchImpl::ReplaceDateTimeStringWithInt(void) const
        while (strTok.HasMoreTokens())\r
        {\r
                r = strTok.GetNextToken(token);\r
-               SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "GetNextToken failed.");\r
+               SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "GetNextToken failed.");\r
                if (isCol) //column name\r
                {\r
                        isCol = false;\r
@@ -476,19 +470,21 @@ _ContentSearchImpl::ReplaceDateTimeStringWithInt(void) const
                                        isConvertReq = false;\r
                                }\r
                        }\r
+\r
                        r = inputExpr.Append(token);\r
-                       SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "string append failed.");\r
+                       SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "string append failed.");\r
                }\r
                else // value of the column\r
                {\r
                        isCol = true;\r
                        r = inputExpr.Append("'");\r
-                       SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "string append failed.");\r
+                       SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "string append failed.");\r
 \r
                        if (isConvertReq)\r
                        {\r
                                Tizen::Base::DateTime dt;\r
-                               Tizen::Base::DateTime::Parse(token, dt);\r
+                               r = Tizen::Base::DateTime::Parse(token, dt);\r
+                               SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "Failed to parse DateTime.");\r
 \r
                                int year = dt.GetYear();\r
                                int month = dt.GetMonth(); \r
@@ -497,7 +493,7 @@ _ContentSearchImpl::ReplaceDateTimeStringWithInt(void) const
                                int minute = dt.GetMinute(); \r
                                int second = dt.GetSecond();\r
                                \r
-                                time_t rawTime;\r
+                               time_t rawTime;\r
                                struct tm* timeInfo;\r
 \r
                                time(&rawTime);\r
@@ -510,24 +506,27 @@ _ContentSearchImpl::ReplaceDateTimeStringWithInt(void) const
                                timeInfo->tm_sec = second;\r
 \r
                                time_t seconds = mktime(timeInfo);\r
+                               SysTryReturnResult(NID_CNT, seconds != -1, E_INVALID_ARG, "Failed to convert DateTime to broken-down time.");\r
+\r
                                long long ticksInSeconds = (long long)seconds;\r
 \r
                                r = inputExpr.Append(ticksInSeconds);\r
-                               SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "string append failed.");\r
+                               SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "string append failed.");\r
                        }\r
                        else\r
                        {\r
                                r = inputExpr.Append(token);\r
-                               SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "string append failed.");\r
+                               SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "string append failed.");\r
                        }\r
+\r
                        r = inputExpr.Append("'");\r
-                       SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "string append failed.");\r
+                       SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "string append failed.");\r
                }\r
        }\r
 \r
        __inputExpr.Clear();\r
        r = __inputExpr.Insert(inputExpr, 0);\r
-       SysTryReturnResult(NID_CNT, r == E_SUCCESS, E_SYSTEM, "string insert failed.");\r
+       SysTryReturnResult(NID_CNT, r == E_SUCCESS, r, "string insert failed.");\r
 \r
        return r;\r
 }\r