diff options
| author | Elliott Hughes <enh@google.com> | 2014-01-16 14:42:35 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-01-16 14:42:35 -0800 |
| commit | b70375abc2c4da6f868da4eef3d3f059acdf9774 (patch) | |
| tree | 52e04bc7cf0e003783006d488c7c6d276d500f45 /init | |
| parent | 24239a99ffde4a264be3121bff8b1ee70b78f63c (diff) | |
| parent | ec9e5891ac97c50cfb8d3d1c9c2d478637eff62b (diff) | |
| download | system_core-b70375abc2c4da6f868da4eef3d3f059acdf9774.zip system_core-b70375abc2c4da6f868da4eef3d3f059acdf9774.tar.gz system_core-b70375abc2c4da6f868da4eef3d3f059acdf9774.tar.bz2 | |
resolved conflicts for merge of ec9e5891 to master
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
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 1b9327c..a9bf9b4 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); @@ -380,7 +380,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; @@ -520,7 +520,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; |