From 4767caf1f4cd08cdc7d58476bc017dca17870112 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 11 Jan 2017 10:45:04 -0600 Subject: Fix compile error on 4.4 tree Change-Id: Id85fdf0f4dee02f8ee3ae50ec42423c6a154a3eb --- gui/action.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/action.cpp b/gui/action.cpp index fe573697e..5ba749c81 100644 --- a/gui/action.cpp +++ b/gui/action.cpp @@ -1918,7 +1918,7 @@ int GUIAction::checkforapp(std::string arg __unused) string parent_path = "/data/app"; DIR *d = opendir("/data/app"); struct dirent *p; - int len = strlen("me.twrp.twrpapp-"); + size_t len = strlen("me.twrp.twrpapp-"); while ((p = readdir(d))) { if (!strcmp(p->d_name, ".") || !strcmp(p->d_name, "..")) continue; @@ -1959,7 +1959,7 @@ int GUIAction::installapp(std::string arg __unused) LOGERR("chown %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } - if (setfilecon(install_path.c_str(), context.c_str()) < 0) { + if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) { LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } @@ -1973,7 +1973,7 @@ int GUIAction::installapp(std::string arg __unused) LOGERR("chown %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } - if (setfilecon(install_path.c_str(), context.c_str()) < 0) { + if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) { LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } @@ -1986,7 +1986,7 @@ int GUIAction::installapp(std::string arg __unused) LOGERR("chown %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } - if (setfilecon(install_path.c_str(), context.c_str()) < 0) { + if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) { LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } @@ -2006,7 +2006,7 @@ int GUIAction::installapp(std::string arg __unused) install_path += "/twrpapp"; LOGINFO("Installing app to '%s'\n", install_path.c_str()); if (mkdir(install_path.c_str(), S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0) { - if (setfilecon(install_path.c_str(), context.c_str()) < 0) { + if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) { LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } @@ -2015,7 +2015,7 @@ int GUIAction::installapp(std::string arg __unused) LOGERR("Error copying apk file\n"); goto exit; } - if (setfilecon(install_path.c_str(), context.c_str()) < 0) { + if (setfilecon(install_path.c_str(), (security_context_t)context.c_str()) < 0) { LOGERR("setfilecon %s error: %s\n", install_path.c_str(), strerror(errno)); goto exit; } -- cgit v1.2.3