Revert "Fix a bug of package_info_foreach_privilege_info" 71/198971/3
authorSangyoon Jang <jeremy.jang@samsung.com>
Thu, 31 Jan 2019 09:57:53 +0000 (18:57 +0900)
committerSangyoon Jang <jeremy.jang@samsung.com>
Thu, 31 Jan 2019 10:04:28 +0000 (19:04 +0900)
This reverts commit bae26a719d7a40ab2e82f7a8e09c0a53d65fd25b.

This revert is temporary patch for release issue.

Change-Id: I22eed0a91596159b1fe14191c750842d228f09c2

src/package_info.c

index 8c2fdb6..44a8715 100644 (file)
@@ -52,11 +52,6 @@ typedef struct _foreach_updateinfo_ {
        void *user_data;
 } foreach_updateinfo_context_s;
 
-typedef struct _foreach_privilege_ {
-       package_info_privilege_info_cb callback;
-       void *user_data;
-} foreach_privilege_s;
-
 static int package_info_foreach_updateinfo_cb(const pkgmgrinfo_updateinfo_h handle, void *user_data)
 {
        foreach_updateinfo_context_s *foreach_updateinfo = user_data;
@@ -541,28 +536,14 @@ API int package_info_foreach_cert_info(package_info_h package_info, package_info
        return PACKAGE_MANAGER_ERROR_NONE;
 }
 
-static int package_info_foreach_privilege_cb(const char *privilege_name, void *user_data)
-{
-       foreach_privilege_s *foreach_privilege = (foreach_privilege_s *)user_data;
-
-       if (!foreach_privilege->callback(privilege_name, foreach_privilege->user_data))
-               return -1;
-       else
-               return 0;
-}
-
 API int package_info_foreach_privilege_info(package_info_h package_info, package_info_privilege_info_cb callback, void *user_data)
 {
        int ret = 0;
-       foreach_privilege_s foreach_privilege = {
-               .callback = callback,
-               .user_data = user_data,
-       };
 
        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, package_info_foreach_privilege_cb, &foreach_privilege);
+       ret = pkgmgrinfo_pkginfo_foreach_privilege(package_info->pkgmgr_pkginfo, (pkgmgrinfo_pkg_privilege_list_cb)callback, user_data);
 
        return ret;
 }