commit e84278b035c8a48f6032ef98fae008d875fba7a4
author Elliott Hughes <enh@google.com> Thu Mar 22 10:06:53 2012 -0700
committer Elliott Hughes <enh@google.com> Thu Mar 22 10:06:53 2012 -0700
tree 899db76267f361ead832a9a59160848961849df8
parent 3a71160a8ca468bbf80c57e49c3450a7807c4c52

Stop saying "clazz".

Change-Id: I569a3d29f6a394ee40e6dbdb8f76ae9a60348b65

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index 37ca93d..56589a1 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -748,16 +748,16 @@
     return c1->IsAssignableFrom(c2) ? JNI_TRUE : JNI_FALSE;
   }
 
-  static jboolean IsInstanceOf(JNIEnv* env, jobject jobj, jclass clazz) {
+  static jboolean IsInstanceOf(JNIEnv* env, jobject jobj, jclass java_class) {
     ScopedJniThreadState ts(env);
-    CHECK_NE(static_cast<jclass>(NULL), clazz); // TODO: ReportJniError
+    CHECK_NE(static_cast<jclass>(NULL), java_class); // TODO: ReportJniError
     if (jobj == NULL) {
       // Note: JNI is different from regular Java instanceof in this respect
       return JNI_TRUE;
     } else {
       Object* obj = Decode<Object*>(ts, jobj);
-      Class* klass = Decode<Class*>(ts, clazz);
-      return obj->InstanceOf(klass) ? JNI_TRUE : JNI_FALSE;
+      Class* c = Decode<Class*>(ts, java_class);
+      return obj->InstanceOf(c) ? JNI_TRUE : JNI_FALSE;
     }
   }
 
@@ -992,11 +992,11 @@
     return AddLocalReference<jobject>(env, c->AllocObject());
   }
 
-  static jobject NewObject(JNIEnv* env, jclass clazz, jmethodID mid, ...) {
+  static jobject NewObject(JNIEnv* env, jclass c, jmethodID mid, ...) {
     ScopedJniThreadState ts(env);
     va_list args;
     va_start(args, mid);
-    jobject result = NewObjectV(env, clazz, mid, args);
+    jobject result = NewObjectV(env, c, mid, args);
     va_end(args);
     return result;
   }