commit 914eec761f53f2b0c7855cd8ffc8a79016b52622
author Mark Salyzyn <salyzyn@google.com> Mon Mar 17 15:50:22 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 17 15:50:22 2014 +0000
tree 7c1e87fe5ffc7adaacdbeb7c83ceaaa2a82ce66a
parent c8e20472a77b41546157caa71b6bd6478ca1985d
parent 8299ff701b66caf513e6cc8807b413bf44b8c2f6

am 8299ff70: Merge "init: 64-bit build issue" into klp-volantis-dev

* commit '8299ff701b66caf513e6cc8807b413bf44b8c2f6':
  init: 64-bit build issue

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 4af0c17..3ad5f51 100644
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -539,8 +539,9 @@
                     || (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",
-                      entry->d_name, sb.st_uid, sb.st_gid, sb.st_nlink, sb.st_mode);
+                ERROR("skipping insecure property file %s (uid=%u gid=%u nlink=%d mode=%o)\n",
+                      entry->d_name, (unsigned int)sb.st_uid, (unsigned int)sb.st_gid,
+                      sb.st_nlink, sb.st_mode);
                 close(fd);
                 continue;
             }