Remove unnecessary white line

[platform/core/api/package-manager.git] / src / package_manager.c

diff --git a/src/package_manager.c b/src/package_manager.c
index 116d0b2..c3af1a8 100644 (file)
--- a/src/package_manager.c
+++ b/src/package_manager.c
@@ -40,6 +40,7 @@ typedef struct _request_event_info {
 struct package_manager_event_info {
        char *pkg_name;
        package_manager_event_type_e event_type;
+       package_manager_event_state_e event_state;
 };
 
 struct package_manager_s {
@@ -117,7 +118,8 @@ static void __clean_all_event_info(request_event_info *head)
 }
 
 static int __insert_event_info(package_manager_h manager, const char *pkg_name,
-                       package_manager_event_type_e event_type)
+                       package_manager_event_type_e event_type,
+                       package_manager_event_state_e event_state)
 {
        struct package_manager_event_info *info;
 
@@ -126,6 +128,7 @@ static int __insert_event_info(package_manager_h manager, const char *pkg_name,
                return -1;
        info->pkg_name = strdup(pkg_name);
        info->event_type = event_type;
+       info->event_state = event_state;
        g_hash_table_insert(manager->event_info_table, info->pkg_name, info);
 
        return 0;
@@ -271,6 +274,10 @@ API int package_manager_request_set_event_cb(package_manager_request_h request,
 {
        int ret;
 
+       if (package_manager_client_validate_handle(request))
+               return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER,
+                               __FUNCTION__, NULL);
+
        ret = check_privilege(PRIVILEGE_PACKAGE_MANAGER_INFO);
        if (ret != PACKAGE_MANAGER_ERROR_NONE)
                return ret;
@@ -299,6 +306,8 @@ API int package_manager_request_set_type(package_manager_request_h request,
                     NULL);
        }
 
+       if (request->pkg_type)
+               free(request->pkg_type);
        request->pkg_type = strdup(pkg_type);
 
        return PACKAGE_MANAGER_ERROR_NONE;
@@ -379,6 +388,7 @@ static int __add_event_info(request_event_info **head, int req_id,
        }
        evt_info->req_id = req_id;
        evt_info->event_type = event_type;
+       evt_info->event_state = event_state;
        evt_info->next = NULL;
 
        if (*head == NULL)
@@ -412,6 +422,7 @@ static int __find_event_info(request_event_info **head, int req_id,
        while (tmp) {
                if (tmp->req_id == req_id) {
                        *event_type = tmp->event_type;
+                       *event_state = tmp->event_state;
                        return 0;
                }
                tmp = tmp->next;
@@ -440,6 +451,7 @@ static int __update_event_info(request_event_info **head, int req_id,
                while (tmp) {
                        if (tmp->req_id == req_id) {
                                tmp->event_type = event_type;
+                               tmp->event_state = event_state;
                                return 0;
                        }
                        tmp = tmp->next;
@@ -491,24 +503,22 @@ static int request_event_handler(uid_t target_uid, int req_id, const char *pkg_t
                }
 
        } else if (strcasecmp(key, "error") == 0) {
-               if (strcasecmp(key, "0") != 0) {
-                       if (__find_event_info
-                           (&(request->head), req_id, &event_type,
-                            &event_state) == 0) {
-                               __update_event_info(&(request->head), req_id,
-                                                   event_type,
-                                                   PACKAGE_MANAGER_EVENT_STATE_FAILED);
-                       }
+               if (__find_event_info
+                   (&(request->head), req_id, &event_type,
+                    &event_state) == 0) {
+                       __update_event_info(&(request->head), req_id,
+                                           event_type,
+                                           PACKAGE_MANAGER_EVENT_STATE_FAILED);
+               }
 
-                       if (request->event_cb)
-                               request->event_cb(req_id, pkg_type,
-                                                 pkg_name, event_type,
-                                                 PACKAGE_MANAGER_EVENT_STATE_FAILED,
-                                                 0,
-                                                 PACKAGE_MANAGER_ERROR_NONE,
-                                                 request->user_data);
+               if (request->event_cb)
+                       request->event_cb(req_id, pkg_type,
+                                         pkg_name, event_type,
+                                         PACKAGE_MANAGER_EVENT_STATE_FAILED,
+                                         0,
+                                         PACKAGE_MANAGER_ERROR_NONE,
+                                         request->user_data);
 
-               }
        } else if (strcasecmp(key, "end") == 0) {
                if (__find_event_info
                    (&(request->head), req_id, &event_type,
@@ -1009,7 +1019,6 @@ static int internal_callback(uid_t target_uid, int req_id, const char *pkg_type,
 {
        int ret = -1;
        package_manager_event_type_e event_type = -1;
-       package_manager_event_state_e event_state = -1;
        struct package_manager_event_info *info = NULL;
        package_manager_h manager = data;
        uid_t uid = target_uid;
@@ -1043,7 +1052,8 @@ static int internal_callback(uid_t target_uid, int req_id, const char *pkg_type,
                        return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER;
 
                if (!info) {
-                       __insert_event_info(manager, pkg_name, event_type);
+                       __insert_event_info(manager, pkg_name, event_type,
+                                       PACKAGE_MANAGER_EVENT_STATE_STARTED);
 
                        if (manager->event_cb && getuid() == uid)
                                manager->event_cb(pkg_type, pkg_name,
@@ -1057,23 +1067,25 @@ static int internal_callback(uid_t target_uid, int req_id, const char *pkg_type,
                }
        } else if (strcasecmp(key, "install_percent") == 0
                   || strcasecmp(key, "progress_percent") == 0) {
+               info->event_state = PACKAGE_MANAGER_EVENT_STATE_PROCESSING;
                if (manager->event_cb && getuid() == uid)
                        manager->event_cb(pkg_type, pkg_name,
                                        info->event_type,
-                                       PACKAGE_MANAGER_EVENT_STATE_PROCESSING,
+                                       info->event_state,
                                        atoi(val),
                                        PACKAGE_MANAGER_ERROR_NONE,
                                        manager->user_data);
        } else if (strcasecmp(key, "error") == 0) {
+               info->event_state = PACKAGE_MANAGER_EVENT_STATE_FAILED;
                if (manager->event_cb && getuid() == uid)
                        manager->event_cb(pkg_type, pkg_name,
                                        info->event_type,
-                                       PACKAGE_MANAGER_EVENT_STATE_FAILED,
+                                       info->event_state,
                                        0,
                                        PACKAGE_MANAGER_ERROR_NONE,
                                        manager->user_data);
        } else if (strcasecmp(key, "end") == 0) {
-               if (event_state != PACKAGE_MANAGER_EVENT_STATE_FAILED) {
+               if (info->event_state != PACKAGE_MANAGER_EVENT_STATE_FAILED) {
                        if (manager->event_cb && getuid() == uid) {
                                if (strcasecmp(val, "ok") == 0) {
                                        manager->event_cb(pkg_type, pkg_name,
@@ -1154,7 +1166,6 @@ API int package_manager_set_event_cb(package_manager_h manager,
                                 package_manager_event_cb callback,
                                 void *user_data)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_INFO);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1233,8 +1244,10 @@ API int package_manager_get_package_id_by_app_id(const char *app_id, char **pack
        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);
+       }
 
        pkg_id_dup = strdup(pkg_id);
        if (pkg_id_dup == NULL) {
@@ -1267,7 +1280,6 @@ API int package_manager_get_package_info(const char *package_id, package_info_h
 API int package_manager_foreach_package_info(package_manager_package_info_cb callback,
                                        void *user_data)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_INFO);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1310,7 +1322,6 @@ API int package_manager_compare_app_cert_info(const char *lhs_app_id, const char
 
 API int package_manager_is_preload_package_by_app_id(const char *app_id, bool *preload)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_INFO);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1353,7 +1364,6 @@ API int package_manager_is_preload_package_by_app_id(const char *app_id, bool *p
 
 API int package_manager_get_permission_type(const char *app_id, package_manager_permission_type_e *permission_type)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_INFO);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1364,8 +1374,10 @@ API int package_manager_get_permission_type(const char *app_id, package_manager_
        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_permission_type(pkgmgrinfo_appinfo, &permission);
-       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 (permission == PMINFO_PERMISSION_NORMAL)
                *permission_type = PACKAGE_MANAGER_PERMISSION_NORMAL;
@@ -1382,7 +1394,6 @@ API int package_manager_get_permission_type(const char *app_id, package_manager_
 
 API int package_manager_clear_cache_dir(const char *package_id)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_CACHE);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1468,7 +1479,6 @@ API int package_manager_clear_data_dir(const char *package_id)
 
 API int package_manager_clear_all_cache_dir(void)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1653,7 +1663,6 @@ API int package_manager_filter_add_bool(package_manager_filter_h handle,
 
 API int package_manager_filter_count(package_manager_filter_h handle, int *count)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_INFO);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1672,7 +1681,6 @@ API int package_manager_filter_count(package_manager_filter_h handle, int *count
 API int package_manager_filter_foreach_package_info(package_manager_filter_h handle,
                package_manager_package_info_cb callback, void *user_data)
 {
-
        int retval;
        retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_INFO);
        if (retval != PACKAGE_MANAGER_ERROR_NONE)
@@ -1752,7 +1760,7 @@ API int package_manager_updateinfo_set_pkgid(package_updateinfo_request_h pkg_up
 {
        struct package_updateinfo_request_s *request;
 
-       if (pkg_updateinfo_req == NULL || pkg_updateinfo_req->updateinfo_handle == NULL)
+       if (pkg_updateinfo_req == NULL || pkg_updateinfo_req->updateinfo_handle == NULL || pkgid == NULL)
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
 
        request = (struct package_updateinfo_request_s *)pkg_updateinfo_req;
@@ -1769,7 +1777,7 @@ API int package_manager_updateinfo_set_version(package_updateinfo_request_h pkg_
 {
        struct package_updateinfo_request_s *request;
 
-       if (pkg_updateinfo_req == NULL || pkg_updateinfo_req->updateinfo_handle == NULL)
+       if (pkg_updateinfo_req == NULL || pkg_updateinfo_req->updateinfo_handle == NULL || version == NULL)
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
 
        request = (struct package_updateinfo_request_s *)pkg_updateinfo_req;