ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"

Browse Source 
* commit 'cae83eca2476c5f730aebaffdfb6443e6780bb2f':
  Installd: Fix Clang build
This commit is contained in:
Andreas Gampe 2015-04-09 17:16:47 +00:00 committed by Android Git Automerger
commit 6930a29af1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/installd/commands.cpp
View File

@ -35,8 +35,6 @@ dir_rec_array_t android_system_dirs;
int install(const char *uuid, const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) int install(const char *uuid, const char *pkgname, uid_t uid, gid_t gid, const char *seinfo)
{ {
struct stat libStat;
if ((uid < AID_SYSTEM) || (gid < AID_SYSTEM)) { if ((uid < AID_SYSTEM) || (gid < AID_SYSTEM)) {
ALOGE("invalid uid/gid: %d %d\n", uid, gid); ALOGE("invalid uid/gid: %d %d\n", uid, gid);
return -1; return -1;
@ -141,8 +139,6 @@ int delete_user_data(const char *uuid, const char *pkgname, userid_t userid)
int make_user_data(const char *uuid, const char *pkgname, uid_t uid, userid_t userid, const char* seinfo) int make_user_data(const char *uuid, const char *pkgname, uid_t uid, userid_t userid, const char* seinfo)
{ {
struct stat libStat;
std::string _pkgdir(create_package_data_path(uuid, pkgname, userid)); std::string _pkgdir(create_package_data_path(uuid, pkgname, userid));
const char* pkgdir = _pkgdir.c_str(); const char* pkgdir = _pkgdir.c_str();
@ -1539,7 +1535,8 @@ fail:
} }
// TODO: extend to know about other volumes // TODO: extend to know about other volumes
int restorecon_data(const char *uuid, const char* pkgName, const char* seinfo, uid_t uid) int restorecon_data(const char* uuid __attribute__((unused)), const char* pkgName,
const char* seinfo, uid_t uid)
{ {
struct dirent *entry; struct dirent *entry;
DIR *d; DIR *d;