summaryrefslogtreecommitdiff
path: root/sdcard
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-02-05 17:50:35 -0800
committerElliott Hughes <enh@google.com>2014-02-05 18:02:11 -0800
commit5d9fe779c8ec2705865a23061834ad8cdbee5b82 (patch)
tree92b5a9331b64f97c3201fa0798f57daa10d6fd17 /sdcard
parenteaba2bedf529eeb21351c8bf6365107cb6a4e8b6 (diff)
system/core LP64 cleanup.
Fixes -Wint-to-pointer and -Wpointer-to-int warnings, plus various -Wformat warnings. Change-Id: I6c5eea6b4273d82d28b8e5d2925f3e5457511b17
Diffstat (limited to 'sdcard')
-rw-r--r--sdcard/sdcard.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 05fbfbad3..4722708f3 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -200,7 +200,7 @@ static bool str_icase_equals(void *keyA, void *keyB) {
}
static int int_hash(void *key) {
- return (int) key;
+ return (int) (uintptr_t) key;
}
static bool int_equals(void *keyA, void *keyB) {
@@ -487,7 +487,7 @@ static void derive_permissions_locked(struct fuse* fuse, struct node *parent,
break;
case PERM_ANDROID_DATA:
case PERM_ANDROID_OBB:
- appid = (appid_t) hashmapGet(fuse->package_to_appid, node->name);
+ appid = (appid_t) (uintptr_t) hashmapGet(fuse->package_to_appid, node->name);
if (appid != 0) {
node->uid = multiuser_get_uid(parent->userid, appid);
}
@@ -511,7 +511,7 @@ static bool get_caller_has_rw_locked(struct fuse* fuse, const struct fuse_in_hea
}
appid_t appid = multiuser_get_app_id(hdr->uid);
- return hashmapContainsKey(fuse->appid_with_rw, (void*) appid);
+ return hashmapContainsKey(fuse->appid_with_rw, (void*) (uintptr_t) appid);
}
/* Kernel has already enforced everything we returned through
@@ -1621,12 +1621,12 @@ static int read_package_list(struct fuse *fuse) {
if (sscanf(buf, "%s %d %*d %*s %*s %s", package_name, &appid, gids) == 3) {
char* package_name_dup = strdup(package_name);
- hashmapPut(fuse->package_to_appid, package_name_dup, (void*) appid);
+ hashmapPut(fuse->package_to_appid, package_name_dup, (void*) (uintptr_t) appid);
char* token = strtok(gids, ",");
while (token != NULL) {
if (strtoul(token, NULL, 10) == fuse->write_gid) {
- hashmapPut(fuse->appid_with_rw, (void*) appid, (void*) 1);
+ hashmapPut(fuse->appid_with_rw, (void*) (uintptr_t) appid, (void*) (uintptr_t) 1);
break;
}
token = strtok(NULL, ",");