Remove privacy string

Change-Id: I0e913cf72477cecee477ad3a0c3039fda864f48b
Signed-off-by: Hyunbin Lee <hyunbin.lee@samsung.com>

diff --git a/src/app/FApp_AppImpl.cpp b/src/app/FApp_AppImpl.cpp
index 0d2e32f..4c838f3 100644 (file)
--- a/src/app/FApp_AppImpl.cpp
+++ b/src/app/FApp_AppImpl.cpp
@@ -889,7 +889,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
                pSqlListener->OnSqlDataControlSelectRequestReceived(reqId, providerId, *pDataId, pColumnList,
                                pWhere, pOrder);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, pColumnList: 0x%0x, pWhere: 0x%x, pOrder: 0x%x, pageNo: %d, countPerPage: %d",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, pColumnList: 0x%0x, pWhere: 0x%x, pOrder: 0x%x, pageNo: %d, countPerPage: %d",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pColumnList, pWhere, pOrder, pageNo, countPerPage);
                break;
@@ -925,7 +925,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
 
                pSqlListener->OnSqlDataControlInsertRequestReceived(reqId, providerId, *pDataId, *pInsertMap);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, pInsertMap: 0x%x",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, pInsertMap: 0x%x",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pInsertMap);
                break;
@@ -974,7 +974,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
 
                pSqlListener->OnSqlDataControlUpdateRequestReceived(reqId, providerId, *pDataId, *pUpdateMap, pWhere);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, pUpdateMap: 0x%x, pWhere: 0x%x",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, pUpdateMap: 0x%x, pWhere: 0x%x",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pUpdateMap, pWhere);
                break;
@@ -996,7 +996,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
 
                pSqlListener->OnSqlDataControlDeleteRequestReceived(reqId, providerId, *pDataId, pWhere);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, pWhere: 0x%x",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, pWhere: 0x%x",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pWhere);
                break;
@@ -1013,7 +1013,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
 
                pMapListener->OnMapDataControlGetValueRequestReceived(reqId, providerId, *pDataId, *pKey);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, key: %ls, pageNo: %d, countPerPage: %d",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, key: %ls, pageNo: %d, countPerPage: %d",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pKey->GetPointer(), pageNo, countPerPage);
                break;
@@ -1025,7 +1025,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
 
                pMapListener->OnMapDataControlAddValueRequestReceived(reqId, providerId, *pDataId, *pKey, *pValue);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, key: %ls, value: %ls",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, key: %ls, value: %ls",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pKey->GetPointer(), pValue->GetPointer());
                break;
@@ -1040,7 +1040,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
 
                pMapListener->OnMapDataControlSetValueRequestReceived(reqId, providerId, *pDataId, *pKey, *pOldValue, *pNewValue);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, key: %ls, oldValue: %ls, newValue: %ls",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, key: %ls, oldValue: %ls, newValue: %ls",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pKey->GetPointer(), pOldValue->GetPointer(), pNewValue->GetPointer());
                break;
@@ -1052,7 +1052,7 @@ _AppImpl::OnDataControlRequestReceived(const _AppArg& arg, RequestId reqId)
 
                pMapListener->OnMapDataControlRemoveValueRequestReceived(reqId, providerId, *pDataId, *pKey, *pValue);
 
