diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-16 10:53:11 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-01-16 12:54:18 -0800 |
| commit | ccecf1425412beb2bc3bb38d470293fdc244d6f1 (patch) | |
| tree | 9fd922197bc88bed453efa0738f3dfb5d6db4c3c /init | |
| parent | e847f429f43ae56aaa406697ca603c8469e2100b (diff) | |
| download | system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.zip system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.gz system_core-ccecf1425412beb2bc3bb38d470293fdc244d6f1.tar.bz2 | |
system/core 64-bit cleanup.
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.
Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
Diffstat (limited to 'init')
| -rw-r--r-- | init/init.c | 2 | ||||
| -rw-r--r-- | init/property_service.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/init/init.c b/init/init.c index ab52749..4266a73 100644 --- a/init/init.c +++ b/init/init.c @@ -623,7 +623,7 @@ static int mix_hwrng_into_linux_rng_action(int nargs, char **args) total_bytes_written += chunk_size; } - INFO("Mixed %d bytes from /dev/hw_random into /dev/urandom", + INFO("Mixed %zu bytes from /dev/hw_random into /dev/urandom", total_bytes_written); result = 0; diff --git a/init/property_service.c b/init/property_service.c index c370769..ac63377 100644 --- a/init/property_service.c +++ b/init/property_service.c @@ -168,7 +168,7 @@ static int check_mac_perms(const char *name, char *sctx) if (selabel_lookup(sehandle_prop, &tctx, name, 1) != 0) goto err; - if (selinux_check_access(sctx, tctx, class, perm, name) == 0) + if (selinux_check_access(sctx, tctx, class, perm, (void*) name) == 0) result = 1; freecon(tctx); @@ -382,7 +382,7 @@ void handle_property_set_fd() r = TEMP_FAILURE_RETRY(recv(s, &msg, sizeof(msg), 0)); if(r != sizeof(prop_msg)) { - ERROR("sys_prop: mis-match msg size received: %d expected: %d errno: %d\n", + ERROR("sys_prop: mis-match msg size received: %d expected: %zu errno: %d\n", r, sizeof(prop_msg), errno); close(s); return; @@ -522,7 +522,7 @@ static void load_persistent_properties() || (sb.st_uid != 0) || (sb.st_gid != 0) || (sb.st_nlink != 1)) { - ERROR("skipping insecure property file %s (uid=%lu gid=%lu nlink=%d mode=%o)\n", + ERROR("skipping insecure property file %s (uid=%u gid=%u nlink=%d mode=%o)\n", entry->d_name, sb.st_uid, sb.st_gid, sb.st_nlink, sb.st_mode); close(fd); continue; |