change the name of optional_file argument to more common one.

Change-Id: Iad1f4ec4b021cbd33e91db8aa207c93780d20085
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/client/include/package-manager.h b/client/include/package-manager.h
index 392b9b8..6465ac8 100644 (file)
--- a/client/include/package-manager.h
+++ b/client/include/package-manager.h
@@ -363,7 +363,7 @@ int pkgmgr_client_free(pkgmgr_client *pc);
  * @param[in]  pkg_type                package type
  * @param[in]  descriptor_path full path that descriptor is located
  * @param[in]  pkg_path                full path that package file is located
- * @param[in]  optional_file   optional file which is used for installation
+ * @param[in]  optional_data   optional data which is used for installation
  * @param[in]  mode            installation mode  - PM_DEFAULT, PM_QUIET
  * @param[in]  event_cb        user callback
  * @param[in]  data            user data
@@ -374,11 +374,11 @@ int pkgmgr_client_free(pkgmgr_client *pc);
 */
 int pkgmgr_client_install(pkgmgr_client *pc, const char *pkg_type,
                            const char *descriptor_path, const char *pkg_path,
-                           const char *optional_file, pkgmgr_mode mode,
+                           const char *optional_data, pkgmgr_mode mode,
                            pkgmgr_handler event_cb, void *data);
 int pkgmgr_client_usr_install(pkgmgr_client *pc, const char *pkg_type,
                            const char *descriptor_path, const char *pkg_path,
-                           const char *optional_file, pkgmgr_mode mode,
+                           const char *optional_data, pkgmgr_mode mode,
                            pkgmgr_handler event_cb, void *data, uid_t uid);
 /**
  * @brief      This API reinstalls package.
@@ -388,7 +388,7 @@ int pkgmgr_client_usr_install(pkgmgr_client *pc, const char *pkg_type,
  * @param[in]  pc      pkgmgr_client
  * @param[in]  pkg_type                package type
  * @param[in]  pkg_path                full path that package file is located
- * @param[in]  optional_file   optional file which is used for installation
+ * @param[in]  optional_data   optional data which is used for installation
  * @param[in]  mode            installation mode  - PM_DEFAULT, PM_QUIET
  * @param[in]  event_cb        user callback
  * @param[in]  data            user data
@@ -398,10 +398,10 @@ int pkgmgr_client_usr_install(pkgmgr_client *pc, const char *pkg_type,
  * @retval     PKGMGR_R_ECOMM  communication error
 */
 int pkgmgr_client_reinstall(pkgmgr_client *pc, const char *pkg_type, const char *pkgid,
-                           const char *optional_file, pkgmgr_mode mode,
+                           const char *optional_data, pkgmgr_mode mode,
                            pkgmgr_handler event_cb, void *data);
 int pkgmgr_client_usr_reinstall(pkgmgr_client * pc, const char *pkg_type, const char *pkgid,
-                                 const char *optional_file, pkgmgr_mode mode,
+                                 const char *optional_data, pkgmgr_mode mode,
                              pkgmgr_handler event_cb, void *data, uid_t uid);
 /**
  * @brief      This API uninstalls package.

diff --git a/client/src/pkgmgr.c b/client/src/pkgmgr.c
index e82154e..bd6e164 100644 (file)
--- a/client/src/pkgmgr.c
+++ b/client/src/pkgmgr.c
@@ -1042,7 +1042,7 @@ API int pkgmgr_client_set_tep_path(pkgmgr_client *pc, char *tep_path, char *tep_
 
 API int pkgmgr_client_usr_install(pkgmgr_client *pc, const char *pkg_type,
                const char *descriptor_path, const char *pkg_path,
-               const char *optional_file, pkgmgr_mode mode,
+               const char *optional_data, pkgmgr_mode mode,
                pkgmgr_handler event_cb, void *data, uid_t uid)
 {
        GVariant *result;
@@ -1117,24 +1117,24 @@ API int pkgmgr_client_usr_install(pkgmgr_client *pc, const char *pkg_type,
 
 API int pkgmgr_client_install(pkgmgr_client *pc, const char *pkg_type,
                const char *descriptor_path, const char *pkg_path,
-               const char *optional_file, pkgmgr_mode mode,
+               const char *optional_data, pkgmgr_mode mode,
                pkgmgr_handler event_cb, void *data)
 {
        return pkgmgr_client_usr_install(pc, pkg_type, descriptor_path,
-                       pkg_path, optional_file, mode, event_cb,data,
+                       pkg_path, optional_data, mode, event_cb,data,
                        GLOBAL_USER);
 }
 
 API int pkgmgr_client_reinstall(pkgmgr_client *pc, const char *pkg_type,
-               const char *pkgid, const char *optional_file, pkgmgr_mode mode,
+               const char *pkgid, const char *optional_data, pkgmgr_mode mode,
                pkgmgr_handler event_cb, void *data)
 {
-       return pkgmgr_client_usr_reinstall(pc, pkg_type, pkgid, optional_file,
+       return pkgmgr_client_usr_reinstall(pc, pkg_type, pkgid, optional_data,
                        mode, event_cb, data,GLOBAL_USER);
 }
 
 API int pkgmgr_client_usr_reinstall(pkgmgr_client * pc, const char *pkg_type,
-               const char *pkgid, const char *optional_file, pkgmgr_mode mode,
+               const char *pkgid, const char *optional_data, pkgmgr_mode mode,
                pkgmgr_handler event_cb, void *data, uid_t uid)
 {
        GVariant *result;
@@ -1692,7 +1692,7 @@ API int pkgmgr_client_usr_request_service(pkgmgr_request_service_type service_ty
        switch (service_type) {
        case PM_REQUEST_CSC:
                tryvm_if(custom_info == NULL, ret = PKGMGR_R_EINVAL, "custom_info is NULL\n");
-               tryvm_if(strlen(custom_info) >= PKG_STRING_LEN_MAX, ret = PKGMGR_R_EINVAL, "optional_file over PKG_STRING_LEN_MAX");
+               tryvm_if(strlen(custom_info) >= PKG_STRING_LEN_MAX, ret = PKGMGR_R_EINVAL, "custom_info over PKG_STRING_LEN_MAX");
                tryvm_if(data == NULL, ret = PKGMGR_R_EINVAL, "data is NULL\n");
 
                ret = __csc_process(custom_info, (char *)data);