commit 129e19cb37b1d30f8c46f77a3853d347c3e78bb3
author Glenn Kasten <gkasten@google.com> Tue Jan 10 17:57:36 2012 -0800
committer Glenn Kasten <gkasten@google.com> Wed Jan 11 13:40:05 2012 -0800
tree c7d7967bc091dc98f708fce16c1cdfefcdedf10c
parent 81754949e0110b9db44bef421d6282a3bf831138

Fix build warnings

Change-Id: I334e0a6e018bb1067c90e050cf3583c1057aacd9

core/jni/android_util_AssetManager.cpp

diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index 6ecee35..17130af 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -434,12 +434,12 @@
 {
     ScopedUtfChars path8(env, path);
     if (path8.c_str() == NULL) {
-        return NULL;
+        return 0;
     }
 
     AssetManager* am = assetManagerForJavaObject(env, clazz);
     if (am == NULL) {
-        return JNI_FALSE;
+        return 0;
     }
 
     void* cookie;

core/jni/android_util_Process.cpp

diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 2c494ac..8234f1b 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -389,7 +389,7 @@
     jlong mem = 0;
 
     static const char* const sums[] = { "MemFree:", "Cached:", NULL };
-    static const int sumsLen[] = { strlen("MemFree:"), strlen("Cached:"), NULL };
+    static const int sumsLen[] = { strlen("MemFree:"), strlen("Cached:"), 0 };
 
     char* p = buffer;
     while (*p && numFound < 2) {