commit 6082367660a897d0fcf803d92895801059591dd5
author Elliott Hughes <enh@google.com> Wed Mar 11 19:57:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 11 19:57:47 2015 +0000
tree 935e8881bc522034f09086b61694d3eef762cae0
parent e05bcae455208201709fa455da453a5e923a250b
parent 2c9eeb73811e06163860e99df53032de458e9dcf

am 0a92c8c4: Merge "Fix a printf format string (caught by clang but not GCC)."

* commit '0a92c8c4799e86d690de860f96ad6abb86357c3b':
  Fix a printf format string (caught by clang but not GCC).

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 579d0e7..e090620 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -366,7 +366,7 @@
     svc->flags |= SVC_RUNNING;
 
     if ((svc->flags & SVC_EXEC) != 0) {
-        INFO("SVC_EXEC pid %d (uid %d gid %d+%d context %s) started; waiting...\n",
+        INFO("SVC_EXEC pid %d (uid %d gid %d+%zu context %s) started; waiting...\n",
              svc->pid, svc->uid, svc->gid, svc->nr_supp_gids, svc->seclabel);
         waiting_for_exec = true;
     }