Remove unused function and codes 49/84349/3 accepted/tizen/common/20160823.132601 accepted/tizen/ivi/20160824.021609 accepted/tizen/mobile/20160824.021433 accepted/tizen/tv/20160824.021530 accepted/tizen/wearable/20160824.021638 submit/tizen/20160822.060113
authorJunghyun Yeon <jungh.yeon@samsung.com>
Thu, 18 Aug 2016 06:59:42 +0000 (15:59 +0900)
committerJunghyun Yeon <jungh.yeon@samsung.com>
Mon, 22 Aug 2016 11:32:03 +0000 (04:32 -0700)
-Remove api pkgmgr_client_activate_appv
-Remove csc-related codes

Related change
[pkgmgr-tool] : https://review.tizen.org/gerrit/#/c/84350/

Change-Id: I3aff30ed9c54c9a4d6a20dbee88c0f2a1513cde4
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
client/include/package-manager.h
client/src/pkgmgr.c

index 0367a4687325a8d3cd2d18f69e5dad5fdf436e8d..5ebe1ba8c1a45ab8cdbc8f72d4362ee3f0ecdb38 100644 (file)
@@ -307,11 +307,10 @@ typedef enum {
 } pkgmgr_move_type;
 
 typedef enum {
-       PM_REQUEST_CSC = 0,
-       PM_REQUEST_MOVE = 1,
-       PM_REQUEST_GET_SIZE = 2,
-       PM_REQUEST_KILL_APP = 3,
-       PM_REQUEST_CHECK_APP = 4,
+       PM_REQUEST_MOVE = 0,
+       PM_REQUEST_GET_SIZE = 1,
+       PM_REQUEST_KILL_APP = 2,
+       PM_REQUEST_CHECK_APP = 3,
        PM_REQUEST_MAX
 } pkgmgr_request_service_type;
 
