Change prefix related with resource event

'res_copy_' to 'res_'

Change-Id: I95f706283fc6ed57e69555faa6716917c97f1e67
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/client/include/package-manager.h b/client/include/package-manager.h
index b299d35..a246644 100644 (file)
--- a/client/include/package-manager.h
+++ b/client/include/package-manager.h
@@ -200,7 +200,7 @@ typedef void (*pkgmgr_pkg_size_info_receive_cb)(pkgmgr_client *pc, const char *p
 typedef void (*pkgmgr_total_pkg_size_info_receive_cb)(pkgmgr_client *pc,
                const pkg_size_info_t *size_info, void *user_data);
 
-typedef void (*pkgmgr_res_copy_handler)(uid_t target_uid, int req_id,
+typedef void (*pkgmgr_res_handler)(uid_t target_uid, int req_id,
                const char *pkgid, const char *request_type, const char *status,
                pkgmgr_res_event_info *handle, void *user_data);
 
@@ -797,8 +797,8 @@ int pkgmgr_client_listen_app_status(pkgmgr_client *pc, pkgmgr_app_handler event_
  * @retval     PKGMGR_R_EINVAL invalid argument
  * @retval     PKGMGR_R_ENOMEM out of memory
 */
-int pkgmgr_client_listen_res_copy_status(pkgmgr_client *pc,
-               pkgmgr_res_copy_handler event_cb, void *data);
+int pkgmgr_client_listen_res_status(pkgmgr_client *pc,
+               pkgmgr_res_handler event_cb, void *data);
 
 /**
  * @brief      This API request to stop listen the pkgmgr's broadcasting
@@ -1236,7 +1236,7 @@ int pkgmgr_client_usr_migrate_external_image(pkgmgr_client *pc, const char *pkgi
 int pkgmgr_client_add_res_copy_path(pkgmgr_client *pc, const char *src_path, const char *dest_path);
 
 /**
- * @brief      This API copy resources.
+ * @brief      This API is for copy resources into shared directory exists for privileged resources.
  *
  * This API is for package-manager client application.\n
  *
@@ -1244,13 +1244,12 @@ int pkgmgr_client_add_res_copy_path(pkgmgr_client *pc, const char *src_path, con
  * @param[in]  event_cb        user callback
  * @param[in]  data            user data
  * @return     request_id (>0) if success, error code(<0) if fail\n
- * @retval     PKGMGR_R_OK     success
  * @retval     PKGMGR_R_ECOMM  communication error
  * @retval     PKGMGR_R_EINVAL invalid argument
  * @retval     PKGMGR_R_ENOMEM out of memory
  * @retval     PKGMGR_R_EPRIV  privilege denied
 */
-int pkgmgr_client_res_copy(pkgmgr_client *pc, pkgmgr_res_copy_handler event_cb, void *user_data);
+int pkgmgr_client_res_copy(pkgmgr_client *pc, pkgmgr_res_handler event_cb, void *user_data);
 
 /**
  * @brief      Add directory path to create in the resource sharing directory of the package
@@ -1259,7 +1258,7 @@ int pkgmgr_client_res_copy(pkgmgr_client *pc, pkgmgr_res_copy_handler event_cb,
  *
  * @param[in]  pc              The pointer to pkgmgr_client instance
  * @param[in]  dir_path        Path of a directory that client want to create
- * @return     0 if success, error code(<0) if fail\n
+ * @return     PKGMGR_R_OK if success, error code(<0) if fail\n
  * @retval     PKGMGR_R_OK     success
  * @retval     PKGMGR_R_EINVAL invalid argument
  * @retval     PKGMGR_R_ENOMEM out of memory
@@ -1275,13 +1274,12 @@ int pkgmgr_client_add_res_create_dir_path(pkgmgr_client *pc, const char *dir_pat
  * @param[in]  event_cb        user callback
  * @param[in]  data            user data
  * @return     request_id (>0) if success, error code(<0) if fail\n
- * @retval     PKGMGR_R_OK     success
  * @retval     PKGMGR_R_ECOMM  communication error
  * @retval     PKGMGR_R_EINVAL invalid argument
  * @retval     PKGMGR_R_ENOMEM out of memory
  * @retval     PKGMGR_R_EPRIV  privilege denied
 */
-int pkgmgr_client_res_create_dir(pkgmgr_client *pc, pkgmgr_res_copy_handler event_cb, void *user_data);
+int pkgmgr_client_res_create_dir(pkgmgr_client *pc, pkgmgr_res_handler event_cb, void *user_data);
 
 /**
  * @brief      Add resource path to remove
@@ -1290,7 +1288,7 @@ int pkgmgr_client_res_create_dir(pkgmgr_client *pc, pkgmgr_res_copy_handler even
  *
  * @param[in]  pc              The pointer to pkgmgr_client instance
  * @param[in]  res_path        Path of a copied resource that client want to remove
- * @return     0 if success, error code(<0) if fail\n
+ * @return     PKGMGR_R_OK if success, error code(<0) if fail\n
  * @retval     PKGMGR_R_OK     success
  * @retval     PKGMGR_R_EINVAL invalid argument
  * @retval     PKGMGR_R_ENOMEM out of memory
@@ -1306,13 +1304,12 @@ int pkgmgr_client_add_res_remove_path(pkgmgr_client *pc, const char *res_path);
  * @param[in]  event_cb        user callback
  * @param[in]  data            user data
  * @return     request_id (>0) if success, error code(<0) if fail\n
- * @retval     PKGMGR_R_OK     success
  * @retval     PKGMGR_R_ECOMM  communication error
  * @retval     PKGMGR_R_EINVAL invalid argument
  * @retval     PKGMGR_R_ENOMEM out of memory
  * @retval     PKGMGR_R_EPRIV  privilege denied
 */
-int pkgmgr_client_res_remove(pkgmgr_client *pc, pkgmgr_res_copy_handler event_cb, void *user_data);
+int pkgmgr_client_res_remove(pkgmgr_client *pc, pkgmgr_res_handler event_cb, void *user_data);
 
 /**
  * @brief      This API uninstall copied resources of the package.

diff --git a/client/src/pkgmgr.c b/client/src/pkgmgr.c
index c8081ee..ae55972 100644 (file)
--- a/client/src/pkgmgr.c
+++ b/client/src/pkgmgr.c
@@ -142,9 +142,9 @@ static struct cb_info *__create_app_event_cb_info(
        return cb_info;
 }
 
-static struct cb_info *__create_res_copy_event_cb_info(
+static struct cb_info *__create_res_event_cb_info(
                struct pkgmgr_client_t *client,
-               pkgmgr_res_copy_handler res_copy_event_cb,
+               pkgmgr_res_handler res_event_cb,
                void *data, const char *req_key)
 {
        struct cb_info *cb_info;
@@ -156,7 +156,7 @@ static struct cb_info *__create_res_copy_event_cb_info(
        }
 
        cb_info->client = client;
-       cb_info->res_copy_event_cb = res_copy_event_cb;
+       cb_info->res_event_cb = res_event_cb;
        cb_info->data = data;
        cb_info->req_id = _get_internal_request_id();
        if (req_key == NULL)
@@ -1885,8 +1885,8 @@ API int pkgmgr_client_listen_app_status(pkgmgr_client *pc,
        return cb_info->req_id;
 }
 
-API int pkgmgr_client_listen_res_copy_status(pkgmgr_client *pc,
-               pkgmgr_res_copy_handler event_cb, void *data)
+API int pkgmgr_client_listen_res_status(pkgmgr_client *pc,
+               pkgmgr_res_handler event_cb, void *data)
 {
        int ret;
        struct pkgmgr_client_t *client = (struct pkgmgr_client_t *)pc;
@@ -1902,7 +1902,7 @@ API int pkgmgr_client_listen_res_copy_status(pkgmgr_client *pc,
                return PKGMGR_R_EINVAL;
        }
 
-       cb_info = __create_res_copy_event_cb_info(client, event_cb, data, NULL);
+       cb_info = __create_res_event_cb_info(client, event_cb, data, NULL);
        if (cb_info == NULL)
                return PKGMGR_R_ENOMEM;
        cb_info->status_type = client->status_type;
@@ -2821,7 +2821,7 @@ API int pkgmgr_client_add_res_copy_path(pkgmgr_client *pc,
 }
 
 API int pkgmgr_client_res_copy(pkgmgr_client *pc,
-               pkgmgr_res_copy_handler event_cb, void *user_data)
+               pkgmgr_res_handler event_cb, void *user_data)
 {
        GVariant *result;
        int ret;
@@ -2853,7 +2853,7 @@ API int pkgmgr_client_res_copy(pkgmgr_client *pc,
                return ret;
        }
 
-       cb_info = __create_res_copy_event_cb_info(client,
+       cb_info = __create_res_event_cb_info(client,
                        event_cb, user_data, req_key);
        g_variant_unref(result);
        if (cb_info == NULL)
@@ -2894,7 +2894,7 @@ API int pkgmgr_client_add_res_create_dir_path(pkgmgr_client *pc,
 }
 
 API int pkgmgr_client_res_create_dir(pkgmgr_client *pc,
-               pkgmgr_res_copy_handler event_cb, void *user_data)
+               pkgmgr_res_handler event_cb, void *user_data)
 {
        GVariant *result;
        int ret;
@@ -2926,7 +2926,7 @@ API int pkgmgr_client_res_create_dir(pkgmgr_client *pc,
                return ret;
        }
 
-       cb_info = __create_res_copy_event_cb_info(client,
+       cb_info = __create_res_event_cb_info(client,
                        event_cb, user_data, req_key);
        g_variant_unref(result);
        if (cb_info == NULL)
@@ -2967,7 +2967,7 @@ API int pkgmgr_client_add_res_remove_path(pkgmgr_client *pc,
 }
 
 API int pkgmgr_client_res_remove(pkgmgr_client *pc,
-               pkgmgr_res_copy_handler event_cb, void *user_data)
+               pkgmgr_res_handler event_cb, void *user_data)
 {
        GVariant *result;
        int ret;
@@ -2999,7 +2999,7 @@ API int pkgmgr_client_res_remove(pkgmgr_client *pc,
                return ret;
        }
 
-       cb_info = __create_res_copy_event_cb_info(client,
+       cb_info = __create_res_event_cb_info(client,
                        event_cb, user_data, req_key);
        g_variant_unref(result);
        if (cb_info == NULL)

diff --git a/client/src/pkgmgr_client_connection.c b/client/src/pkgmgr_client_connection.c
index a2e161f..4a010af 100644 (file)
--- a/client/src/pkgmgr_client_connection.c
+++ b/client/src/pkgmgr_client_connection.c
@@ -240,7 +240,7 @@ static void __handle_pkg_signal(const gchar *signal_name,
        g_variant_iter_free(iter);
 }
 
-static void __handle_res_copy_event_signal(const gchar *signal_name,
+static void __handle_res_event_signal(const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
        uid_t target_uid;
@@ -252,7 +252,7 @@ static void __handle_res_copy_event_signal(const gchar *signal_name,
        GVariant *extra_param = NULL;
        pkgmgr_res_event_info_t event_info;
 
-       if (!cb_info->res_copy_event_cb)
+       if (!cb_info->res_event_cb)
                return;
 
        g_variant_get(parameters, "(u&s&s&sv)", &target_uid, &req_id, &pkgid, &status, &extra_param);
@@ -276,7 +276,7 @@ static void __handle_res_copy_event_signal(const gchar *signal_name,
        }
 
        g_variant_get(extra_param, "(i)", &event_info.error_code);
-       cb_info->res_copy_event_cb(target_uid, cb_info->req_id, pkgid, signal_name,
+       cb_info->res_event_cb(target_uid, cb_info->req_id, pkgid, signal_name,
                        status, &event_info, cb_info->data);
        g_variant_unref(extra_param);
 }
@@ -293,7 +293,7 @@ static void __signal_handler(GDBusConnection *conn, const gchar *sender_name,
                        !strcmp(signal_name, PKGMGR_INSTALLER_RES_REMOVE_EVENT_STR) ||
                        !strcmp(signal_name, PKGMGR_INSTALLER_RES_UNINSTALL_EVENT_STR) ||
                        !strcmp(signal_name, PKGMGR_INSTALLER_RES_CREATE_DIR_EVENT_STR)) {
-               __handle_res_copy_event_signal(signal_name, parameters, user_data);
+               __handle_res_event_signal(signal_name, parameters, user_data);
        }
 }
 

diff --git a/client/src/pkgmgr_client_internal.h b/client/src/pkgmgr_client_internal.h
index e1618b0..02c4205 100644 (file)
--- a/client/src/pkgmgr_client_internal.h
+++ b/client/src/pkgmgr_client_internal.h
@@ -41,7 +41,7 @@ struct cb_info {
        pkgmgr_handler event_cb;
        pkgmgr_app_handler app_event_cb;
        pkgmgr_pkg_size_info_receive_cb size_info_cb;
-       pkgmgr_res_copy_handler res_copy_event_cb;
+       pkgmgr_res_handler res_event_cb;
        void *data;
        struct pkgmgr_client_t *client;
        GList *sid_list;

diff --git a/installer/pkgmgr_installer.c b/installer/pkgmgr_installer.c
index ea7cc3e..ce4bba6 100644 (file)
--- a/installer/pkgmgr_installer.c
+++ b/installer/pkgmgr_installer.c
@@ -1264,7 +1264,7 @@ static GVariant *__get_gvariant_from_event_info(pkgmgr_res_event_info *event_inf
        return g_variant_new("(i)", info->error_code);
 }
 
-API int pkgmgr_installer_send_res_copy_signal(pkgmgr_installer *pi,
+API int pkgmgr_installer_send_res_signal(pkgmgr_installer *pi,
                const char *pkgid, const char *status,
                pkgmgr_res_event_info *event_info)
 {
@@ -1306,7 +1306,7 @@ API int pkgmgr_installer_send_res_copy_signal(pkgmgr_installer *pi,
        return 0;
 }
 
-API int pkgmgr_installer_send_res_copy_signal_for_uid(pkgmgr_installer *pi,
+API int pkgmgr_installer_send_res_signal_for_uid(pkgmgr_installer *pi,
                uid_t uid, const char *pkgid, const char *status,
                pkgmgr_res_event_info *event_info)
 {

diff --git a/installer/pkgmgr_installer.h b/installer/pkgmgr_installer.h
index e133dd6..a6848f5 100644 (file)
--- a/installer/pkgmgr_installer.h
+++ b/installer/pkgmgr_installer.h
@@ -1234,7 +1234,7 @@ int pkgmgr_installer_set_is_upgrade(pkgmgr_installer *pi, int is_upgrade);
        @retval         0 on success, otherwise -1
        @code
 #include <pkgmgr_installer.h>
-void send_res_copy_singal(uid_t uid, int request_type, const char *session_id,
+void send_res_singal(uid_t uid, int request_type, const char *session_id,
                const char *pkgid, const char *status,
                pkgmgr_res_event_info *event_info)
 {
@@ -1250,12 +1250,12 @@ void send_res_copy_singal(uid_t uid, int request_type, const char *session_id,
                goto CLEANUP_RET;
        if ((pkgmgr_installer_set_session_id(pi, session_id))
                goto CLEANUP_RET;
-       pkgmgr_installer_send_res_copy_signal(pi, pkgid, status, event_info);
+       pkgmgr_installer_send_res_signal(pi, pkgid, status, event_info);
 
 }
        @endcode
  */
-int pkgmgr_installer_send_res_copy_signal(pkgmgr_installer *pi,
+int pkgmgr_installer_send_res_signal(pkgmgr_installer *pi,
                const char *pkgid, const char *status,
                pkgmgr_res_event_info *event_info);
 
@@ -1272,7 +1272,7 @@ int pkgmgr_installer_send_res_copy_signal(pkgmgr_installer *pi,
        @return         Operation result
        @retval         0 on success, otherwise -1
  */
-int pkgmgr_installer_send_res_copy_signal_for_uid(pkgmgr_installer *pi,
+int pkgmgr_installer_send_res_signal_for_uid(pkgmgr_installer *pi,
                uid_t uid, const char *pkgid, const char *status,
                pkgmgr_res_event_info *event_info);