summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Kralevich <nnk@google.com> 2012-12-10 09:44:24 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2012-12-10 09:44:24 -0800
commit261bc70411ba1dd58654c4eb1c91acbbcfb49060 (patch)
tree507ac88d0e948e48068ad76e10b00eb9de0d7654
parentbe5316e012d98cd3e74f8aff628c88845cc3fb13 (diff)
parent7353cf305e9bbb2c5968358d34ead9ca9df970b1 (diff)
Merge "convert jint to uint32_t."
-rw-r--r--core/jni/android_util_EventLog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index a3981ce8ec00..6ee504dbff72 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -71,8 +71,8 @@ static jint android_util_EventLog_writeEvent_String(JNIEnv* env, jobject clazz,
// Don't throw NPE -- I feel like it's sort of mean for a logging function
// to be all crashy if you pass in NULL -- but make the NULL value explicit.
const char *str = value != NULL ? env->GetStringUTFChars(value, NULL) : "NULL";
- jint len = strlen(str);
- const int max = sizeof(buf) - sizeof(len) - 2; // Type byte, final newline
+ uint32_t len = strlen(str);
+ size_t max = sizeof(buf) - sizeof(len) - 2; // Type byte, final newline
if (len > max) len = max;
buf[0] = EVENT_TYPE_STRING;