From 64e11ab67fea58f968d435696b2191dd2d9e93c0 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Mon, 20 Feb 2017 13:10:41 +0900 Subject: [PATCH] Fix invalid implementation of package manager CAPI - Remove unnecessary codes - Change calling of internal APIs Change-Id: I1b23b2f7ae52a310c9a0cbbc809979016149fec0 Signed-off-by: Junghyun Yeon --- src/package_info.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/package_info.c b/src/package_info.c index f75618d..8cb1cd8 100644 --- a/src/package_info.c +++ b/src/package_info.c @@ -108,20 +108,16 @@ API int package_info_foreach_app_from_package(package_info_h package_info, packa .callback = callback, .user_data = user_data, }; - pkgmgrinfo_pkginfo_h pkgmgr_pkginfo; if (package_info == NULL || callback == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (pkgmgrinfo_pkginfo_get_pkginfo(package_info->package, &pkgmgr_pkginfo) != PKGMGR_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - if (comp_type == PACKAGE_INFO_ALLAPP) - pkgmgrinfo_appinfo_get_list(pkgmgr_pkginfo, PMINFO_ALL_APP, package_info_foreach_app_cb, &foreach_app_context); + pkgmgrinfo_appinfo_get_list(package_info->pkgmgr_pkginfo, PMINFO_ALL_APP, package_info_foreach_app_cb, &foreach_app_context); if (comp_type == PACKAGE_INFO_UIAPP) - pkgmgrinfo_appinfo_get_list(pkgmgr_pkginfo, PMINFO_UI_APP, package_info_foreach_app_cb, &foreach_app_context); + pkgmgrinfo_appinfo_get_list(package_info->pkgmgr_pkginfo, PMINFO_UI_APP, package_info_foreach_app_cb, &foreach_app_context); if (comp_type == PACKAGE_INFO_SERVICEAPP) - pkgmgrinfo_appinfo_get_list(pkgmgr_pkginfo, PMINFO_SVC_APP, package_info_foreach_app_cb, &foreach_app_context); + pkgmgrinfo_appinfo_get_list(package_info->pkgmgr_pkginfo, PMINFO_SVC_APP, package_info_foreach_app_cb, &foreach_app_context); return PACKAGE_MANAGER_ERROR_NONE; } @@ -303,7 +299,6 @@ END: API int package_info_get_tep_name(package_info_h package_info, char **name) { - pkgmgrinfo_pkginfo_h pkginfo; char *tepname_tmp = NULL; int retval = 0; @@ -314,13 +309,7 @@ API int package_info_get_tep_name(package_info_h package_info, char **name) if (retval != PACKAGE_MANAGER_ERROR_NONE) return retval; - if (pkgmgrinfo_pkginfo_get_pkginfo(package_info->package, &pkginfo) != PMINFO_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - - if (pkginfo == NULL) - return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - - if (pkgmgrinfo_pkginfo_get_tep_name(pkginfo, &tepname_tmp) != PMINFO_R_OK) + if (pkgmgrinfo_pkginfo_get_tep_name(package_info->pkgmgr_pkginfo, &tepname_tmp) != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); if (tepname_tmp != NULL) @@ -329,8 +318,6 @@ API int package_info_get_tep_name(package_info_h package_info, char **name) if (*name == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - pkgmgrinfo_pkginfo_destroy_pkginfo(pkginfo); - return PACKAGE_MANAGER_ERROR_NONE; } @@ -341,7 +328,7 @@ API int package_info_is_system_package(package_info_h package_info, bool *system if (package_info == NULL || system == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (pkgmgrinfo_pkginfo_is_preload(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) + if (pkgmgrinfo_pkginfo_is_system(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); *system = pkg_info_value; -- 2.7.4