From 2916803ed93e3dab28b022af0632639c03dccea3 Mon Sep 17 00:00:00 2001 From: "SukHyung, Kang" Date: Wed, 9 Dec 2015 18:23:23 +0900 Subject: [PATCH] change code to apply coding rules Change-Id: Ief699daaba4c290c29cf68e87eca42ed43c27861 Signed-off-by: SukHyung, Kang --- src/package_info.c | 158 +++++++-------------------- src/package_manager.c | 238 +++++++++++++---------------------------- src/package_manager_internal.c | 18 ++-- tool/main.c | 6 +- 4 files changed, 124 insertions(+), 296 deletions(-) diff --git a/src/package_info.c b/src/package_info.c index 00a0d40..9d3b60b 100644 --- a/src/package_info.c +++ b/src/package_info.c @@ -40,7 +40,7 @@ struct package_cert_info_s { pkgmgrinfo_certinfo_h pkgmgrinfo_certinfo; }; -typedef struct _foreach_app_context_{ +typedef struct _foreach_app_context_ { package_info_app_cb callback; void *user_data; } foreach_app_context_s; @@ -52,32 +52,25 @@ API int package_info_create(const char *package, package_info_h *package_info) uid_t uid = getuid(); if (package == NULL || package_info == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } - if (uid != GLOBAL_USER) - { + if (uid != GLOBAL_USER) { if (pkgmgrinfo_pkginfo_get_usr_pkginfo(package, uid, &pkgmgr_pkginfo) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } - else - { + } else { if (pkgmgrinfo_pkginfo_get_pkginfo(package, &pkgmgr_pkginfo) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } package_info_created = calloc(1, sizeof(struct package_info_s)); - if (package_info_created == NULL) - { + if (package_info_created == NULL) { pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgr_pkginfo); return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); } package_info_created->package = strdup(package); - if (package_info_created->package == NULL) - { + if (package_info_created->package == NULL) { pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgr_pkginfo); free(package_info_created); return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); @@ -90,7 +83,7 @@ API int package_info_create(const char *package, package_info_h *package_info) return PACKAGE_MANAGER_ERROR_NONE; } -static int package_info_foreach_app_cb (const pkgmgrinfo_appinfo_h handle, void *user_data) +static int package_info_foreach_app_cb(const pkgmgrinfo_appinfo_h handle, void *user_data) { char *appid = NULL; pkgmgrinfo_app_component comp; @@ -98,20 +91,18 @@ static int package_info_foreach_app_cb (const pkgmgrinfo_appinfo_h handle, void int ret = 0; bool r; - if (handle == NULL || foreach_app_context == NULL) - { + if (handle == NULL || foreach_app_context == NULL) { package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); return PKGMGR_R_EINVAL; } ret = pkgmgrinfo_appinfo_get_appid(handle, &appid); - if (ret < 0) { + if (ret < 0) return PKGMGR_R_ERROR; - } + ret = pkgmgrinfo_appinfo_get_component(handle, &comp); - if (ret < 0) { + if (ret < 0) return PKGMGR_R_ERROR; - } r = foreach_app_context->callback(comp, appid, foreach_app_context->user_data); @@ -128,14 +119,11 @@ API int package_info_foreach_app_from_package(package_info_h package_info, packa uid_t uid = getuid(); if (package_info == NULL || callback == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } - if (pkgmgrinfo_pkginfo_get_usr_pkginfo(package_info->package,uid,&pkgmgr_pkginfo) != PKGMGR_R_OK) - { + if (pkgmgrinfo_pkginfo_get_usr_pkginfo(package_info->package, uid, &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_usr_list(pkgmgr_pkginfo, PMINFO_ALL_APP, package_info_foreach_app_cb, &foreach_app_context, uid); if (comp_type == PACKAGE_INFO_UIAPP) @@ -148,9 +136,7 @@ API int package_info_foreach_app_from_package(package_info_h package_info, packa API int package_info_destroy(package_info_h package_info) { if (package_info == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } free(package_info->package); @@ -166,16 +152,12 @@ API int package_info_get_package(package_info_h package_info, char **package) char *package_dup; if (package_info == NULL || package == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } package_dup = strdup(package_info->package); if (package_dup == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } *package = package_dup; @@ -188,24 +170,18 @@ API int package_info_get_label(package_info_h package_info, char **label) char *label_dup = NULL; if (package_info == NULL || label == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } if (pkgmgrinfo_pkginfo_get_label(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } - if(!pkg_info_value) + if (!pkg_info_value) goto END; label_dup = strdup(pkg_info_value); if (label_dup == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } END: *label = label_dup; @@ -219,24 +195,18 @@ API int package_info_get_icon(package_info_h package_info, char **path) char *icon_dup = NULL; if (package_info == NULL || path == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } if (pkgmgrinfo_pkginfo_get_icon(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } - if(!pkg_info_value) + if (!pkg_info_value) goto END; icon_dup = strdup(pkg_info_value); if (icon_dup == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } END: *path = icon_dup; @@ -250,24 +220,18 @@ API int package_info_get_version(package_info_h package_info, char **version) char *ver_dup = NULL; if (package_info == NULL || version == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } if (pkgmgrinfo_pkginfo_get_version(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } - if(!pkg_info_value) + if (!pkg_info_value) goto END; ver_dup = strdup(pkg_info_value); if (ver_dup == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } END: *version = ver_dup; @@ -281,24 +245,18 @@ API int package_info_get_type(package_info_h package_info, char **type) char *type_dup = NULL; if (package_info == NULL || type == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } if (pkgmgrinfo_pkginfo_get_type(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } - if(!pkg_info_value) + if (!pkg_info_value) goto END; type_dup = strdup(pkg_info_value); if (type_dup == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } END: *type = type_dup; @@ -312,9 +270,7 @@ API int package_info_get_installed_storage(package_info_h package_info, package_ pkgmgrinfo_installed_storage pkg_info_value; if (package_info == NULL || storage == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } ret = pkgmgrinfo_pkginfo_get_installed_storage(package_info->pkgmgr_pkginfo, &pkg_info_value); if (ret < 0) @@ -330,33 +286,27 @@ API int package_info_get_installed_storage(package_info_h package_info, package_ API int package_info_get_root_path(package_info_h package_info, char **path) { - char *pkg_info_value = NULL; - char *path_dup = NULL; + char *pkg_info_value = NULL; + char *path_dup = NULL; - if (package_info == NULL || path == NULL) - { - return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } + if (package_info == NULL || path == NULL) + return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (pkgmgrinfo_pkginfo_get_root_path(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) - { - return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } + if (pkgmgrinfo_pkginfo_get_root_path(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) + return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - if(!pkg_info_value) - goto END; + if (!pkg_info_value) + goto END; - path_dup = strdup(pkg_info_value); + path_dup = strdup(pkg_info_value); - if (path_dup == NULL) - { - return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } + if (path_dup == NULL) + return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); END: - *path = path_dup; + *path = path_dup; - return PACKAGE_MANAGER_ERROR_NONE; + return PACKAGE_MANAGER_ERROR_NONE; } API int package_info_is_system_package(package_info_h package_info, bool *system) @@ -364,14 +314,10 @@ API int package_info_is_system_package(package_info_h package_info, bool *system bool pkg_info_value = false; 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) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } *system = pkg_info_value; @@ -383,14 +329,10 @@ API int package_info_is_removable_package(package_info_h package_info, bool *rem bool pkg_info_value = false; if (package_info == NULL || removable == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } if (pkgmgrinfo_pkginfo_is_removable(package_info->pkgmgr_pkginfo, &pkg_info_value) != PKGMGR_R_OK) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } *removable = pkg_info_value; @@ -402,14 +344,10 @@ API int package_info_is_preload_package(package_info_h package_info, bool *prelo bool pkg_info_value = false; if (package_info == NULL || preload == 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) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } *preload = pkg_info_value; @@ -419,18 +357,12 @@ API int package_info_is_preload_package(package_info_h package_info, bool *prelo API int package_info_is_equal(package_info_h lhs, package_info_h rhs, bool *equal) { if (lhs == NULL || rhs == NULL || equal == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } if (!strcmp(lhs->package, rhs->package)) - { *equal = true; - } else - { *equal = false; - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -441,9 +373,7 @@ API int package_info_is_accessible(package_info_h package_info, bool *accessible bool pkg_info_value = false; if (package_info == NULL || accessible == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } ret = pkgmgrinfo_pkginfo_is_accessible(package_info->pkgmgr_pkginfo, &pkg_info_value); if (ret < 0) @@ -460,16 +390,12 @@ API int package_info_clone(package_info_h *clone, package_info_h package_info) int retval; if (clone == NULL || package_info == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } retval = package_info_create(package_info->package, clone); if (retval != PACKAGE_MANAGER_ERROR_NONE) - { return package_manager_error(retval, __FUNCTION__, NULL); - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -483,32 +409,26 @@ API int package_info_foreach_cert_info(package_info_h package_info, package_info uid_t uid = getuid(); if (package_info == NULL || callback == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } retval = pkgmgrinfo_pkginfo_create_certinfo(&handle); if (retval != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); retval = pkgmgrinfo_pkginfo_load_certinfo(package_info->package, handle, uid); - if (retval != PMINFO_R_OK) - { + if (retval != PMINFO_R_OK) { pkgmgrinfo_pkginfo_destroy_certinfo(handle); return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); } - for( i=0; i<=PACKAGE_INFO_DISTRIBUTOR2_SIGNER_CERT; i++) - { + for (i = 0; i <= PACKAGE_INFO_DISTRIBUTOR2_SIGNER_CERT; i++) { retval = pkgmgrinfo_pkginfo_get_cert_value(handle, i, &cert_value); - if (retval != PMINFO_R_OK) - { + if (retval != PMINFO_R_OK) { pkgmgrinfo_pkginfo_destroy_certinfo(handle); return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); } - if ( cert_value && strncmp(cert_value, "(null)", strlen("(null)")) ) - { + if (cert_value && strncmp(cert_value, "(null)", strlen("(null)"))) { retval = callback(package_info, (package_cert_type_e)i, cert_value, user_data); if (!retval) break; @@ -524,14 +444,12 @@ API int package_info_foreach_cert_info(package_info_h package_info, package_info API int package_info_foreach_privilege_info(package_info_h package_info, package_info_privilege_info_cb callback, void *user_data) { - int ret = 0; + int ret = 0; - if (package_info == NULL || callback == NULL) - { - return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } + if (package_info == NULL || callback == NULL) + return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - ret = pkgmgrinfo_pkginfo_foreach_privilege(package_info->pkgmgr_pkginfo, callback, user_data); + ret = pkgmgrinfo_pkginfo_foreach_privilege(package_info->pkgmgr_pkginfo, callback, user_data); - return ret; + return ret; } diff --git a/src/package_manager.c b/src/package_manager.c index b588af6..efa88da 100644 --- a/src/package_manager.c +++ b/src/package_manager.c @@ -117,9 +117,8 @@ API int package_manager_request_create(package_manager_request_h *request) static int package_manager_client_validate_handle(package_manager_request_h request) { - if (request == NULL || request->pc == NULL) { + if (request == NULL || request->pc == NULL) return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER; - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -165,10 +164,9 @@ API int package_manager_request_set_event_cb(package_manager_request_h request, API int package_manager_request_unset_event_cb(package_manager_request_h request) { - // TODO: Please implement this function. - if (package_manager_client_validate_handle(request)) { + /* TODO: Please implement this function. */ + if (package_manager_client_validate_handle(request)) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -438,12 +436,11 @@ API int package_manager_request_install(package_manager_request_h request, if (retval != PACKAGE_MANAGER_ERROR_NONE) return retval; - if (package_manager_client_validate_handle(request)) { + if (package_manager_client_validate_handle(request)) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } - if (path == NULL) { + + if (path == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } int request_id = 0; request->pkg_path = path; @@ -460,19 +457,18 @@ API int package_manager_request_install(package_manager_request_h request, request->mode, request_event_handler, request); - if (request_id == PKGMGR_R_EINVAL) { + if (request_id == PKGMGR_R_EINVAL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_ENOPKG) { + else if (request_id == PKGMGR_R_ENOPKG) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_ENOMEM) { + else if (request_id == PKGMGR_R_ENOMEM) return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_EIO) { + else if (request_id == PKGMGR_R_EIO) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_EPRIV) { + else if (request_id == PKGMGR_R_EPRIV) return package_manager_error(PACKAGE_MANAGER_ERROR_PERMISSION_DENIED, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_ESYSTEM || request_id == PKGMGR_R_ECOMM || request_id == PKGMGR_R_ERROR) { + else if (request_id == PKGMGR_R_ESYSTEM || request_id == PKGMGR_R_ECOMM || request_id == PKGMGR_R_ERROR) return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - } *id = request_id; @@ -488,12 +484,11 @@ API int package_manager_request_uninstall(package_manager_request_h request, if (retval != PACKAGE_MANAGER_ERROR_NONE) return retval; - if (package_manager_client_validate_handle(request)) { + if (package_manager_client_validate_handle(request)) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } - if (name == NULL) { + + if (name == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } int request_id = 0; request->pkg_name = name; @@ -507,19 +502,18 @@ API int package_manager_request_uninstall(package_manager_request_h request, request->pkg_name, request->mode, request_event_handler, request); - if (request_id == PKGMGR_R_EINVAL) { + if (request_id == PKGMGR_R_EINVAL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_ENOPKG) { + else if (request_id == PKGMGR_R_ENOPKG) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_ENOMEM) { + else if (request_id == PKGMGR_R_ENOMEM) return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_EIO) { + else if (request_id == PKGMGR_R_EIO) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_EPRIV) { + else if (request_id == PKGMGR_R_EPRIV) return package_manager_error(PACKAGE_MANAGER_ERROR_PERMISSION_DENIED, __FUNCTION__, NULL); - } else if (request_id == PKGMGR_R_ESYSTEM || request_id == PKGMGR_R_ECOMM || request_id == PKGMGR_R_ERROR) { + else if (request_id == PKGMGR_R_ESYSTEM || request_id == PKGMGR_R_ECOMM || request_id == PKGMGR_R_ERROR) return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - } *id = request_id; @@ -535,12 +529,11 @@ API int package_manager_request_move(package_manager_request_h request, if (retval != PACKAGE_MANAGER_ERROR_NONE) return retval; - if (package_manager_client_validate_handle(request)) { + if (package_manager_client_validate_handle(request)) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } - if (name == NULL) { + + if (name == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } int ret = 0; request->pkg_name = name; @@ -551,20 +544,18 @@ API int package_manager_request_move(package_manager_request_h request, else ret = pkgmgr_client_move(request->pc, request->pkg_type, request->pkg_name, move_type, request->mode); - if (ret == PKGMGR_R_EINVAL) { + if (ret == PKGMGR_R_EINVAL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } else if (ret == PKGMGR_R_ENOPKG) { + else if (ret == PKGMGR_R_ENOPKG) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else if (ret == PKGMGR_R_ENOMEM) { + else if (ret == PKGMGR_R_ENOMEM) return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } else if (ret == PKGMGR_R_EIO) { + else if (ret == PKGMGR_R_EIO) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } else if (ret == PKGMGR_R_EPRIV) { + else if (ret == PKGMGR_R_EPRIV) return package_manager_error(PACKAGE_MANAGER_ERROR_PERMISSION_DENIED, __FUNCTION__, NULL); - } else if (ret == PKGMGR_R_ESYSTEM || ret == PKGMGR_R_ECOMM || ret == PKGMGR_R_ERROR) { + else if (ret == PKGMGR_R_ESYSTEM || ret == PKGMGR_R_ECOMM || ret == PKGMGR_R_ERROR) return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - } - return PACKAGE_MANAGER_ERROR_NONE; } @@ -613,9 +604,8 @@ API int package_manager_create(package_manager_h * manager) static int package_manager_validate_handle(package_manager_h manager) { - if (manager == NULL || manager->pc == NULL) { + if (manager == NULL || manager->pc == NULL) return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER; - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -853,15 +843,13 @@ API int package_manager_set_event_status(package_manager_h manager, int status_t { int retval; - if (manager == NULL){ + if (manager == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } retval = pkgmgrinfo_client_set_status_type(manager->pc, status_type); - if (retval < 0){ + if (retval < 0) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -886,7 +874,7 @@ API int package_manager_set_event_cb(package_manager_h manager, manager->event_cb = callback; manager->user_data = user_data; - pkgmgr_client_listen_status(manager->pc, global_event_handler, manager); + pkgmgr_client_listen_status(manager->pc, global_event_handler, manager); return PACKAGE_MANAGER_ERROR_NONE; } @@ -900,7 +888,7 @@ API int package_manager_unset_event_cb(package_manager_h manager) NULL); } - // TODO: Please implement this function. + /* TODO: Please implement this function. */ return PACKAGE_MANAGER_ERROR_NONE; } @@ -929,7 +917,7 @@ API int package_manager_set_global_event_cb(package_manager_h manager, manager->global_event_cb = callback; manager->user_data = user_data; - pkgmgr_client_listen_status(manager->pc, global_event_handler, manager); + pkgmgr_client_listen_status(manager->pc, global_event_handler, manager); return PACKAGE_MANAGER_ERROR_NONE; } @@ -943,7 +931,7 @@ API int package_manager_unset_global_event_cb(package_manager_h manager) NULL); } - // TODO: Please implement this function. + /* TODO: Please implement this function. */ return PACKAGE_MANAGER_ERROR_NONE; } @@ -962,24 +950,19 @@ API int package_manager_get_package_id_by_app_id(const char *app_id, char **pack return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); uid_t uid = getuid(); - if (uid != GLOBAL_USER) - { + if (uid != GLOBAL_USER) { if (pkgmgrinfo_appinfo_get_usr_appinfo(app_id, uid, &pkgmgrinfo_appinfo) != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else - { + } else { if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } retval = pkgmgrinfo_appinfo_get_pkgname(pkgmgrinfo_appinfo, &pkg_id); if (retval != PMINFO_R_OK) - { return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } pkg_id_dup = strdup(pkg_id); - if (pkg_id_dup == NULL) - { + if (pkg_id_dup == NULL) { pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); } @@ -1020,24 +1003,20 @@ API int package_manager_foreach_package_info(package_manager_package_info_cb cal if (retval != PACKAGE_MANAGER_ERROR_NONE) return package_manager_error(retval, __FUNCTION__, NULL); else - { return PACKAGE_MANAGER_ERROR_NONE; - } } API int package_manager_compare_package_cert_info(const char *lhs_package_id, const char *rhs_package_id, package_manager_compare_result_type_e *compare_result) { pkgmgrinfo_cert_compare_result_type_e result; - uid_t uid = getuid(); + uid_t uid = getuid(); if (lhs_package_id == NULL || rhs_package_id == NULL || compare_result == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (uid != GLOBAL_USER) - { + if (uid != GLOBAL_USER) { if (pkgmgrinfo_pkginfo_compare_usr_pkg_cert_info(lhs_package_id, rhs_package_id, uid, &result) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } else - { + } else { if (pkgmgrinfo_pkginfo_compare_pkg_cert_info(lhs_package_id, rhs_package_id, &result) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); } @@ -1053,12 +1032,10 @@ API int package_manager_compare_app_cert_info(const char *lhs_app_id, const char if (lhs_app_id == NULL || rhs_app_id == NULL || compare_result == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (uid != GLOBAL_USER) - { + if (uid != GLOBAL_USER) { if (pkgmgrinfo_pkginfo_compare_usr_app_cert_info(lhs_app_id, rhs_app_id, uid, &result) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } else - { + } else { if (pkgmgrinfo_pkginfo_compare_app_cert_info(lhs_app_id, rhs_app_id, &result) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); } @@ -1082,40 +1059,33 @@ API int package_manager_is_preload_package_by_app_id(const char *app_id, bool *p char *pkg_id = NULL; bool is_preload = 0; uid_t uid = getuid(); - if (uid != GLOBAL_USER) - { + if (uid != GLOBAL_USER) { if (pkgmgrinfo_appinfo_get_usr_appinfo(app_id, uid, &pkgmgrinfo_appinfo) != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else - { + } else { if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } + } + retval = pkgmgrinfo_appinfo_get_pkgname(pkgmgrinfo_appinfo, &pkg_id); - if (retval != PMINFO_R_OK) - { + if (retval != PMINFO_R_OK) { pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } - if (uid != GLOBAL_USER) - { - if (pkgmgrinfo_pkginfo_get_usr_pkginfo(pkg_id, uid, &pkgmgrinfo_pkginfo) != PMINFO_R_OK) - { + if (uid != GLOBAL_USER) { + if (pkgmgrinfo_pkginfo_get_usr_pkginfo(pkg_id, uid, &pkgmgrinfo_pkginfo) != PMINFO_R_OK) { pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgrinfo_pkginfo); return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } - } else - { - if (pkgmgrinfo_pkginfo_get_pkginfo(pkg_id, &pkgmgrinfo_pkginfo) != PMINFO_R_OK) - { + } else { + if (pkgmgrinfo_pkginfo_get_pkginfo(pkg_id, &pkgmgrinfo_pkginfo) != PMINFO_R_OK) { pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgrinfo_pkginfo); return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } } - if (pkgmgrinfo_pkginfo_is_preload(pkgmgrinfo_pkginfo, &is_preload) != PMINFO_R_OK) - { + if (pkgmgrinfo_pkginfo_is_preload(pkgmgrinfo_pkginfo, &is_preload) != PMINFO_R_OK) { pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgrinfo_pkginfo); return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); @@ -1140,11 +1110,10 @@ API int package_manager_get_permission_type(const char *app_id, package_manager_ if (retval != PACKAGE_MANAGER_ERROR_NONE) return retval; - pkgmgrinfo_appinfo_h pkgmgrinfo_appinfo =NULL; + pkgmgrinfo_appinfo_h pkgmgrinfo_appinfo = NULL; pkgmgrinfo_permission_type permission = 0; uid_t uid = getuid(); - if (uid != GLOBAL_USER) - { + if (uid != GLOBAL_USER) { if (pkgmgrinfo_appinfo_get_usr_appinfo(app_id, uid, &pkgmgrinfo_appinfo) != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } else { @@ -1177,32 +1146,19 @@ API int package_manager_clear_cache_dir(const char *package_id) return retval; int res = pkgmgr_client_usr_clear_cache_dir(package_id, getuid()); - if (res == PKGMGR_R_EINVAL) - { + if (res == PKGMGR_R_EINVAL) { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_ENOPKG) - { + } else if (res == PKGMGR_R_ENOPKG) { return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_ENOMEM) - { + } else if (res == PKGMGR_R_ENOMEM) { return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_EIO) - { + } else if (res == PKGMGR_R_EIO) { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_EPRIV) - { + } else if (res == PKGMGR_R_EPRIV) { return package_manager_error(PACKAGE_MANAGER_ERROR_PERMISSION_DENIED, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_ESYSTEM || res == PKGMGR_R_ECOMM || res == PKGMGR_R_ERROR) - { + } else if (res == PKGMGR_R_ESYSTEM || res == PKGMGR_R_ECOMM || res == PKGMGR_R_ERROR) { return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - } - else if (res != PKGMGR_R_OK) - { + } else if (res != PKGMGR_R_OK) { _LOGE("Unexpected error"); return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); } @@ -1229,8 +1185,7 @@ static void __initialize_cb_table(void) static void __result_cb(pkgmgr_client *pc, const char *pkgid, const pkg_size_info_t *result, void *user_data) { package_manager_size_info_receive_cb callback = g_hash_table_lookup(__cb_table, pc); - if (callback == NULL) - { + if (callback == NULL) { _LOGE("callback is null."); g_hash_table_remove(__cb_table, pc); return; @@ -1252,8 +1207,7 @@ static void __result_cb(pkgmgr_client *pc, const char *pkgid, const pkg_size_inf static void __total_result_cb(pkgmgr_client *pc, const pkg_size_info_t *result, void *user_data) { package_manager_total_size_info_receive_cb callback = g_hash_table_lookup(__cb_table, pc); - if (callback == NULL) - { + if (callback == NULL) { _LOGE("callback is null."); g_hash_table_remove(__cb_table, pc); return; @@ -1275,63 +1229,40 @@ static void __total_result_cb(pkgmgr_client *pc, const pkg_size_info_t *result, API int package_manager_get_package_size_info(const char *package_id, package_manager_size_info_receive_cb callback, void *user_data) { if (package_id == NULL || callback == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } if (__cb_table == NULL) - { __initialize_cb_table(); - } pkgmgr_client *pc = pkgmgr_client_new(PC_REQUEST); if (pc == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - } int res = 0; if (strcmp(package_id, PKG_SIZE_INFO_TOTAL) != 0) - { res = pkgmgr_client_usr_get_package_size_info(pc, package_id, __result_cb, user_data, getuid()); - } else - { res = pkgmgr_client_usr_get_total_package_size_info(pc, __total_result_cb, user_data, getuid()); - } - if (res == PKGMGR_R_EINVAL) - { + if (res == PKGMGR_R_EINVAL) { pkgmgr_client_free(pc); return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_ENOPKG) - { + } else if (res == PKGMGR_R_ENOPKG) { pkgmgr_client_free(pc); return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_ENOMEM) - { + } else if (res == PKGMGR_R_ENOMEM) { pkgmgr_client_free(pc); return package_manager_error(PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_EIO) - { + } else if (res == PKGMGR_R_EIO) { pkgmgr_client_free(pc); return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_EPRIV) - { + } else if (res == PKGMGR_R_EPRIV) { pkgmgr_client_free(pc); return package_manager_error(PACKAGE_MANAGER_ERROR_PERMISSION_DENIED, __FUNCTION__, NULL); - } - else if (res == PKGMGR_R_ESYSTEM || res == PKGMGR_R_ECOMM || res == PKGMGR_R_ERROR) - { + } else if (res == PKGMGR_R_ESYSTEM || res == PKGMGR_R_ECOMM || res == PKGMGR_R_ERROR) { pkgmgr_client_free(pc); return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); - } - else if (res != PKGMGR_R_OK) - { + } else if (res != PKGMGR_R_OK) { _LOGE("Unexpected error"); pkgmgr_client_free(pc); return package_manager_error(PACKAGE_MANAGER_ERROR_SYSTEM_ERROR, __FUNCTION__, NULL); @@ -1357,8 +1288,7 @@ API int package_manager_filter_create(package_manager_filter_h *handle) if (retval != PACKAGE_MANAGER_ERROR_NONE) return retval; - if (handle == NULL) - { + if (handle == NULL) { return package_manager_error (PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, @@ -1367,9 +1297,7 @@ API int package_manager_filter_create(package_manager_filter_h *handle) retval = pkgmgrinfo_pkginfo_filter_create(&pkgmgr_filter); if (retval != PACKAGE_MANAGER_ERROR_NONE) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } *handle = pkgmgr_filter; @@ -1380,8 +1308,7 @@ API int package_manager_filter_destroy(package_manager_filter_h handle) { int retval; - if (handle == NULL) - { + if (handle == NULL) { return package_manager_error (PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, @@ -1390,9 +1317,7 @@ API int package_manager_filter_destroy(package_manager_filter_h handle) retval = pkgmgrinfo_pkginfo_filter_destroy(handle); if (retval != PACKAGE_MANAGER_ERROR_NONE) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -1402,8 +1327,7 @@ API int package_manager_filter_add_bool(package_manager_filter_h handle, { int retval; - if ((handle == NULL) || (property == NULL)) - { + if ((handle == NULL) || (property == NULL)) { return package_manager_error (PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, @@ -1412,9 +1336,7 @@ API int package_manager_filter_add_bool(package_manager_filter_h handle, retval = pkgmgrinfo_pkginfo_filter_add_bool(handle, property, value); if (retval != PACKAGE_MANAGER_ERROR_NONE) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -1428,15 +1350,11 @@ API int package_manager_filter_count(package_manager_filter_h handle, int *count return retval; if ((handle == NULL) || (count == NULL)) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } retval = pkgmgrinfo_pkginfo_filter_count(handle, count); if (retval < 0) - { return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } return PACKAGE_MANAGER_ERROR_NONE; } @@ -1453,13 +1371,9 @@ API int package_manager_filter_foreach_package_info(package_manager_filter_h han retval = package_info_filter_foreach_package_info(handle, callback, user_data); if (retval != PACKAGE_MANAGER_ERROR_NONE) - { return package_manager_error(retval, __FUNCTION__, NULL); - } else - { return PACKAGE_MANAGER_ERROR_NONE; - } } API int package_size_info_get_data_size(package_size_info_h handle, long long *data_size) diff --git a/src/package_manager_internal.c b/src/package_manager_internal.c index 5791282..5233bc1 100644 --- a/src/package_manager_internal.c +++ b/src/package_manager_internal.c @@ -29,12 +29,13 @@ #define SMACK_LABEL_LEN 255 #define GLOBAL_USER tzplatform_getuid(TZ_SYS_GLOBALAPP_USER) -typedef struct _foreach_pkg_context_{ +typedef struct _foreach_pkg_context_ { package_manager_package_info_cb callback; void *user_data; } foreach_pkg_context_s; -int check_privilege(privilege_type type) { +int check_privilege(privilege_type type) +{ cynara *p_cynara; @@ -154,16 +155,14 @@ static int package_info_foreach_package_info_cb(const pkgmgrinfo_pkginfo_h handl package_info_h package_info = NULL; bool r = false; - if (handle == NULL || foreach_pkg_context == NULL) - { + if (handle == NULL || foreach_pkg_context == NULL) { package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); return PMINFO_R_EINVAL; } pkgmgrinfo_pkginfo_get_pkgname(handle, &pkg_name); - if (package_info_create(pkg_name, &package_info) == PACKAGE_MANAGER_ERROR_NONE) - { + if (package_info_create(pkg_name, &package_info) == PACKAGE_MANAGER_ERROR_NONE) { r = foreach_pkg_context->callback(package_info, foreach_pkg_context->user_data); package_info_destroy(package_info); } @@ -180,17 +179,16 @@ int package_info_foreach_package_info(package_manager_package_info_cb callback, int ret = 0; if (callback == NULL) - { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - } + uid_t uid = getuid(); if (uid != GLOBAL_USER) ret = pkgmgrinfo_pkginfo_get_usr_list(package_info_foreach_package_info_cb, &foreach_pkg_context, uid); else ret = pkgmgrinfo_pkginfo_get_list(package_info_foreach_package_info_cb, &foreach_pkg_context); - if (ret < 0) { + + if (ret < 0) return PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE; - } return PACKAGE_MANAGER_ERROR_NONE; } diff --git a/tool/main.c b/tool/main.c index 91fc244..b76e486 100644 --- a/tool/main.c +++ b/tool/main.c @@ -71,9 +71,8 @@ static int _get_packageinfo(const char *package) ret = package_manager_get_package_info(package, &package_info); - if (ret != PACKAGE_MANAGER_ERROR_NONE) { + if (ret != PACKAGE_MANAGER_ERROR_NONE) return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER; - } package_info_get_package(package_info, &pkg); package_info_get_label(package_info, &label); @@ -98,9 +97,8 @@ static int _get_packageinfo(const char *package) package_info_foreach_cert_info(package_info, _cert_info_cb, NULL); ret = package_info_destroy(package_info); - if (ret != PACKAGE_MANAGER_ERROR_NONE) { + if (ret != PACKAGE_MANAGER_ERROR_NONE) return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER; - } return PACKAGE_MANAGER_ERROR_NONE; } -- 2.7.4