suppress build warnings 90/61990/3 accepted/tizen/common/20160324.084225 accepted/tizen/common/20160325.134916 accepted/tizen/ivi/20160324.131628 accepted/tizen/mobile/20160324.132911 accepted/tizen/tv/20160324.132734 accepted/tizen/wearable/20160324.132657 submit/tizen/20160323.065638 submit/tizen/20160323.235918
authorJunghyun Yeon <jungh.yeon@samsung.com>
Sat, 12 Mar 2016 03:56:44 +0000 (12:56 +0900)
committerSemun Lee <sm79.lee@samsung.com>
Wed, 23 Mar 2016 07:01:05 +0000 (00:01 -0700)
Change-Id: I5c587eba8049b1153f791bbbf0665e8144683744
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
src/package_info.c
src/package_manager.c
tool/main.c

index 9d3b60b..6df1bca 100644 (file)
@@ -449,7 +449,7 @@ API int package_info_foreach_privilege_info(package_info_h package_info, package
        if (package_info == NULL || callback == NULL)
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
 
-       ret = pkgmgrinfo_pkginfo_foreach_privilege(package_info->pkgmgr_pkginfo, callback, user_data);
+       ret = pkgmgrinfo_pkginfo_foreach_privilege(package_info->pkgmgr_pkginfo, (pkgmgrinfo_pkg_privilege_list_cb)callback, user_data);
 
        return ret;
 }
index b67624e..4a9db76 100644 (file)
@@ -1188,9 +1188,15 @@ API int package_manager_clear_all_cache_dir(void)
        return package_manager_clear_cache_dir(PKG_CLEAR_ALL_CACHE);
 }
 
+static void __free_client(gpointer data)
+{
+       pkgmgr_client *pc = (pkgmgr_client *)data;
+       pkgmgr_client_free(pc);
+}
+
 static void __initialize_cb_table(void)
 {
-       __cb_table = g_hash_table_new_full(g_int_hash, g_int_equal, pkgmgr_client_free, NULL);
+       __cb_table = g_hash_table_new_full(g_int_hash, g_int_equal, __free_client, NULL);
 }
 
 static void __result_cb(pkgmgr_client *pc, const char *pkgid, const pkg_size_info_t *result, void *user_data)
@@ -1210,7 +1216,7 @@ static void __result_cb(pkgmgr_client *pc, const char *pkgid, const pkg_size_inf
        size_info.external_cache_size = result->ext_cache_size;
        size_info.external_app_size   = result->ext_app_size;
 
-       callback(pkgid, &size_info, user_data);
+       callback(pkgid, (package_size_info_h)&size_info, user_data);
 
        g_hash_table_remove(__cb_table, pc);
 }
@@ -1232,12 +1238,12 @@ static void __total_result_cb(pkgmgr_client *pc, const pkg_size_info_t *result,
        size_info.external_cache_size = result->ext_cache_size;
        size_info.external_app_size   = result->ext_app_size;
 
-       callback(&size_info, user_data);
+       callback((package_size_info_h)&size_info, user_data);
 
        g_hash_table_remove(__cb_table, pc);
 }
 
-API int package_manager_get_package_size_info(const char *package_id, package_manager_size_info_receive_cb callback, void *user_data)
+static int _get_pkg_size_info(const char *package_id, void *callback, void *user_data)
 {
        if (package_id == NULL || callback == NULL)
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -1285,9 +1291,14 @@ API int package_manager_get_package_size_info(const char *package_id, package_ma
        return PACKAGE_MANAGER_ERROR_NONE;
 }
 
+API int package_manager_get_package_size_info(const char *package_id, package_manager_size_info_receive_cb callback, void *user_data)
+{
+       return _get_pkg_size_info(package_id, (void *)callback, user_data);
+}
+
 API int package_manager_get_total_package_size_info(package_manager_total_size_info_receive_cb callback, void *user_data)
 {
-       return package_manager_get_package_size_info(PKG_SIZE_INFO_TOTAL, callback, user_data);
+       return _get_pkg_size_info(PKG_SIZE_INFO_TOTAL, (void *)callback, user_data);
 }
 
 API int package_manager_filter_create(package_manager_filter_h *handle)
index b76e486..a01cc23 100644 (file)
@@ -169,7 +169,7 @@ int main(int argc, char** argv)
        }
 
        if (1 == argc) {
-               loop = g_main_loop_new(FALSE, NULL);
+               loop = g_main_loop_new(NULL, FALSE);
                g_main_loop_run(loop);
        }