-               SysLog(NID_APP, "[DC_PROV_RECV] caller appId: %ls, requestType: %d, caller reqId: %ls, providerId: %ls, dataId: %ls, key: %ls, value: %ls",
+               SysLog(NID_APP, "[DC_PROV_RECV] caller app: %ls, requestType: %d, caller req: %ls, provider: %ls, data: %ls, key: %ls, value: %ls",
                                appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(),
                                pDataId->GetPointer(), pKey->GetPointer(), pValue->GetPointer());
                break;

diff --git a/src/app/FApp_DataControlProviderManagerImpl.cpp b/src/app/FApp_DataControlProviderManagerImpl.cpp
index b0d431d..544c19c 100644 (file)
--- a/src/app/FApp_DataControlProviderManagerImpl.cpp
+++ b/src/app/FApp_DataControlProviderManagerImpl.cpp
@@ -105,7 +105,7 @@ _DataControlProviderManagerImpl::SendDataControlResult(RequestId reqId, _DataCon
 
        _ResultInfo* pResultInfo = pAppMgr->__resultManager.FindItem(static_cast< int >(reqId)); // provider reqId
        SysTryReturnResult(NID_APP, pResultInfo, E_OBJ_NOT_FOUND,
-                       "The data control request specified with the reqId (%ld) did not exist.", reqId);
+                       "The data control request specified with the req (%ld) did not exist.", reqId);
 
        const _AppArg& arg = pResultInfo->arg; // request info
 
@@ -139,7 +139,7 @@ _DataControlProviderManagerImpl::SendDataControlResult(RequestId reqId, _DataCon
        pDataId = dynamic_cast< String* >(pList->GetAt(0)); // request list[0]
        SysTryCatch(NID_APP, pDataId, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] invalid result object");
 
-       SysLog(NID_APP, "[DC_PROV_SEND] > appId: %ls, requestType: %d, callerReqId: %ls, providerId: %ls, dataId: %ls",
+       SysLog(NID_APP, "[DC_PROV_SEND] > app: %ls, requestType: %d, callerReq: %ls, provider: %ls, data: %ls",
                        appId.GetPointer(), requestType, callerReqId.GetPointer(), providerId.GetPointer(), pDataId->GetPointer());
 
        // Serializes result

diff --git a/src/app/FApp_MapDataControlImpl.cpp b/src/app/FApp_MapDataControlImpl.cpp
index 261520f..1e4746a 100755 (executable)
--- a/src/app/FApp_MapDataControlImpl.cpp
+++ b/src/app/FApp_MapDataControlImpl.cpp
@@ -266,7 +266,7 @@ _MapDataControlImpl::GetValue(const String& dataId, const String& key,
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, key: %ls, reqId: %d, pageNo: %d, countPerPage: %d",
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, key: %ls, req: %d, pageNo: %d, countPerPage: %d",
                        dataId.GetPointer(), key.GetPointer(), reqId, pageNo, countPerPage);
 
        // fall through
@@ -360,7 +360,7 @@ _MapDataControlImpl::MapDataControlCallback(void* data, _AppArg* pArg, _AppArg*
                        SysTryCatch(NID_APP, pDataId, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                                        "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-                       SysLog(NID_APP, "[DC_CALLER_RECV] provider result: %ld, requestType: %d, reqId: %d, providerId: %ls, dataId: %ls, errorMsg: %ls ",
+                       SysLog(NID_APP, "[DC_CALLER_RECV] provider result: %ld, requestType: %d, req: %d, provider: %ls, data: %ls, errorMsg: %ls ",
                                        providerRes, requestType, reqId, pProviderId->GetPointer(), pDataId->GetPointer(), pErrorMsg->GetPointer());
 
                        switch (static_cast< _DataControlRequestType >(requestType))
@@ -447,7 +447,7 @@ _MapDataControlImpl::MapDataControlCallback(void* data, _AppArg* pArg, _AppArg*
        launchReqId = atoi(p);
 
        // Remove the request count
-       SysLog(NID_APP, "Remove a launch request: reqId: %d", launchReqId);
+       SysLog(NID_APP, "Remove a launch request: req: %d", launchReqId);
        _AppControlManager::GetInstance()->RemoveLaunchRequest(launchReqId);
 
        return E_SUCCESS;
@@ -491,7 +491,7 @@ _MapDataControlImpl::AddValue(const String& dataId, const String& key,
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, key: %ls, value: %ls, reqId: %d",
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, key: %ls, value: %ls, req: %d",
                        dataId.GetPointer(), key.GetPointer(), value.GetPointer(), reqId);
 
        // fall through
@@ -532,7 +532,7 @@ _MapDataControlImpl::SetValue(const String& dataId, const String& key,
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, key: %ls, oldValue: %ls, newValue: %ls, reqId: %d",
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, key: %ls, oldValue: %ls, newValue: %ls, req: %d",
                        dataId.GetPointer(), key.GetPointer(), oldValue.GetPointer(), newValue.GetPointer(), reqId);
 
        // fall through
@@ -571,7 +571,7 @@ _MapDataControlImpl::RemoveValue(const String& dataId, const String& key,
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, key: %ls, value: %ls, reqId: %d",
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, key: %ls, value: %ls, req: %d",
                        dataId.GetPointer(), key.GetPointer(), value.GetPointer(), reqId);
 
        // fall through

diff --git a/src/app/FApp_SqlDataControlImpl.cpp b/src/app/FApp_SqlDataControlImpl.cpp
index 69daf60..bfeea90 100755 (executable)
--- a/src/app/FApp_SqlDataControlImpl.cpp
+++ b/src/app/FApp_SqlDataControlImpl.cpp
@@ -314,7 +314,7 @@ _SqlDataControlImpl::Select(const String& dataId, const IList* pColumnList, cons
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, pColumnList: 0x%x, pWhere: 0x%x, pOrder: 0x%x, reqId: %d, pageNo: %d, countPerPage: %d",
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, pColumnList: 0x%x, pWhere: 0x%x, pOrder: 0x%x, req: %d, pageNo: %d, countPerPage: %d",
                        dataId.GetPointer(), pColumnList, pWhere, pOrder, reqId, pageNo, countPerPage);
 
        // fall through
@@ -406,7 +406,7 @@ _SqlDataControlImpl::SqlDataControlCallback(void* data, _AppArg* pArg, _AppArg*
                        SysTryCatch(NID_APP, pDataId, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,
                                        "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-                       SysLog(NID_APP, "[DC_CALLER_RECV] provider result: %ld, requestType: %d, reqId: %d, providerId: %ls, dataId: %ls, errorMsg: %ls ",
+                       SysLog(NID_APP, "[DC_CALLER_RECV] provider result: %ld, requestType: %d, req: %d, provider: %ls, data: %ls, errorMsg: %ls ",
                                        providerRes, requestType, reqId, pProviderId->GetPointer(), pDataId->GetPointer(), pErrorMsg->GetPointer());
 
                        switch (static_cast <_DataControlRequestType>(requestType))
@@ -495,7 +495,7 @@ _SqlDataControlImpl::SqlDataControlCallback(void* data, _AppArg* pArg, _AppArg*
        launchReqId = atoi(p);
 
        // Remove the request count
-       SysLog(NID_APP, "Remove a launch request: reqId: %d", launchReqId);
+       SysLog(NID_APP, "Remove a launch request: req: %d", launchReqId);
        _AppControlManager::GetInstance()->RemoveLaunchRequest(launchReqId);
 
        return E_SUCCESS;
@@ -564,7 +564,7 @@ _SqlDataControlImpl::Insert(const String& dataId, const IMap& insertMap, Request
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, insertMap: 0x%x, reqId: %d", dataId.GetPointer(), &insertMap, reqId);
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, insertMap: 0x%x, req: %d", dataId.GetPointer(), &insertMap, reqId);
 
        // fall through
 CATCH:
@@ -639,7 +639,7 @@ _SqlDataControlImpl::Update(const String& dataId, const IMap& updateMap, const S
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, updateMap: 0x%x, pWhere: 0x%x, reqId: %d",
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, updateMap: 0x%x, pWhere: 0x%x, req: %d",
                                dataId.GetPointer(), &updateMap, pWhere, reqId);
 
        // fall through
@@ -685,7 +685,7 @@ _SqlDataControlImpl::Delete(const String& dataId, const String* pWhere, RequestI
 
        reqId = static_cast< RequestId >(id);
 
-       SysLog(NID_APP, "[DC_CALLER_SEND] dataId: %ls, pWhere: 0x%x, reqId: %d", dataId.GetPointer(), pWhere, reqId);
+       SysLog(NID_APP, "[DC_CALLER_SEND] data: %ls, pWhere: 0x%x, req: %d", dataId.GetPointer(), pWhere, reqId);
 
        // fall through
 CATCH:

diff --git a/src/io/FIo_DataControlResultSetImpl.cpp b/src/io/FIo_DataControlResultSetImpl.cpp
index fe00c93..63c0a86 100644 (file)
--- a/src/io/FIo_DataControlResultSetImpl.cpp
+++ b/src/io/FIo_DataControlResultSetImpl.cpp
@@ -62,7 +62,7 @@ _DataControlResultSetImpl::_DataControlResultSetImpl(RequestId reqId)
        , __pageNo(1)
        , __countPerPage(0)
        , __result(E_SUCCESS)
-       , __tmpPath("")
+       , __tmpPath(L"")
        , __reqId(reqId)
 {
 }
@@ -116,7 +116,7 @@ _DataControlResultSetImpl::FillWith(IDbEnumerator* pDbEnum)
 
        _ResultInfo* pResultInfo = pAppMgr->__resultManager.FindItem(static_cast< int >(__reqId)); // provider reqId
        SysTryReturnResult(NID_IO, pResultInfo, E_OBJ_NOT_FOUND,
-                       "The data control request specified with the reqId (%ld) did not exist.", __reqId);
+                       "The data control request specified with the req (%ld) did not exist.", __reqId);
 
        const _AppArg& arg = pResultInfo->arg;
 

diff --git a/src/io/FIo_DataRowImpl.cpp b/src/io/FIo_DataRowImpl.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/io/FIo_DataSetEnumeratorImpl.cpp b/src/io/FIo_DataSetEnumeratorImpl.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/io/FIo_DataSetImpl.cpp b/src/io/FIo_DataSetImpl.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/io/FIo_DirectoryImpl.cpp b/src/io/FIo_DirectoryImpl.cpp
index 813b06d..6de6b7b 100644 (file)
--- a/src/io/FIo_DirectoryImpl.cpp
+++ b/src/io/FIo_DirectoryImpl.cpp
@@ -452,7 +452,6 @@ _DirectoryImpl::RemoveRecursively(char* pDirPath)
                strcpy(absPath, pDirPath);
                strcat(absPath, "/");
                strcat(absPath, dirEnt.d_name);
-               //SysLog(NID_IO, "entry name: %s", absPath);
 
                struct stat64 statbuf;
                memset(&statbuf, 0, sizeof(struct stat64));