From 171728a26c90c3e5f0aad90716ed509db10e95e2 Mon Sep 17 00:00:00 2001 From: Jiban Prakash Date: Thu, 18 Apr 2013 17:00:43 +0530 Subject: [PATCH] refinement of osp-appfw log messages Change-Id: Ic31f3eebb16d4d2c3634659bfaedbfcc8b4318a9 Signed-off-by: Jiban Prakash --- src/app/FApp_AppControlImpl.cpp | 6 +-- src/app/FApp_AppControlManager.cpp | 8 ++-- src/app/FApp_AppControlRegistry.cpp | 4 +- src/app/FApp_AppEntry.cpp | 4 +- src/app/FApp_AppManagerImpl.cpp | 10 ++-- src/app/FApp_AppMessageImpl.cpp | 2 +- src/app/package/FAppPkg_PackageAppInfoImpl.cpp | 2 +- src/app/package/FAppPkg_PackageInfoImpl.cpp | 8 ++-- src/app/package/FAppPkg_PackageManagerImpl.cpp | 66 +++++++++++++------------- 9 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/app/FApp_AppControlImpl.cpp b/src/app/FApp_AppControlImpl.cpp index 93f595a..a43f50f 100755 --- a/src/app/FApp_AppControlImpl.cpp +++ b/src/app/FApp_AppControlImpl.cpp @@ -512,7 +512,7 @@ _AppControlImpl::AppControlCbLegacy(void* data, _AppArg* pArg, _AppArg* pResArg, String tmp = _AppControlRegistry::GetInstance()->GetReverseAliasAppId(provider); if (!tmp.IsEmpty()) { - SysLog(NID_APP, "AppId change (%ls -> %ls).", provider.GetPointer(), tmp.GetPointer()); + SysLog(NID_APP, "App change (%ls -> %ls).", provider.GetPointer(), tmp.GetPointer()); provider = tmp; } @@ -577,7 +577,7 @@ _AppControlImpl::AppControlCb(void* data, _AppArg* pArg, _AppArg* pResArg, servi String tmp = _AppControlRegistry::GetInstance()->GetReverseAliasAppId(provider); if (!tmp.IsEmpty()) { - SysLog(NID_APP, "AppId change (%ls -> %ls).", provider.GetPointer(), tmp.GetPointer()); + SysLog(NID_APP, "App change (%ls -> %ls).", provider.GetPointer(), tmp.GetPointer()); provider = tmp; } @@ -939,7 +939,7 @@ _AppControlImpl::GetCategoryListN(void) const const AppId& appId = GetAppId(); SysTryReturn(NID_APP, !appId.IsEmpty(), null, E_SYSTEM, "[E_SYSTEM] Empty appId."); - SysLog(NID_APP, "Acquiring category for appId %ls.", appId.GetPointer()); + SysLog(NID_APP, "Acquiring category for app %ls.", appId.GetPointer()); std::unique_ptr pAppInfo(_PackageManagerImpl::GetInstance()->GetPackageAppInfoN(appId)); SysTryReturn(NID_APP, pAppInfo.get() != null, null, E_SYSTEM, "[E_SYSTEM] Getting PackageAppInfo failed."); diff --git a/src/app/FApp_AppControlManager.cpp b/src/app/FApp_AppControlManager.cpp index deb13b1..680f674 100755 --- a/src/app/FApp_AppControlManager.cpp +++ b/src/app/FApp_AppControlManager.cpp @@ -200,7 +200,7 @@ _AppControlManager::OnAppControlEventReceivedN(int reqId, _AppArg* pAppArg, int void _AppControlManager::OnAppControlEventReceivedN(int reqId, const AppId& appId, const String& operationId) { - SysLog(NID_APP, "Received request Id %d, appId %ls, operationId %ls", reqId, appId.GetPointer(), operationId.GetPointer()); + SysLog(NID_APP, "Received request Id %d, app %ls, operationId %ls", reqId, appId.GetPointer(), operationId.GetPointer()); // get launch info from request Id _LaunchInfo* pInfo = __launchManager.FindItem(reqId); @@ -561,7 +561,7 @@ result _AppControlManager::LaunchApp(const AppId& appId, _AppArg* pArg, int req) { SysTryReturnResult(NID_APP, pArg != null, E_INVALID_ARG, "Invalid launch argument"); - SysLog(NID_APP, "AppId: %ls.", appId.GetPointer()); + SysLog(NID_APP, "App: %ls.", appId.GetPointer()); String actualAppId = appId; if (appId.GetLength() == 10) @@ -690,7 +690,7 @@ int _AppControlManager::Launch(const AppId& appId, _AppArg* pArg, AppSvcResFn pCb, void* pData, int req) { SysTryReturn(NID_APP, pArg != null, -1, E_INVALID_ARG, "[E_INVALID_ARG] Invalid launch argument"); - SysLog(NID_APP, "AppId: %ls.", appId.GetPointer()); + SysLog(NID_APP, "App: %ls.", appId.GetPointer()); String actualAppId = appId; if (appId.GetLength() == 10) @@ -879,7 +879,7 @@ _AppControlManager::RegisterRequest(service_s* service, int& req, _AppHandler& h bundle* b = _AppArg::GetBundleFromSvc(service); _AppArg* pArg = new (std::nothrow) _AppArg(); - SysTryReturnResult(NID_APP, pArg != null, E_OUT_OF_MEMORY, "rrayList creation failure."); + SysTryReturnResult(NID_APP, pArg != null, E_OUT_OF_MEMORY, "ArrayList creation failure."); pArg->Construct(b); result r = E_SUCCESS; diff --git a/src/app/FApp_AppControlRegistry.cpp b/src/app/FApp_AppControlRegistry.cpp index d12b9e8..7a7a328 100644 --- a/src/app/FApp_AppControlRegistry.cpp +++ b/src/app/FApp_AppControlRegistry.cpp @@ -358,7 +358,7 @@ _AppControlRegistry::GetTizenAppControlN(const String& aId, const String& oId) { // may fail __runtimeAlias.Add(pEntry); - SysLog(NID_APP, "Setting alias appId (%ls -> %ls).", aId.GetPointer(), pAppId->GetPointer()); + SysLog(NID_APP, "Setting alias app (%ls -> %ls).", aId.GetPointer(), pAppId->GetPointer()); } } } @@ -558,7 +558,7 @@ _AppControlRegistry::GetAppControlN(const String& appId, const String& operation if (!tmp.IsEmpty()) { actualAppId = tmp; - SysLog(NID_APP, "Found alias appId (%ls -> %ls).", appId.GetPointer(), tmp.GetPointer()); + SysLog(NID_APP, "Found alias app (%ls -> %ls).", appId.GetPointer(), tmp.GetPointer()); changeAppId = true; } diff --git a/src/app/FApp_AppEntry.cpp b/src/app/FApp_AppEntry.cpp index 2453678..ffcbdc3 100644 --- a/src/app/FApp_AppEntry.cpp +++ b/src/app/FApp_AppEntry.cpp @@ -181,7 +181,7 @@ GetAppIdAppExecutableNameFromPathNew(const char appName[], char* appId, char* ex } strncpy(appId, p - strlen("bin/") - 10, 10); - LOG(LOG_DEBUG, LOG_IO_TAG, "Tizen::Io, appId is %s", appId); + LOG(LOG_DEBUG, LOG_IO_TAG, "Tizen::Io, app is %s", appId); return 0; } @@ -219,7 +219,7 @@ GetAppIdAppExecutableNameFromPath(const char appName[], char* appId, char* exeNa } strncpy(appId, begin + 1, len); - LOG(LOG_DEBUG, LOG_IO_TAG, "Tizen::Io, appId is %s", appId); + LOG(LOG_DEBUG, LOG_IO_TAG, "Tizen::Io, app is %s", appId); int exe_len = 0; diff --git a/src/app/FApp_AppManagerImpl.cpp b/src/app/FApp_AppManagerImpl.cpp index c3d0137..9151e72 100755 --- a/src/app/FApp_AppManagerImpl.cpp +++ b/src/app/FApp_AppManagerImpl.cpp @@ -561,7 +561,7 @@ _AppManagerImpl::GetAppRootPath(const AppId& appId, String& appRootPath) { String pkgId = PackageManager::GetPackageIdByAppId(appId); SysTryReturnResult(NID_APP, pkgId.IsEmpty() == false, E_APP_NOT_INSTALLED, - "The application is not installed. (appId: %ls)", appId.GetPointer()); + "The application is not installed. (app: %ls)", appId.GetPointer()); _PackageManagerImpl* pPkgMgr = _PackageManagerImpl::GetInstance(); SysTryReturnResult(NID_APP, pPkgMgr != null, E_SYSTEM, @@ -569,7 +569,7 @@ _AppManagerImpl::GetAppRootPath(const AppId& appId, String& appRootPath) std::unique_ptr< PackageInfo >pPkgInfo(pPkgMgr->GetPackageInfoN(pkgId)); SysTryReturnResult(NID_APP, pPkgInfo != null, E_APP_NOT_INSTALLED, - "The application is not installed. (appId: %ls)", appId.GetPointer()); + "The application is not installed. (app: %ls)", appId.GetPointer()); _PackageInfoImpl* pPkgInfoImpl = _PackageInfoImpl::GetInstance(pPkgInfo.get()); SysTryReturnResult(NID_APP, pPkgInfoImpl != null, E_SYSTEM, @@ -785,7 +785,7 @@ _AppManagerImpl::SetEventListener(_AppEvent appEvent, Tizen::Base::Runtime::IEve result _AppManagerImpl::OnServiceEventReceived(int clientId, const _AppManagerEventArg& arg) { - SysLog(NID_APP, "appId:%ls, appType:0x%x", arg.GetAppId().GetPointer(), arg.GetAppType()); + SysLog(NID_APP, "app:%ls, appType:0x%x", arg.GetAppId().GetPointer(), arg.GetAppType()); _AppManagerEventArg* pArg = new (std::nothrow)_AppManagerEventArg(arg); SysTryReturnResult(NID_APP, pArg != null, E_OUT_OF_MEMORY, "Memory allocation failed."); @@ -909,7 +909,7 @@ _AppLifecycleManager::LaunchCallback(int pid, void* pData) int ret = aul_app_get_appid_bypid(pid, appId, sizeof(appId)); if (ret != AUL_R_OK) { - SysLogException(NID_APP, E_SYSTEM, "Cannot acquire appId for %d.", pid); + SysLogException(NID_APP, E_SYSTEM, "Cannot acquire app for %d.", pid); return -1; } @@ -948,7 +948,7 @@ _AppLifecycleManager::TerminateCallback(int pid, void* pData) result r = pImpl->__map.GetValue(pid, tmp); if (r != E_SUCCESS) { - SysLog(NID_APP, "Cannot acquire appId from pid %d.", pid); + SysLog(NID_APP, "Cannot acquire app from pid %d.", pid); return -1; } diff --git a/src/app/FApp_AppMessageImpl.cpp b/src/app/FApp_AppMessageImpl.cpp index c5111e9..74c793a 100644 --- a/src/app/FApp_AppMessageImpl.cpp +++ b/src/app/FApp_AppMessageImpl.cpp @@ -348,7 +348,7 @@ _AppMessageImpl::AddValueArray(bundle* pBundle, const char* pKey, const IList* p const int count = pList->GetCount(); const char** pSa = new (std::nothrow) const char*[count]; - SysTryReturnResult(NID_APP, pSa != null, E_OUT_OF_MEMORY, "Memory allocation failure with cound %d.", count); + SysTryReturnResult(NID_APP, pSa != null, E_OUT_OF_MEMORY, "Memory allocation failure with count %d.", count); // element is deliverately iterate with GetAt() for IList for (i = 0; i < count; i++) diff --git a/src/app/package/FAppPkg_PackageAppInfoImpl.cpp b/src/app/package/FAppPkg_PackageAppInfoImpl.cpp index c9d2903..1081299 100755 --- a/src/app/package/FAppPkg_PackageAppInfoImpl.cpp +++ b/src/app/package/FAppPkg_PackageAppInfoImpl.cpp @@ -322,7 +322,7 @@ _PackageAppInfoImpl::Construct(const AppId& appId) SysTryReturnResult(NID_APP, pAppId, E_OUT_OF_MEMORY, "pAppId is null"); res = pkgmgrinfo_appinfo_get_appinfo(pAppId.get(), &__pAppInfoHandle); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_appinfo_get_appinfo failed, res = [%d], appId = [%s]", res, pAppId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_appinfo_get_appinfo failed, res = [%d], app = [%s]", res, pAppId.get()); __fromDatabase = true; diff --git a/src/app/package/FAppPkg_PackageInfoImpl.cpp b/src/app/package/FAppPkg_PackageInfoImpl.cpp index 4750878..74c527d 100755 --- a/src/app/package/FAppPkg_PackageInfoImpl.cpp +++ b/src/app/package/FAppPkg_PackageInfoImpl.cpp @@ -364,7 +364,7 @@ _PackageInfoImpl::GetPackageAppInfoN(const AppId& appId) const res = pkgmgrinfo_appinfo_get_appinfo(pAppId.get(), &appInfoHandle); if (res == 0) { - SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appinfo(): appId = [%s]", pAppId.get()); + SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appinfo(): app = [%s]", pAppId.get()); PackageAppInfo* pPackageAppInfo = new (std::nothrow) PackageAppInfo; SysTryReturn(NID_APP, pPackageAppInfo != null, 0, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Insufficient memory"); @@ -450,7 +450,7 @@ _PackageInfoImpl::GetPackageAppInfo(const pkgmgrinfo_appinfo_h handle, PackageAp res = pkgmgrinfo_appinfo_get_appid(handle, &pAppId); if (res == 0) { - SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appid(): appId = [%s]", pAppId); + SysLog(NID_APP, "pkgmgrinfo_appinfo_get_appid(): app = [%s]", pAppId); pPackageAppInfoImpl->Construct(pAppId); } else @@ -991,7 +991,7 @@ _PackageInfoImpl::Construct(const PackageId& packageId) SysTryReturnResult(NID_APP, pPackageId, E_OUT_OF_MEMORY, "pPackageId is null"); result = pkgmgrinfo_pkginfo_get_pkginfo(pPackageId.get(), &__packageInfoHandle); - SysTryReturnResult(NID_APP, result == PMINFO_R_OK, E_PKG_NOT_INSTALLED, "pkgmgrinfo_pkginfo_get_pkginfo() is failed. result=[%d], packageId=[%s]", result, pPackageId.get()); + SysTryReturnResult(NID_APP, result == PMINFO_R_OK, E_PKG_NOT_INSTALLED, "pkgmgrinfo_pkginfo_get_pkginfo() is failed. result=[%d], package=[%s]", result, pPackageId.get()); __fromDatabase = true; @@ -1145,7 +1145,7 @@ _PackageInfoImpl::Construct(const PackageId& packageId) result = pkgmgrinfo_pkginfo_get_mainappid(__packageInfoHandle, &pMainAppId); if (result == PMINFO_R_OK) { - SysLog(NID_APP, "pkgmgrinfo_pkginfo_get_mainappid(): mainAppId = [%s]", pMainAppId); + SysLog(NID_APP, "pkgmgrinfo_pkginfo_get_mainappid(): mainApp = [%s]", pMainAppId); AppId mainAppId(pMainAppId); __mainAppId = mainAppId; } diff --git a/src/app/package/FAppPkg_PackageManagerImpl.cpp b/src/app/package/FAppPkg_PackageManagerImpl.cpp index e7fb39f..98f8be5 100755 --- a/src/app/package/FAppPkg_PackageManagerImpl.cpp +++ b/src/app/package/FAppPkg_PackageManagerImpl.cpp @@ -75,12 +75,12 @@ _PackageManagerEvent::FireImpl(IEventListener& listener, const IEventArg& arg) { if (pArg->__install) { - SysLog(NID_APP, "Installation is Completed. [PackageId = %ls]", pArg->__packageId.GetPointer()); + SysLog(NID_APP, "Installation is Completed. [Package = %ls]", pArg->__packageId.GetPointer()); pListener->OnPackageInstallationCompleted(pArg->__packageId, PACKAGE_INSTALLATION_RESULT_SUCCESS); } else { - SysLog(NID_APP, "Uninstallation is Completed. [PackageId = %ls]", pArg->__packageId.GetPointer()); + SysLog(NID_APP, "Uninstallation is Completed. [Package = %ls]", pArg->__packageId.GetPointer()); pListener->OnPackageUninstallationCompleted(pArg->__packageId, true); } } @@ -88,12 +88,12 @@ _PackageManagerEvent::FireImpl(IEventListener& listener, const IEventArg& arg) { if (pArg->__install) { - SysLog(NID_APP, "Installation is Completed(Error). [PackageId = %ls]", pArg->__packageId.GetPointer()); + SysLog(NID_APP, "Installation is Completed(Error). [Package = %ls]", pArg->__packageId.GetPointer()); pListener->OnPackageInstallationCompleted(pArg->__packageId, PACKAGE_INSTALLATION_RESULT_INVALID_PACKAGE); } else { - SysLog(NID_APP, "Uninstallation is Completed(Error). [PackageId = %ls]", pArg->__packageId.GetPointer()); + SysLog(NID_APP, "Uninstallation is Completed(Error). [Package = %ls]", pArg->__packageId.GetPointer()); pListener->OnPackageUninstallationCompleted(pArg->__packageId, false); } } @@ -131,7 +131,7 @@ _PackageManagerImpl::GetPackageIdByAppId(const AppId& appId) SysTryReturn(NID_APP, pAppId, L"", E_OUT_OF_MEMORY, "pAppId is null"); result = pkgmgrinfo_appinfo_get_appinfo(pAppId.get(), &pAppInfoHandle); - SysTryReturn(NID_APP, result == 0, L"", E_PKG_NOT_INSTALLED, "pkgmgrinfo_appinfo_get_appinfo() failed. result=[%d], appId=[%s]", result, pAppId.get()); + SysTryReturn(NID_APP, result == 0, L"", E_PKG_NOT_INSTALLED, "pkgmgrinfo_appinfo_get_appinfo() failed. result=[%d], app=[%s]", result, pAppId.get()); result = pkgmgrinfo_appinfo_get_pkgname(pAppInfoHandle, &pPackageId); @@ -143,7 +143,7 @@ _PackageManagerImpl::GetPackageIdByAppId(const AppId& appId) } } - SysLog(NID_APP, "appId = [%ls], packageId = [%ls]", appId.GetPointer(), packageId.GetPointer()); + SysLog(NID_APP, "app = [%ls], package = [%ls]", appId.GetPointer(), packageId.GetPointer()); return packageId; } @@ -272,7 +272,7 @@ _PackageManagerImpl::GetPackageInfoN(const PackageId& packageId) const _PackageInfoImpl* pPackageInfoImpl = _PackageInfoImpl::GetInstance(pPackageInfo); r = pPackageInfoImpl->Construct(packageId); - SysTryCatch(NID_APP, r == E_SUCCESS, , r, "[E_PKG_NOT_INSTALLED] packageId (%ls) is not found.", packageId.GetPointer()); + SysTryCatch(NID_APP, r == E_SUCCESS, , r, "[E_PKG_NOT_INSTALLED] package (%ls) is not found.", packageId.GetPointer()); return pPackageInfo; @@ -294,7 +294,7 @@ _PackageManagerImpl::GetPackageAppInfoN(const AppId& appId) const _PackageAppInfoImpl* pPackageAppInfoImpl = _PackageAppInfoImpl::GetInstance(pPackageAppInfo); r = pPackageAppInfoImpl->Construct(appId); - SysTryCatch(NID_APP, r == E_SUCCESS, , r, "[E_PKG_NOT_INSTALLED] appId (%ls) is not found.", appId.GetPointer()); + SysTryCatch(NID_APP, r == E_SUCCESS, , r, "[E_PKG_NOT_INSTALLED] app (%ls) is not found.", appId.GetPointer()); return pPackageAppInfo; @@ -341,7 +341,7 @@ _PackageManagerImpl::IsPackageInstalled(const PackageId& packageId) const result = pkgmgrinfo_pkginfo_get_pkginfo(pPackageId.get(), &pPackageInfoHandle); if (result != 0) { - SysLog(NID_APP, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], packageId=[%s]", result, pPackageId.get()); + SysLog(NID_APP, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], package=[%s]", result, pPackageId.get()); return false; } @@ -350,7 +350,7 @@ _PackageManagerImpl::IsPackageInstalled(const PackageId& packageId) const pkgmgrinfo_pkginfo_destroy_pkginfo(pPackageInfoHandle); } - SysLog(NID_APP, "packageId = [%ls] is installed.", packageId.GetPointer()); + SysLog(NID_APP, "package = [%ls] is installed.", packageId.GetPointer()); return true; } @@ -373,7 +373,7 @@ _PackageManagerImpl::InstallPackage(const PackageId& packageId, const String& pa if ((strcasecmp(pExtension.get(), "tpk") == 0) || (strcasecmp(pExtension.get(), "wgt") == 0)) { - SysLog(NID_APP, "packageId = [%ls], packagePath = [%s], extension = [%s]", packageId.GetPointer(), pPackagePath.get(), pExtension.get()); + SysLog(NID_APP, "package = [%ls], packagePath = [%s], extension = [%s]", packageId.GetPointer(), pPackagePath.get(), pExtension.get()); } else { @@ -465,10 +465,10 @@ _PackageManagerImpl::UninstallPackage(const PackageId& packageId, IPackageUninst SysTryReturnResult(NID_APP, pPackageId != null, E_OUT_OF_MEMORY, "pPackageId is null"); res = pkgmgrinfo_pkginfo_get_pkginfo(pPackageId.get(), &pPackageInfoHandle); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], package=[%s]", res, pPackageId.get()); res = pkgmgrinfo_pkginfo_get_type(pPackageInfoHandle, &pType); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_type() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_type() failed. result=[%d], package=[%s]", res, pPackageId.get()); if (__pRequestClient == null) { @@ -477,7 +477,7 @@ _PackageManagerImpl::UninstallPackage(const PackageId& packageId, IPackageUninst } res = pkgmgr_client_uninstall(__pRequestClient, pType, pPackageId.get(), PM_QUIET, UninstallationEventHandler, pListener); - SysLog(NID_APP, "pkgmgr_client_uninstall - req_id=[%d], packageId=[%s], type=[%s]", res, pPackageId.get(), pType); + SysLog(NID_APP, "pkgmgr_client_uninstall - req_id=[%d], package=[%s], type=[%s]", res, pPackageId.get(), pType); if(pPackageInfoHandle) { @@ -532,13 +532,13 @@ _PackageManagerImpl::MoveToExternalStorage(const PackageId& packageId) SysTryReturnResult(NID_APP, pPackageId != null, E_OUT_OF_MEMORY, "pPackageId is null"); res = pkgmgrinfo_pkginfo_get_pkginfo(pPackageId.get(), &packageInfoHandle); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], package=[%s]", res, pPackageId.get()); res = pkgmgrinfo_pkginfo_get_type(packageInfoHandle, &pType); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_type() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_type() failed. result=[%d], package=[%s]", res, pPackageId.get()); res = pkgmgrinfo_pkginfo_get_installed_storage(packageInfoHandle, &storage); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_installed_storage() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_installed_storage() failed. result=[%d], package=[%s]", res, pPackageId.get()); if (storage == PMINFO_EXTERNAL_STORAGE) { @@ -599,13 +599,13 @@ _PackageManagerImpl::MoveToInternalStorage(const PackageId& packageId) SysTryReturnResult(NID_APP, pPackageId != null, E_OUT_OF_MEMORY, "pPackageId is null"); res = pkgmgrinfo_pkginfo_get_pkginfo(pPackageId.get(), &packageInfoHandle); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], package=[%s]", res, pPackageId.get()); res = pkgmgrinfo_pkginfo_get_type(packageInfoHandle, &pType); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_type() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_type() failed. result=[%d], package=[%s]", res, pPackageId.get()); res = pkgmgrinfo_pkginfo_get_installed_storage(packageInfoHandle, &storage); - SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_installed_storage() failed. result=[%d], packageId=[%s]", res, pPackageId.get()); + SysTryReturnResult(NID_APP, res == 0, E_SYSTEM, "pkgmgrinfo_pkginfo_get_installed_storage() failed. result=[%d], package=[%s]", res, pPackageId.get()); if (storage == PMINFO_INTERNAL_STORAGE) { @@ -654,7 +654,7 @@ _PackageManagerImpl::MoveToInternalStorage(const PackageId& packageId) int _PackageManagerImpl::InstallationEventHandler(int reqId, const char* pType, const char* pPackageId, const char* pKey, const char* pVal, const void* pMsg, void* pData) { - SysLog(NID_APP, "reqId[%d], Type[%s], PackageId[%s], Key[%s], Val[%s]", reqId, pType, pPackageId, pKey, pVal); + SysLog(NID_APP, "reqId[%d], Type[%s], Package[%s], Key[%s], Val[%s]", reqId, pType, pPackageId, pKey, pVal); if (pData) { @@ -691,7 +691,7 @@ _PackageManagerImpl::InstallationEventHandler(int reqId, const char* pType, cons int _PackageManagerImpl::UninstallationEventHandler(int reqId, const char* pType, const char* pPackageId, const char* pKey, const char* pVal, const void* pMsg, void* pData) { - SysLog(NID_APP, "reqId[%d], Type[%s], PackageId[%s], Key[%s], Val[%s]", reqId, pType, pPackageId, pKey, pVal); + SysLog(NID_APP, "reqId[%d], Type[%s], Package[%s], Key[%s], Val[%s]", reqId, pType, pPackageId, pKey, pVal); if (pData) { @@ -1042,7 +1042,7 @@ _PackageManagerImpl::GetPackageAppInfoListN(const IMap& packageAppFilterMap) con PackageAppInfo* pPackageAppInfo = dynamic_cast < PackageAppInfo* >(list.GetAt(i)); if (pPackageAppInfo) { - AppLog("PackageAppFilter - AppId [%ls]", pPackageAppInfo->GetAppId().GetPointer()); + AppLog("PackageAppFilter - App [%ls]", pPackageAppInfo->GetAppId().GetPointer()); std::unique_ptr< AppId > pAppId(new (std::nothrow) AppId(pPackageAppInfo->GetAppId())); appIdList.Add(pAppId.release()); @@ -1058,7 +1058,7 @@ _PackageManagerImpl::GetPackageAppInfoListN(const IMap& packageAppFilterMap) con if (appIdList.Contains(appId) == true) { - AppLog("AppId [%ls] is matched.", appId.GetPointer()); + AppLog("App [%ls] is matched.", appId.GetPointer()); std::unique_ptr< PackageAppInfo > pAppInfo(new (std::nothrow) PackageAppInfo); SysTryCatch(NID_APP, pAppInfo, , E_OUT_OF_MEMORY, "pAppInfo is null."); @@ -1070,7 +1070,7 @@ _PackageManagerImpl::GetPackageAppInfoListN(const IMap& packageAppFilterMap) con } else { - AppLog("AppId [%ls] is not matched.", pPackageAppInfo->GetAppId().GetPointer()); + AppLog("App [%ls] is not matched.", pPackageAppInfo->GetAppId().GetPointer()); } } } @@ -1124,7 +1124,7 @@ _PackageManagerImpl::GetPackageAppInfoListN(const IMap& packageFilterMap, const PackageAppInfo* pPackageAppInfo = dynamic_cast < PackageAppInfo* >(pPackageAppInfoList->GetAt(j)); if (pPackageAppInfo) { - AppLog("PackageFilter - AppId [%ls]", pPackageAppInfo->GetAppId().GetPointer()); + AppLog("PackageFilter - App [%ls]", pPackageAppInfo->GetAppId().GetPointer()); std::unique_ptr< AppId > pAppId(new (std::nothrow) AppId(pPackageAppInfo->GetAppId())); appIdList.Add(pAppId.release()); @@ -1150,11 +1150,11 @@ _PackageManagerImpl::GetPackageAppInfoListN(const IMap& packageFilterMap, const if (pPackageAppInfo) { AppId appId = pPackageAppInfo->GetAppId(); - AppLog("AppFilter - AppId [%ls]", appId.GetPointer()); + AppLog("AppFilter - App [%ls]", appId.GetPointer()); if (appIdList.Contains(appId) == true) { - AppLog("AppId [%ls] is matched.", appId.GetPointer()); + AppLog("App [%ls] is matched.", appId.GetPointer()); std::unique_ptr< PackageAppInfo > pPackageAppInfo(new (std::nothrow) PackageAppInfo); SysTryReturn(NID_APP, pPackageAppInfo, null, E_OUT_OF_MEMORY, "PackageAppInfo is null."); @@ -1166,7 +1166,7 @@ _PackageManagerImpl::GetPackageAppInfoListN(const IMap& packageFilterMap, const } else { - AppLog("AppId [%ls] is not matched.", pPackageAppInfo->GetAppId().GetPointer()); + AppLog("App [%ls] is not matched.", pPackageAppInfo->GetAppId().GetPointer()); } } } @@ -1220,7 +1220,7 @@ _PackageManagerImpl::PackageAppInfoHandler(const pkgmgrinfo_appinfo_h handle, vo res = pkgmgrinfo_appinfo_get_appid(handle, &pAppId); SysTryReturn(NID_APP, res == PMINFO_R_OK, 0, E_SYSTEM, "pkgmgrinfo_appinfo_get_appid is failed. [%d]", res); - SysLog(NID_APP, "appId = [%s]", pAppId); + SysLog(NID_APP, "app = [%s]", pAppId); std::unique_ptr pPackageAppInfo(new (std::nothrow) PackageAppInfo); SysTryReturn(NID_APP, pPackageAppInfo, 0, E_OUT_OF_MEMORY, "pPackageAppInfo instance must not be null."); @@ -1248,7 +1248,7 @@ _PackageManagerImpl::PackageAppInfoMetadataHandler(const pkgmgrinfo_appinfo_h ha res = pkgmgrinfo_appinfo_get_appid(handle, &pAppId); SysTryReturn(NID_APP, res == PMINFO_R_OK, 0, E_SYSTEM, "pkgmgrinfo_appinfo_get_appid is failed. [%d]", res); - SysLog(NID_APP, "appId = [%s]", pAppId); + SysLog(NID_APP, "app = [%s]", pAppId); std::unique_ptr< PackageAppInfo > pPackageAppInfo(new (std::nothrow) PackageAppInfo); SysTryReturn(NID_APP, pPackageAppInfo, 0, E_OUT_OF_MEMORY, "pPackageAppInfo instance must not be null."); @@ -1360,7 +1360,7 @@ _PackageManagerImpl::SendPackageEvent(PackageType type, const PackageId& package SysLog(NID_APP, "pEvent->Fire(*pEventArg) failed. [%s]", GetErrorMessage(r)); } - SysLog(NID_APP, "PackageId = [%ls], Key = [%ls], Value = [%ls], install = [%d]", pEventArg->__packageId.GetPointer(), pEventArg->__eventKey.GetPointer(), pEventArg->__eventValue.GetPointer(), pEventArg->__install); + SysLog(NID_APP, "Package = [%ls], Key = [%ls], Value = [%ls], install = [%d]", pEventArg->__packageId.GetPointer(), pEventArg->__eventKey.GetPointer(), pEventArg->__eventValue.GetPointer(), pEventArg->__install); } else { @@ -1663,7 +1663,7 @@ _PackageManagerImpl::IsAppInstalled(const AppId& appId) SysTryReturn(NID_APP, pPackageId, false, E_OUT_OF_MEMORY, "pPackageId is null"); result = pkgmgrinfo_pkginfo_get_pkginfo(pPackageId.get(), &pPackageInfoHandle); - SysTryReturn(NID_APP, result == 0, false, E_APP_NOT_INSTALLED, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], packageId=[%s]", result, pPackageId.get()); + SysTryReturn(NID_APP, result == 0, false, E_APP_NOT_INSTALLED, "pkgmgrinfo_pkginfo_get_pkginfo() failed. result=[%d], package=[%s]", result, pPackageId.get()); if(pPackageInfoHandle) { -- 2.7.4