@@ -542,22 +541,6 @@ int pkgmgr_client_deactivate(pkgmgr_client *pc, const char *pkg_type,
 int pkgmgr_client_usr_deactivate(pkgmgr_client *pc, const char *pkg_type,
                                 const char *pkgid, uid_t uid);
 
-/**
- * @brief      This API activates package.
- *
- * This API is for package-manager client application.\n
- *
- * @param[in]  pc      pkgmgr_client
- * @param[in]  appid   applicaiton id
- * @param[in]  argv    argument vector
- * @return     request_id (>0) if success, error code(<0) if fail\n
- * @retval     PKGMGR_R_OK     success
- * @retval     PKGMGR_R_EINVAL invalid argument
- * @retval     PKGMGR_R_ECOMM  communication error
-*/
-int pkgmgr_client_activate_appv(pkgmgr_client *pc, const char *appid, char *const argv[]);
-int pkgmgr_client_usr_activate_appv(pkgmgr_client *pc, const char *appid, char *const argv[], uid_t uid);
-
 /**
  * @brief      This API deactivates app.
  *
index c106a2014bbde47956aaa3cb4f7719f19feef23a..97a975c473bbde30b07039a5893179c858298b6c 100644 (file)
@@ -569,93 +569,6 @@ static int __sync_process(const char *req_key)
        return result;
 }
 
-static int __csc_process(const char *csc_path, char *result_path)
-{
-       int ret = 0;
-       int cnt = 0;
-       int count = 0;
-       int csc_fail = 0;
-       int fd = 0;
-       char *pkgtype = NULL;
-       char *des = NULL;
-       char buf[PKG_STRING_LEN_MAX] = {0,};
-       char type_buf[1024] = { 0 };
-       char des_buf[1024] = { 0 };
-       dictionary *csc = NULL;
-       FILE *file = NULL;
-
-       csc = iniparser_load(csc_path);
-       retvm_if(csc == NULL, PKGMGR_R_EINVAL, "cannot open parse file [%s]", csc_path);
-
-       file = fopen(result_path, "w");
-       tryvm_if(file == NULL, ret = PKGMGR_R_EINVAL, "cannot open result file [%s]", result_path);
-
-       count = iniparser_getint(csc, "csc packages:count", -1);
-       tryvm_if(count == 0, ret = PKGMGR_R_ERROR, "csc [%s] dont have packages", csc_path);
-
-       snprintf(buf, PKG_STRING_LEN_MAX, "[result]\n");
-       fwrite(buf, 1, strlen(buf), file);
-       snprintf(buf, PKG_STRING_LEN_MAX, "count = %d\n", count);
-       fwrite(buf, 1, strlen(buf), file);
-
-       for (cnt = 1 ; cnt <= count ; cnt++) {
-               snprintf(type_buf, PKG_STRING_LEN_MAX - 1, "csc packages:type_%03d", cnt);
-               snprintf(des_buf, PKG_STRING_LEN_MAX - 1, "csc packages:description_%03d", cnt);
-
-               pkgtype = iniparser_getstring(csc, type_buf, NULL);
-               des = iniparser_getstring(csc, des_buf, NULL);
-               ret = 0;
-
-               if (pkgtype == NULL) {
-                       csc_fail++;
-                       snprintf(buf, PKG_STRING_LEN_MAX, "%s = Fail to get pkgtype\n", type_buf);
-                       fwrite(buf, 1, strlen(buf), file);
-                       continue;
-               } else if (des == NULL) {
-                       csc_fail++;
-                       snprintf(buf, PKG_STRING_LEN_MAX, "%s = Fail to get description\n", des_buf);
-                       fwrite(buf, 1, strlen(buf), file);
-                       continue;
-               }
-
-               snprintf(buf, PKG_STRING_LEN_MAX, "type_%03d = %s\n", cnt, pkgtype);
-               fwrite(buf, 1, strlen(buf), file);
-               snprintf(buf, PKG_STRING_LEN_MAX, "description_%03d = %s\n", cnt, des);
-               fwrite(buf, 1, strlen(buf), file);
-
-               if (strcmp(pkgtype, "tpk") == 0) {
-                       const char *ospinstaller_argv[] = { "/usr/bin/osp-installer", "-c", des, NULL };
-                       ret = __xsystem(ospinstaller_argv);
-               } else if (strcmp(pkgtype, "wgt") == 0) {
-                       const char *wrtinstaller_argv[] = { "/usr/bin/wrt-installer", "-c", des, NULL };
-                       ret = __xsystem(wrtinstaller_argv);
-               } else {
-                       csc_fail++;
-                       ret = -1;
-               }
-
-               if (ret != 0) {
-                       char *errstr = NULL;
-                       __error_to_string(ret, &errstr);
-                       snprintf(buf, PKG_STRING_LEN_MAX, "result_%03d = fail[%s]\n", cnt, errstr);
-               } else {
-                       snprintf(buf, PKG_STRING_LEN_MAX, "result_%03d = success\n", cnt);
-               }
-
-               fwrite(buf, 1, strlen(buf), file);
-       }
-
-catch:
-       iniparser_freedict(csc);
-       if (file != NULL) {
-               fflush(file);
-               fd = fileno(file);
-               fsync(fd);
-               fclose(file);
-       }
-       return ret;
-}
-
 static int __get_size_process(pkgmgr_client *pc, const char *pkgid, uid_t uid,
                pkgmgr_getsize_type get_type, pkgmgr_handler event_cb,
                void *data)
@@ -1547,19 +1460,6 @@ API int pkgmgr_client_deactivate(pkgmgr_client *pc, const char *pkg_type,
        return pkgmgr_client_usr_deactivate(pc, pkg_type, pkgid, _getuid());
 }
 
-/* TODO: deprecate? */
-API int pkgmgr_client_usr_activate_appv(pkgmgr_client *pc, const char *appid,
-               char *const argv[], uid_t uid)
-{
-       return pkgmgr_client_usr_activate_app(pc, appid, NULL, uid);
-}
-
-API int pkgmgr_client_activate_appv(pkgmgr_client *pc, const char *appid,
-               char *const argv[])
-{
-       return pkgmgr_client_usr_activate_app(pc, appid, NULL, _getuid());
-}
-
 API int pkgmgr_client_usr_activate_app(pkgmgr_client *pc, const char *appid,
                pkgmgr_app_handler app_event_cb, uid_t uid)
 {
@@ -1935,19 +1835,6 @@ API int pkgmgr_client_usr_request_service(pkgmgr_request_service_type service_ty
        retvm_if(service_type < 0, PKGMGR_R_EINVAL, "service type is error\n");
 
        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, "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);
-               if (ret < 0)
-                       ERR("__csc_process fail \n");
-               else
-                       ret = PKGMGR_R_OK;
-
-               break;
-
        case PM_REQUEST_MOVE:
                tryvm_if(pkgid == NULL, ret = PKGMGR_R_EINVAL, "pkgid is NULL\n");
                tryvm_if(pc == NULL, ret = PKGMGR_R_EINVAL, "pc is NULL\n");