From 70f3ce3c8d921946d3cb9219cd9433089becfc4d Mon Sep 17 00:00:00 2001 From: Marcin Lis Date: Mon, 7 Apr 2014 17:28:21 +0200 Subject: [PATCH] Update deprecated libprivilege-control API functions. Change-Id: I5c78cf7f43ee2cb51622d461f1870a3fa2f09fc5 Signed-off-by: Marcin Lis --- plugin/app2sd/src/app2sd_internals_utils.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugin/app2sd/src/app2sd_internals_utils.c b/plugin/app2sd/src/app2sd_internals_utils.c index e49bd11..fca7156 100755 --- a/plugin/app2sd/src/app2sd_internals_utils.c +++ b/plugin/app2sd/src/app2sd_internals_utils.c @@ -521,7 +521,7 @@ int _app2sd_setup_path(const char *pkgid, const char *dirpath, int ret = 0; void *handle = NULL; char *errmsg = NULL; - int (*app_setup_path)(const char*, const char*, int, ...) = NULL; + int (*perm_app_setup_path)(const char*, const char*, int, ...) = NULL; if (pkgid == NULL || dirpath == NULL) return -1; @@ -532,22 +532,22 @@ int _app2sd_setup_path(const char *pkgid, const char *dirpath, return -1; } - app_setup_path = dlsym(handle, "app_setup_path"); + perm_app_setup_path = dlsym(handle, "perm_app_setup_path"); errmsg = dlerror(); - if ((errmsg != NULL) || (app_setup_path == NULL)) { + if ((errmsg != NULL) || (perm_app_setup_path == NULL)) { app2ext_print( "setup path: dlsym() failed. [%s]", errmsg); dlclose(handle); return -1; } if (groupid == NULL) { - app2ext_print( "[smack] app_setup_path(%s, %s, %d)", pkgid, dirpath, apppathtype); - ret = app_setup_path(pkgid, dirpath, apppathtype); - app2ext_print( "[smack] app_setup_path(), result = [%d]", ret); + app2ext_print( "[smack] perm_app_setup_path(%s, %s, %d)", pkgid, dirpath, apppathtype); + ret = perm_app_setup_path(pkgid, dirpath, apppathtype); + app2ext_print( "[smack] perm_app_setup_path(), result = [%d]", ret); } else { - app2ext_print( "[smack] app_setup_path(%s, %s, %d, %s)", pkgid, dirpath, apppathtype, groupid); - ret = app_setup_path(pkgid, dirpath, apppathtype, groupid); - app2ext_print( "[smack] app_setup_path(), result = [%d]", ret); + app2ext_print( "[smack] perm_app_setup_path(%s, %s, %d, %s)", pkgid, dirpath, apppathtype, groupid); + ret = perm_app_setup_path(pkgid, dirpath, apppathtype, groupid); + app2ext_print( "[smack] perm_app_setup_path(), result = [%d]", ret); } dlclose(handle); -- 2.7.4