openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove warnings from ijar/classfile.cc" 

am: 128053b91b

* commit '128053b91b959d0664c33659063c5246eb57a594':
  Remove warnings from ijar/classfile.cc
This commit is contained in:
Shinichiro Hamaji 2015-12-03 05:42:52 +00:00 committed by android-build-merger
parent 1709cf3768 128053b91b
commit 8707422e4e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ijar/Android.mk
View File

@ -8,7 +8,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := classfile.cc ijar.cc zip.cc LOCAL_SRC_FILES := classfile.cc ijar.cc zip.cc
LOCAL_CFLAGS += -Wall LOCAL_CFLAGS += -Wall -Werror
LOCAL_SHARED_LIBRARIES := libz-host LOCAL_SHARED_LIBRARIES := libz-host
LOCAL_MODULE := ijar LOCAL_MODULE := ijar
# libc++ is not supported for TARGET_BUILD_APPS builds # libc++ is not supported for TARGET_BUILD_APPS builds

22
tools/ijar/classfile.cc
View File

@ -483,12 +483,12 @@ struct InnerClassesAttribute : Attribute {
// We keep an entry if the constant referring to the inner class is already // We keep an entry if the constant referring to the inner class is already
// kept. Then we mark its outer class and its class name as kept, too, then // kept. Then we mark its outer class and its class name as kept, too, then
// iterate until a fixed point is reached. // iterate until a fixed point is reached.
int entry_count; size_t entry_count;
int iteration = 0; int iteration = 0;
do { do {
entry_count = kept_entries.size(); entry_count = kept_entries.size();
for (int i_entry = 0; i_entry < entries_.size(); ++i_entry) { for (size_t i_entry = 0; i_entry < entries_.size(); ++i_entry) {
Entry* entry = entries_[i_entry]; Entry* entry = entries_[i_entry];
if (entry->inner_class_info->Kept() || if (entry->inner_class_info->Kept() ||
used_class_names.find(entry->inner_class_info->Display()) used_class_names.find(entry->inner_class_info->Display())
@ -632,7 +632,7 @@ struct ArrayTypeElementValue : ElementValue {
} }
virtual void ExtractClassNames() { virtual void ExtractClassNames() {
for (int i = 0; i < values_.size(); i++) { for (size_t i = 0; i < values_.size(); i++) {
values_[i]->ExtractClassNames(); values_[i]->ExtractClassNames();
} }
} }
@ -800,8 +800,8 @@ struct TypeAnnotation {
}; };
struct EmptyInfo : TargetInfo { struct EmptyInfo : TargetInfo {
void Write(u1 *&p) {} void Write(u1 *&) {}
static EmptyInfo *Read(const u1 *&p) { static EmptyInfo *Read(const u1 *&) {
return new EmptyInfo; return new EmptyInfo;
} }
}; };
@ -1007,7 +1007,7 @@ struct SignatureAttribute : Attribute {
// compiler to generate warning messages. // compiler to generate warning messages.
struct DeprecatedAttribute : Attribute { struct DeprecatedAttribute : Attribute {
static DeprecatedAttribute* Read(const u1 *&p, Constant *attribute_name) { static DeprecatedAttribute* Read(const u1 *&, Constant *attribute_name) {
DeprecatedAttribute *attr = new DeprecatedAttribute; DeprecatedAttribute *attr = new DeprecatedAttribute;
attr->attribute_name_ = attribute_name; attr->attribute_name_ = attribute_name;
return attr; return attr;
@ -1041,7 +1041,7 @@ struct AnnotationsAttribute : Attribute {
} }
virtual void ExtractClassNames() { virtual void ExtractClassNames() {
for (int i = 0; i < annotations_.size(); i++) { for (size_t i = 0; i < annotations_.size(); i++) {
annotations_[i]->ExtractClassNames(); annotations_[i]->ExtractClassNames();
} }
} }
@ -1112,7 +1112,7 @@ struct ParameterAnnotationsAttribute : Attribute {
// and RuntimeInvisibleTypeAnnotations. // and RuntimeInvisibleTypeAnnotations.
struct TypeAnnotationsAttribute : Attribute { struct TypeAnnotationsAttribute : Attribute {
static TypeAnnotationsAttribute* Read(const u1 *&p, Constant *attribute_name, static TypeAnnotationsAttribute* Read(const u1 *&p, Constant *attribute_name,
u4 attribute_length) { u4) {
auto attr = new TypeAnnotationsAttribute; auto attr = new TypeAnnotationsAttribute;
attr->attribute_name_ = attribute_name; attr->attribute_name_ = attribute_name;
u2 num_annotations = get_u2be(p); u2 num_annotations = get_u2be(p);
@ -1124,7 +1124,7 @@ struct TypeAnnotationsAttribute : Attribute {
} }
virtual void ExtractClassNames() { virtual void ExtractClassNames() {
for (int i = 0; i < type_annotations_.size(); i++) { for (size_t i = 0; i < type_annotations_.size(); i++) {
type_annotations_[i]->ExtractClassNames(); type_annotations_[i]->ExtractClassNames();
} }
} }
@ -1181,7 +1181,7 @@ struct HasAttrs {
} }
void ExtractClassNames() { void ExtractClassNames() {
for (int i = 0; i < attributes.size(); i++) { for (size_t i = 0; i < attributes.size(); i++) {
attributes[i]->ExtractClassNames(); attributes[i]->ExtractClassNames();
} }
} }
@ -1739,7 +1739,7 @@ void ClassFile::WriteClass(u1 *&p) {
members.insert(members.end(), fields.begin(), fields.end()); members.insert(members.end(), fields.begin(), fields.end());
members.insert(members.end(), methods.begin(), methods.end()); members.insert(members.end(), methods.begin(), methods.end());
ExtractClassNames(); ExtractClassNames();
for (int i = 0; i < members.size(); i++) { for (size_t i = 0; i < members.size(); i++) {
Member *member = members[i]; Member *member = members[i];
size_t idx = 0; size_t idx = 0;
devtools_ijar::ExtractClassNames(member->descriptor->Display(), &idx); devtools_ijar::ExtractClassNames(member->descriptor->Display(), &idx);