commit 6489e02e134e4779d35c4a340ff68ad445fde133
author Matteo Franchin <matteo.franchin@arm.com> Mon Dec 02 14:46:29 2013 +0000
committer David Butcher <david.butcher@arm.com> Wed Dec 11 16:16:36 2013 +0000
tree bc29f7557b0b6d43415f9ed22e945536da46f5e2
parent d0f35a1a30c51a26c0a50922736d804f40c2f9aa

Use %zu, %td for size_t, ptrdiff_t, respectively.

Changing ALOG format strings to %zu (for one size_t integer) and to
%td (for a couple of pointer differences). These changes are necessary
when compiling for LP64 architectures.

Change-Id: I9bb667500af1b82c360f0fc84e50d70bd46cba6e
Signed-off-by: Matteo Franchin <matteo.franchin@arm.com>

softkeymaster/keymaster_openssl.cpp

diff --git a/softkeymaster/keymaster_openssl.cpp b/softkeymaster/keymaster_openssl.cpp
index 79e2337..783148e 100644
--- a/softkeymaster/keymaster_openssl.cpp
+++ b/softkeymaster/keymaster_openssl.cpp
@@ -191,7 +191,7 @@
         publicLen = (publicLen << 8) | *p++;
     }
     if (p + publicLen > end) {
-        ALOGE("public key length encoding error: size=%ld, end=%d", publicLen, end - p);
+        ALOGE("public key length encoding error: size=%ld, end=%td", publicLen, end - p);
         return NULL;
     }
 
@@ -204,7 +204,7 @@
         privateLen = (privateLen << 8) | *p++;
     }
     if (p + privateLen > end) {
-        ALOGE("private key length encoding error: size=%ld, end=%d", privateLen, end - p);
+        ALOGE("private key length encoding error: size=%ld, end=%td", privateLen, end - p);
         return NULL;
     }