summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-02-04 01:15:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-04 01:15:37 +0000
commit5204b1580e0d0f38272c7da166eee9b88c14dc50 (patch)
tree0a72bc3ceaf9fa54c524acee1cb32370bbf8ff51
parent55732f49287a75f9baabe9f150443aec9234c90d (diff)
parent3107a2f5f2cd3fa5563924cb9b659463a7f7f537 (diff)
downloadsystem_core-5204b1580e0d0f38272c7da166eee9b88c14dc50.zip
system_core-5204b1580e0d0f38272c7da166eee9b88c14dc50.tar.gz
system_core-5204b1580e0d0f38272c7da166eee9b88c14dc50.tar.bz2
Merge "Fix x86_64 build"
-rw-r--r--init/property_service.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/property_service.c b/init/property_service.c
index 55e37b9..7dd9ef9 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -464,9 +464,9 @@ static void load_persistent_properties()
|| (sb.st_uid != 0)
|| (sb.st_gid != 0)
|| (sb.st_nlink != 1)) {
- ERROR("skipping insecure property file %s (uid=%u gid=%u nlink=%d mode=%o)\n",
+ ERROR("skipping insecure property file %s (uid=%u gid=%u nlink=%u mode=%o)\n",
entry->d_name, (unsigned int)sb.st_uid, (unsigned int)sb.st_gid,
- sb.st_nlink, sb.st_mode);
+ (unsigned int)sb.st_nlink, sb.st_mode);
close(fd);
continue;
}