Stop saying "clazz".
Change-Id: I569a3d29f6a394ee40e6dbdb8f76ae9a60348b65
diff --git a/src/hprof/hprof.cc b/src/hprof/hprof.cc
index 04e43d2..532eada 100644
--- a/src/hprof/hprof.cc
+++ b/src/hprof/hprof.cc
@@ -146,7 +146,7 @@
// for class static overhead.
#define STATIC_OVERHEAD_NAME "$staticOverhead"
// The ID for the synthetic object generated to account for class static overhead.
-#define CLASS_STATICS_ID(clazz) ((HprofObjectId)(((uint32_t)(clazz)) | 1))
+#define CLASS_STATICS_ID(c) ((HprofObjectId)(((uint32_t)(c)) | 1))
HprofBasicType Hprof::SignatureToBasicTypeAndSize(const char* sig, size_t* sizeOut) {
char c = sig[0];
@@ -319,8 +319,8 @@
current_heap_ = desiredHeap;
}
- Class* clazz = obj->GetClass();
- if (clazz == NULL) {
+ Class* c = obj->GetClass();
+ if (c == NULL) {
// This object will bother HprofReader, because it has a NULL
// class, so just don't dump it. It could be
// gDvm.unlinkedJavaLangClass or it could be an object just
@@ -408,7 +408,7 @@
rec->AddId(LookupStringId(fh.GetName()));
rec->AddU1(t);
}
- } else if (clazz->IsArrayClass()) {
+ } else if (c->IsArrayClass()) {
Array *aobj = (Array *)obj;
uint32_t length = aobj->GetLength();
@@ -419,13 +419,13 @@
rec->AddId((HprofObjectId)obj);
rec->AddU4(StackTraceSerialNumber(obj));
rec->AddU4(length);
- rec->AddId(LookupClassId(clazz));
+ rec->AddId(LookupClassId(c));
// Dump the elements, which are always objects or NULL.
rec->AddIdList((const HprofObjectId *)aobj->GetRawData(sizeof(Object*)), length);
} else {
size_t size;
- HprofBasicType t = PrimitiveToBasicTypeAndSize(clazz->GetComponentType()->GetPrimitiveType(), &size);
+ HprofBasicType t = PrimitiveToBasicTypeAndSize(c->GetComponentType()->GetPrimitiveType(), &size);
// obj is a primitive array.
#if DUMP_PRIM_DATA
@@ -458,7 +458,7 @@
rec->AddU1(HPROF_INSTANCE_DUMP);
rec->AddId((HprofObjectId)obj);
rec->AddU4(StackTraceSerialNumber(obj));
- rec->AddId(LookupClassId(clazz));
+ rec->AddId(LookupClassId(c));
// Reserve some space for the length of the instance data, which we won't
// know until we're done writing it.
@@ -467,7 +467,7 @@
// Write the instance data; fields for this class, followed by super class fields,
// and so on. Don't write the klass or monitor fields of Object.class.
- const Class* sclass = clazz;
+ const Class* sclass = c;
FieldHelper fh;
while (!sclass->IsObjectClass()) {
int ifieldCount = sclass->NumInstanceFields();
@@ -684,23 +684,23 @@
return 0;
}
-HprofStringId Hprof::LookupClassNameId(Class* clazz) {
- return LookupStringId(PrettyDescriptor(clazz));
+HprofStringId Hprof::LookupClassNameId(Class* c) {
+ return LookupStringId(PrettyDescriptor(c));
}
-HprofClassObjectId Hprof::LookupClassId(Class* clazz) {
- if (clazz == NULL) {
- // clazz is the superclass of java.lang.Object or a primitive
+HprofClassObjectId Hprof::LookupClassId(Class* c) {
+ if (c == NULL) {
+ // c is the superclass of java.lang.Object or a primitive
return (HprofClassObjectId)0;
}
- std::pair<ClassSetIterator, bool> result = classes_.insert(clazz);
+ std::pair<ClassSetIterator, bool> result = classes_.insert(c);
Class* present = *result.first;
// Make sure that we've assigned a string ID for this class' name
- LookupClassNameId(clazz);
+ LookupClassNameId(c);
- CHECK_EQ(present, clazz);
+ CHECK_EQ(present, c);
return (HprofStringId) present;
}
@@ -709,8 +709,8 @@
uint32_t nextSerialNumber = 1;
for (ClassSetIterator it = classes_.begin(); it != classes_.end(); ++it) {
- Class* clazz = *it;
- CHECK(clazz != NULL);
+ Class* c = *it;
+ CHECK(c != NULL);
int err = StartNewRecord(HPROF_TAG_LOAD_CLASS, HPROF_TIME);
if (err != 0) {
@@ -723,9 +723,9 @@
// U4: stack trace serial number
// ID: class name string ID
rec->AddU4(nextSerialNumber++);
- rec->AddId((HprofClassObjectId) clazz);
+ rec->AddId((HprofClassObjectId) c);
rec->AddU4(HPROF_NULL_STACK_TRACE);
- rec->AddId(LookupClassNameId(clazz));
+ rec->AddId(LookupClassNameId(c));
}
return 0;