fix style 45/72145/4 accepted/tizen/common/20160627.191600 accepted/tizen/ivi/20160624.063930 accepted/tizen/mobile/20160624.063513 accepted/tizen/tv/20160624.063551 accepted/tizen/wearable/20160624.063820 submit/tizen/20160623.103205
authorjongmyeongko <jongmyeong.ko@samsung.com>
Tue, 31 May 2016 02:52:12 +0000 (11:52 +0900)
committerjongmyeongko <jongmyeong.ko@samsung.com>
Thu, 23 Jun 2016 01:33:27 +0000 (10:33 +0900)
Change-Id: I7c32da19d027896bba2588cbf7eaee47c19c1567
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>
client/include/package-manager.h
client/include/pkgmgr-dbinfo.h
client/src/comm_client_gdbus.c
client/src/pkgmgr-internal.c
client/src/pkgmgr.c
installer/pkgmgr_installer.c
installer/pkgmgr_installer.h
installer/pkgmgr_installer_config.h

index 2741d4a84eb94c73488202070c50f56348df2ddc..22d708c8a6b6296006139f34693c936766420bb1 100644 (file)
@@ -220,7 +220,6 @@ extern "C" {
 #define PKGCMD_ERR_ARGUMENT_INVALID_STR                                                "ARGUMENT_INVALID"
 #define PKGCMD_ERR_UNKNOWN_STR                                                         "Unknown Error"
 
-#define PKG_SIZE_INFO_FILE "/tmp/pkgmgr_size_info.txt"
 #define PKG_SIZE_INFO_PATH "/tmp/pkgmgr"
 
 #define PKG_SIZE_INFO_TOTAL "__TOTAL__"
@@ -271,8 +270,8 @@ typedef struct {
        long long ext_app_size;
 } pkg_size_info_t;
 
-typedef int (*pkgmgr_iter_fn)(const char* pkg_type, const char* pkgid,
-                               const charversion, void *data);
+typedef int (*pkgmgr_iter_fn)(const char *pkg_type, const char *pkgid,
+                               const char *version, void *data);
 
 typedef int (*pkgmgr_handler)(uid_t target_uid, int req_id, const char *pkg_type,
                                const char *pkgid, const char *key,
@@ -292,17 +291,17 @@ typedef enum {
        PC_REQUEST = 0,
        PC_LISTENING,
        PC_BROADCAST,
-}client_type;
+} client_type;
 
 typedef enum {
        PM_DEFAULT,
        PM_QUIET
-}pkgmgr_mode;
+} pkgmgr_mode;
 
 typedef enum {
        PM_MOVE_TO_INTERNAL = 0,
        PM_MOVE_TO_SDCARD = 1,
-}pkgmgr_move_type;
+} pkgmgr_move_type;
 
 typedef enum {
        PM_REQUEST_CSC = 0,
@@ -311,7 +310,7 @@ typedef enum {
        PM_REQUEST_KILL_APP = 3,
        PM_REQUEST_CHECK_APP = 4,
        PM_REQUEST_MAX
-}pkgmgr_request_service_type;
+} pkgmgr_request_service_type;
 
 typedef enum {
        /* sync, get data, total size for one requested pkgid */
@@ -426,7 +425,7 @@ int pkgmgr_client_usr_install(pkgmgr_client *pc, const char *pkg_type,
 int pkgmgr_client_reinstall(pkgmgr_client *pc, const char *pkg_type, const char *pkgid,
                            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,
+int pkgmgr_client_usr_reinstall(pkgmgr_client *pc, const char *pkg_type, const char *pkgid,
                                  const char *optional_data, pkgmgr_mode mode,
                              pkgmgr_handler event_cb, void *data, uid_t uid);
 
@@ -553,8 +552,8 @@ int pkgmgr_client_usr_deactivate(pkgmgr_client *pc, const char *pkg_type,
  * @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);
+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.
@@ -731,7 +730,7 @@ pkgmgr_info *pkgmgr_client_check_pkginfo_from_file(const char *pkg_path);
  * @param[in]  pkg_info                        pointer for package info entry
  * @return     0 if success, error code(<0) if fail\n
 */
-int pkgmgr_client_free_pkginfo(pkgmgr_info * pkg_info);
+int pkgmgr_client_free_pkginfo(pkgmgr_info *pkg_info);
 
 /**
  * @brief      This API requests service
@@ -739,8 +738,8 @@ int pkgmgr_client_free_pkginfo(pkgmgr_info * pkg_info);
  * This API is for package-manager client application.\n
  *
  * @param[in]  service_type            pkgmgr_request_service_type
- * @param[in]  service_mode    mode which is used for addtional mode selection
- * @param[in]  pc                              pkgmgr_client
+ * @param[in]  service_mode            mode which is used for addtional mode selection
+ * @param[in]  pc                      pkgmgr_client
  * @param[in]  pkg_type                package type
  * @param[in]  pkgid                   package id
  * @param[in]  custom_info             custom information which is used for addtional information
@@ -752,10 +751,10 @@ int pkgmgr_client_free_pkginfo(pkgmgr_info * pkg_info);
  * @retval     PKGMGR_R_ECOMM  communication error
 */
 int pkgmgr_client_request_service(pkgmgr_request_service_type service_type, int service_mode,
-                                       pkgmgr_client * pc, const char *pkg_type, const char *pkgid,
+                                       pkgmgr_client *pc, const char *pkg_type, const char *pkgid,
                                        const char *custom_info, pkgmgr_handler event_cb, void *data);
 int pkgmgr_client_usr_request_service(pkgmgr_request_service_type service_type, int service_mode,
-                                       pkgmgr_client * pc, const char *pkg_type, const char *pkgid, uid_t uid,
+                                       pkgmgr_client *pc, const char *pkg_type, const char *pkgid, uid_t uid,
                                        const char *custom_info, pkgmgr_handler event_cb, void *data);
 /**
  * @brief      This API get package size
@@ -772,8 +771,8 @@ int pkgmgr_client_usr_request_service(pkgmgr_request_service_type service_type,
  * @retval     PKGMGR_R_EINVAL invalid argument
  * @retval     PKGMGR_R_ECOMM  communication error
 */
-int pkgmgr_client_get_size(pkgmgr_client * pc, const char *pkgid, pkgmgr_getsize_type get_type, pkgmgr_handler event_cb, void *data);
-int pkgmgr_client_usr_get_size(pkgmgr_client * pc, const char *pkgid, pkgmgr_getsize_type get_type, pkgmgr_handler event_cb, void *data, uid_t uid);
+int pkgmgr_client_get_size(pkgmgr_client *pc, const char *pkgid, pkgmgr_getsize_type get_type, pkgmgr_handler event_cb, void *data);
+int pkgmgr_client_usr_get_size(pkgmgr_client *pc, const char *pkgid, pkgmgr_getsize_type get_type, pkgmgr_handler event_cb, void *data, uid_t uid);
 
 /**
  * @brief              Gets the package size information.
index 74e6ce8da496649133a4aae719ab702b8bafc350..bb9543bdc1b2d6e6230ccf721f69296724debea8 100644 (file)
@@ -61,7 +61,7 @@ typedef enum {
        PM_INSTALL_EXTERNAL,
 } PM_INSTALL_LOCATION;
 
-typedef voidpkgmgr_pkgdbinfo_h;
+typedef void *pkgmgr_pkgdbinfo_h;
 
 /**
  * @brief      This API creates package info handle to set info in the db.
index 0c85b2183a3e0a59ada80a6074d4d7b2cac6ab3f..ea9e7c36a28b3e6815420f2b4e8b5bdaff3b9c72 100644 (file)
@@ -160,7 +160,7 @@ comm_client *comm_client_new(void)
        comm_client *cc = NULL;
 
        /* Allocate memory for ADT:comm_client */
-#if !GLIB_CHECK_VERSION(2,35,0)
+#if !GLIB_CHECK_VERSION(2, 35, 0)
        g_type_init();
 #endif
        cc = calloc(1, sizeof(comm_client));
index f28e6ff8bb18b9b3ec2ee66f0f9ed9eb05cbb2df..d8cb2f48b044c4e35708d1145a66f4cfb861e0e0 100644 (file)
@@ -85,9 +85,8 @@ char *_get_backend_path(const char *input_path)
        DBG("pkg_path[%s]\n", pkg_path);
 
        fp = fopen(PKG_CONF_PATH, "r");
-       if (fp == NULL) {
+       if (fp == NULL)
                return NULL;
-       }
 
        char *path = NULL;
        while (fgets(buffer, 1024, fp) != NULL) {
@@ -125,7 +124,7 @@ char *_get_backend_path(const char *input_path)
        else
                type++;
 
-       snprintf(installer_path, PKG_STRING_LEN_MAX - 1, 
+       snprintf(installer_path, PKG_STRING_LEN_MAX - 1,
                                        "%s%s", backend_path, type);
 
        DBG("installer_path[%s]\n", installer_path);
@@ -146,9 +145,8 @@ char *_get_backend_path_with_type(const char *type)
        DBG("type[%s]\n", type);
 
        fp = fopen(PKG_CONF_PATH, "r");
-       if (fp == NULL) {
+       if (fp == NULL)
                return NULL;
-       }
 
        char *path = NULL;
        while (fgets(buffer, 1024, fp) != NULL) {
@@ -172,7 +170,7 @@ char *_get_backend_path_with_type(const char *type)
        if (fp != NULL)
                fclose(fp);
 
-       if(path == NULL)
+       if (path == NULL)
                return NULL;
 
 /*     if(path[strlen(path)] == '/') */
@@ -180,7 +178,7 @@ char *_get_backend_path_with_type(const char *type)
 /*     else
        sprintf(backend_path, "%s/", path); */
 
-       snprintf(installer_path, PKG_STRING_LEN_MAX - 1, 
+       snprintf(installer_path, PKG_STRING_LEN_MAX - 1,
                                        "%s%s", backend_path, type);
        DBG("installer_path[%s]\n", installer_path);
 
@@ -198,7 +196,7 @@ char *_get_backend_path_with_type(const char *type)
                }
                type = strchr(extlist, '.') + 1;
 
-               snprintf(installer_path, PKG_STRING_LEN_MAX - 1, 
+               snprintf(installer_path, PKG_STRING_LEN_MAX - 1,
                                                "%s%s", backend_path, type);
        }
 
@@ -215,9 +213,8 @@ int _get_mime_from_file(const char *filename, char *mimetype, int len)
                return -1;
 
        mime = xdg_mime_get_mime_type_for_file(filename, 0);
-       if (strcmp(mime, "application/octet-stream") == 0) {
+       if (strcmp(mime, "application/octet-stream") == 0)
                mime = xdg_mime_get_mime_type_from_file_name(filename);
-       }
 
        snprintf(mimetype, len, "%s", mime);
        return 0;
@@ -344,7 +341,7 @@ pkg_plugin_set *_pkg_plugin_load_library(const char *pkg_type,
                return NULL;
        }
 
-       if ((on_load = dlsym(library_handle, "pkg_plugin_on_load")) == NULL || 
+       if ((on_load = dlsym(library_handle, "pkg_plugin_on_load")) == NULL ||
            dlerror() != NULL) {
                ERR("can not find symbol \n");
                dlclose(library_handle);
@@ -477,7 +474,7 @@ typedef struct _detail_info_map_t {
                char version[PKG_VERSION_STRING_LEN_MAX];
                char pkg_description[PKG_VALUE_STRING_LEN_MAX];
                char min_platform_version[PKG_VERSION_STRING_LEN_MAX];
-               time_t installed_time;  
+               time_t installed_time;
                int installed_size;
                int app_size;
                int data_size;
@@ -514,7 +511,7 @@ char *_get_info_string(const char *key,
 
        memcpy(&tmp_pkg_detail_info, pkg_detail_info,
               sizeof(package_manager_pkg_detail_info_t));
-       
+
        for (i = 0; i < sizeof(info_map) / sizeof(detail_info_map_t); i++) {
                tmp = &info_map[i];
                if (strcmp(key, tmp->name) == 0) {
@@ -522,17 +519,17 @@ char *_get_info_string(const char *key,
                                return strdup((char *)(tmp->field));
                        } else if (strcmp(tmp->type, "bool") == 0) {
                                char temp[PKG_VALUE_STRING_LEN_MAX];
-                               snprintf(temp, PKG_VALUE_STRING_LEN_MAX - 1, 
+                               snprintf(temp, PKG_VALUE_STRING_LEN_MAX - 1,
                                        "%d", (int)*(bool *) (tmp->field));
                                return strdup(temp);
                        } else if (strcmp(tmp->type, "int") == 0) {
                                char temp[PKG_VALUE_STRING_LEN_MAX];
-                               snprintf(temp, PKG_VALUE_STRING_LEN_MAX - 1, 
+                               snprintf(temp, PKG_VALUE_STRING_LEN_MAX - 1,
                                        "%d", (int)*(int *)(tmp->field));
                                return strdup(temp);
                        } else if (strcmp(tmp->type, "time_t") == 0) {
                                char temp[PKG_VALUE_STRING_LEN_MAX];
-                               snprintf(temp, PKG_VALUE_STRING_LEN_MAX - 1, 
+                               snprintf(temp, PKG_VALUE_STRING_LEN_MAX - 1,
                                        "%d", (int)*(time_t *) (tmp->field));
                                return strdup(temp);
                        } else
@@ -556,9 +553,9 @@ int _get_info_int(const char *key,
        for (i = 0; i < sizeof(info_map) / sizeof(detail_info_map_t); i++) {
                tmp = &info_map[i];
                if (strcmp(key, tmp->name) == 0) {
-                       if (strcmp(tmp->type, "int") == 0) {
+                       if (strcmp(tmp->type, "int") == 0)
                                return (int)*(int *)(tmp->field);
-                       else
+                       else
                                return -1;
                }
        }
@@ -579,9 +576,9 @@ time_t _get_info_time(const char *key,
        for (i = 0; i < sizeof(info_map) / sizeof(detail_info_map_t); i++) {
                tmp = &info_map[i];
                if (strcmp(key, tmp->name) == 0) {
-                       if (strcmp(tmp->type, "time_t") == 0) {
+                       if (strcmp(tmp->type, "time_t") == 0)
                                return (time_t) *(time_t *) (tmp->field);
-                       else
+                       else
                                return (time_t) -1;
                }
        }
index 0f4d76b10c51de11222a6b3a629b7eb490d41c1c..a0076ce73e10ae98660f34b6846375490aa6300c 100644 (file)
@@ -530,8 +530,7 @@ static int __sync_process(const char *req_key)
        char buf[PKG_STRING_LEN_MAX] = {0, };
 
        snprintf(info_file, PKG_STRING_LEN_MAX, "%s/%s", PKG_SIZE_INFO_PATH, req_key);
-       while(1)
-       {
+       while (1) {
                check_cnt++;
 
                if (access(info_file, F_OK) == 0) {
@@ -583,7 +582,7 @@ static int __csc_process(const char *csc_path, char *result_path)
        char type_buf[1024] = { 0 };
        char des_buf[1024] = { 0 };
        dictionary *csc = NULL;
-       FILEfile = NULL;
+       FILE *file = NULL;
 
        csc = iniparser_load(csc_path);
        retvm_if(csc == NULL, PKGMGR_R_EINVAL, "cannot open parse file [%s]", csc_path);
@@ -599,8 +598,7 @@ static int __csc_process(const char *csc_path, char *result_path)
        snprintf(buf, PKG_STRING_LEN_MAX, "count = %d\n", count);
        fwrite(buf, 1, strlen(buf), file);
 
-       for(cnt = 1 ; cnt <= count ; cnt++)
-       {
+       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);
 
@@ -628,7 +626,7 @@ static int __csc_process(const char *csc_path, char *result_path)
                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) {
+               } else if (strcmp(pkgtype, "wgt") == 0) {
                        const char *wrtinstaller_argv[] = { "/usr/bin/wrt-installer", "-c", des, NULL };
                        ret = __xsystem(wrtinstaller_argv);
                } else {
@@ -640,9 +638,9 @@ static int __csc_process(const char *csc_path, char *result_path)
                        char *errstr = NULL;
                        __error_to_string(ret, &errstr);
                        snprintf(buf, PKG_STRING_LEN_MAX, "result_%03d = fail[%s]\n", cnt, errstr);
-               }
-               else
+               } else {
                        snprintf(buf, PKG_STRING_LEN_MAX, "result_%03d = success\n", cnt);
+               }
 
                fwrite(buf, 1, strlen(buf), file);
        }
@@ -658,7 +656,7 @@ catch:
        return ret;
 }
 
-static int __get_size_process(pkgmgr_client * pc, const char *pkgid, uid_t uid,
+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)
 {
@@ -886,7 +884,7 @@ static int __get_pkg_size_info_cb(uid_t target_uid, int req_id, const char *req_
        retvm_if(size_info == NULL, -1, "The memory is insufficient.");
 
        char *save_ptr = NULL;
-       char *token = strtok_r((char*)value, ":", &save_ptr);
+       char *token = strtok_r((char *)value, ":", &save_ptr);
        tryvm_if(token == NULL, ret = -1, "failed to parse sizeinfo");
        size_info->data_size = atoll(token);
        token = strtok_r(NULL, ":", &save_ptr);
@@ -912,20 +910,17 @@ static int __get_pkg_size_info_cb(uid_t target_uid, int req_id, const char *req_
        pkgmgr_client_t *pmc = (pkgmgr_client_t *)pc;
        tryvm_if(pmc == NULL, ret = -1, "pkgmgr_client instance is null.");
 
-       if (strcmp(pkgid, PKG_SIZE_INFO_TOTAL) == 0)
-       {       // total package size info
+       if (strcmp(pkgid, PKG_SIZE_INFO_TOTAL) == 0) {  /* total package size info */
                pkgmgr_total_pkg_size_info_receive_cb callback = (pkgmgr_total_pkg_size_info_receive_cb)(pmc->new_event_cb);
                callback((pkgmgr_client *)pc, size_info, user_data);
-       }
-       else
-       {
+       } else {
                pkgmgr_pkg_size_info_receive_cb callback = (pkgmgr_pkg_size_info_receive_cb)(pmc->new_event_cb);
                callback((pkgmgr_client *)pc, pkgid, size_info, user_data);
        }
 
 catch:
 
-       if(size_info){
+       if (size_info) {
                free(size_info);
                size_info = NULL;
        }
@@ -963,7 +958,7 @@ API pkgmgr_client *pkgmgr_client_new(client_type ctype)
                trym_if(ret < 0L, "comm_client_set_status_callback() failed - %d", ret);
        }
 
-       return (pkgmgr_client *) pc;
+       return (pkgmgr_client *)pc;
 
  catch:
        if (pc)
@@ -1207,7 +1202,7 @@ API int pkgmgr_client_install(pkgmgr_client *pc, const char *pkg_type,
                pkgmgr_handler event_cb, void *data)
 {
        return pkgmgr_client_usr_install(pc, pkg_type, descriptor_path,
-                       pkg_path, optional_data, mode, event_cb,data,
+                       pkg_path, optional_data, mode, event_cb, data,
                        _getuid());
 }
 
@@ -1219,7 +1214,7 @@ API int pkgmgr_client_reinstall(pkgmgr_client *pc, const char *pkg_type,
                        mode, event_cb, data, _getuid());
 }
 
-API int pkgmgr_client_usr_reinstall(pkgmgr_client * pc, const char *pkg_type,
+API int pkgmgr_client_usr_reinstall(pkgmgr_client *pc, const char *pkg_type,
                const char *pkgid, const char *optional_data, pkgmgr_mode mode,
                pkgmgr_handler event_cb, void *data, uid_t uid)
 {
@@ -1361,7 +1356,7 @@ API int pkgmgr_client_mount_install(pkgmgr_client *pc, const char *pkg_type,
                pkgmgr_handler event_cb, void *data)
 {
        return pkgmgr_client_usr_mount_install(pc, pkg_type, descriptor_path,
-                       pkg_path, optional_data, mode, event_cb,data,
+                       pkg_path, optional_data, mode, event_cb, data,
                        _getuid());
 }
 
@@ -1369,7 +1364,7 @@ API int pkgmgr_client_uninstall(pkgmgr_client *pc, const char *pkg_type,
                const char *pkgid, pkgmgr_mode mode, pkgmgr_handler event_cb,
                void *data)
 {
-       return pkgmgr_client_usr_uninstall(pc, pkg_type,pkgid, mode, event_cb,
+       return pkgmgr_client_usr_uninstall(pc, pkg_type, pkgid, mode, event_cb,
                        data, _getuid());
 }
 
@@ -1605,7 +1600,7 @@ API int pkgmgr_client_usr_activate_app(pkgmgr_client *pc, const char *appid,
        return ret;
 }
 
-API int pkgmgr_client_activate_app(pkgmgr_client * pc, const char *appid, pkgmgr_app_handler app_event_cb)
+API int pkgmgr_client_activate_app(pkgmgr_client *pc, const char *appid, pkgmgr_app_handler app_event_cb)
 {
        return pkgmgr_client_usr_activate_app(pc, appid, app_event_cb, _getuid());
 }
@@ -1921,17 +1916,17 @@ API int pkgmgr_client_broadcast_status(pkgmgr_client *pc, const char *pkg_type,
 }
 
 API int pkgmgr_client_request_service(pkgmgr_request_service_type service_type, int service_mode,
-                                 pkgmgr_client * pc, const char *pkg_type, const char *pkgid,
+                                 pkgmgr_client *pc, const char *pkg_type, const char *pkgid,
                              const char *custom_info, pkgmgr_handler event_cb, void *data)
 {
        return pkgmgr_client_usr_request_service(service_type, service_mode, pc, pkg_type, pkgid, _getuid(), custom_info, event_cb, data);
 }
 
 API int pkgmgr_client_usr_request_service(pkgmgr_request_service_type service_type, int service_mode,
-                                 pkgmgr_client * pc, const char *pkg_type, const char *pkgid, uid_t uid,
+                                 pkgmgr_client *pc, const char *pkg_type, const char *pkgid, uid_t uid,
                              const char *custom_info, pkgmgr_handler event_cb, void *data)
 {
-       int ret =0;
+       int ret = 0;
 
        /* Check for NULL value of service type */
        retvm_if(service_type > PM_REQUEST_MAX, PKGMGR_R_EINVAL, "service type is not defined\n");
@@ -2001,15 +1996,14 @@ API int pkgmgr_client_usr_request_size_info(uid_t uid)
        retvm_if(pc == NULL, PKGMGR_R_EINVAL, "request pc is null\n");
 
        ret = __request_size_info(pc, uid);
-       if (ret < 0) {
+       if (ret < 0)
                ERR("__request_size_info fail \n");
-       }
 
        pkgmgr_client_free(pc);
        return ret;
 }
 
-API int pkgmgr_client_request_size_info(void) // get all package size (data, total)
+API int pkgmgr_client_request_size_info(void) /* get all package size (data, total) */
 {
        return pkgmgr_client_usr_request_size_info(_getuid());
 }
@@ -2059,7 +2053,7 @@ API int pkgmgr_client_clear_all_cache_dir(void)
        return pkgmgr_client_usr_clear_cache_dir(PKG_CLEAR_ALL_CACHE, _getuid());
 }
 
-API int pkgmgr_client_get_size(pkgmgr_client * pc, const char *pkgid,
+API int pkgmgr_client_get_size(pkgmgr_client *pc, const char *pkgid,
                pkgmgr_getsize_type get_type, pkgmgr_handler event_cb,
                void *data)
 {
@@ -2067,7 +2061,7 @@ API int pkgmgr_client_get_size(pkgmgr_client * pc, const char *pkgid,
                        _getuid());
 }
 
-API int pkgmgr_client_usr_get_size(pkgmgr_client * pc, const char *pkgid,
+API int pkgmgr_client_usr_get_size(pkgmgr_client *pc, const char *pkgid,
                pkgmgr_getsize_type get_type, pkgmgr_handler event_cb,
                void *data, uid_t uid)
 {
@@ -2182,7 +2176,7 @@ API int pkgmgr_client_get_package_size_info(pkgmgr_client *pc, const char *pkgid
 }
 
 API int pkgmgr_client_usr_get_total_package_size_info(pkgmgr_client *pc, pkgmgr_total_pkg_size_info_receive_cb event_cb, void *user_data, uid_t uid)
-{      // total package size info
+{      /* total package size info */
        return pkgmgr_client_usr_get_package_size_info(pc, PKG_SIZE_INFO_TOTAL, (pkgmgr_pkg_size_info_receive_cb)event_cb, user_data, uid);
 }
 
index 207489616c4c6e5630624742dd826337f43a6dbf..35974fccb3533c2705ae29d97d26d4d5bc358eb2 100644 (file)
@@ -256,11 +256,11 @@ pkgmgr_installer_receive_request(pkgmgr_installer *pi,
                switch (c) {
                case OPTVAL_PRELOAD:    /* request for preload app */
                        pi->is_preload = 1;
-                       DBG("preload request [%d]", pi->is_preload );
+                       DBG("preload request [%d]", pi->is_preload);
                        break;
                case OPTVAL_FORCE_REMOVAL:      /* request for force-remove */
                        pi->force_removal = 1;
-                       DBG("force-remove request [%d]", pi->force_removal );
+                       DBG("force-remove request [%d]", pi->force_removal);
                        break;
                case 'k':       /* session id */
                        if (pi->session_id)
@@ -284,12 +284,11 @@ pkgmgr_installer_receive_request(pkgmgr_installer *pi,
                        if (pi->pkgmgr_info)
                                free(pi->pkgmgr_info);
                        pi->pkgmgr_info = strndup(optarg, MAX_STRLEN);
-                       DBG("option is [i] pkgid[%s]", pi->pkgmgr_info );
-                       if (pi->pkgmgr_info && strlen(pi->pkgmgr_info)==0){
+                       DBG("option is [i] pkgid[%s]", pi->pkgmgr_info);
+                       if (pi->pkgmgr_info && strlen(pi->pkgmgr_info) == 0)
                                free(pi->pkgmgr_info);
-                       }else{
+                       else
                                mode = 'i';
-                       }
                        break;
 
                case 'e':       /* install */
index 31938eb299ef3d8b1f07ba5c823bedc38744f86e..1c809b6f26c0473afc8eca666cfc558f124b8553 100644 (file)
@@ -42,7 +42,7 @@ extern "C" {
  * pkgmgr_installer is an opaque type for an object
  */
 typedef struct pkgmgr_installer pkgmgr_installer;
-typedef voidpkgmgr_instcertinfo_h;
+typedef void *pkgmgr_instcertinfo_h;
 
 /**
  * @brief listening event type in pkgmgr.
@@ -110,7 +110,7 @@ typedef enum {
        PM_SET_DISTRIBUTOR2_ROOT_CERT = 6,
        PM_SET_DISTRIBUTOR2_INTERMEDIATE_CERT = 7,
        PM_SET_DISTRIBUTOR2_SIGNER_CERT = 8,
-}pkgmgr_instcert_type;
+} pkgmgr_instcert_type;
 
 
 /**
@@ -837,7 +837,7 @@ int pkgmgr_installer_destroy_certinfo_set_handle(pkgmgr_instcertinfo_h handle);
  * @param[in]  pkgid                           package ID
  * @return     0 if success, error code(<0) if fail\n
 */
- int pkgmgr_installer_delete_certinfo(const char *pkgid);
+int pkgmgr_installer_delete_certinfo(const char *pkgid);
 
 #ifdef __cplusplus
 }
index 6c7fea234aafb1e6ceeb7687eb24f6f7df53b66d..0ea9cc4ccbc8ab60e6e061f6a24d0112a1ff834c 100644 (file)
@@ -53,7 +53,7 @@ const struct option long_opts[] = {
        { "direct-manifest-install", 1, NULL, 'y' },
        { "mount-install", 1, NULL, 'w' },
        { "recovery", 1, NULL, 'b' },
-        { "preload", 0, NULL, OPTVAL_PRELOAD },
+       { "preload", 0, NULL, OPTVAL_PRELOAD },
        { "force-remove", 0, NULL, OPTVAL_FORCE_REMOVAL },
        { 0, 0, 0, 0 }  /* sentinel */
 };