diff options
Diffstat (limited to 'libobjc')
-rw-r--r-- | libobjc/ChangeLog | 6 | ||||
-rw-r--r-- | libobjc/encoding.c | 4 | ||||
-rw-r--r-- | libobjc/sarray.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index bc4d60a..4c374d9 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,9 @@ +2009-11-28 Jakub Jelinek <jakub@redhat.com> + + * sarray.c (sarray_free): Use old_buckets variable. + * encoding.c (objc_layout_structure_next_member): Remove unused + bfld_type_size variable. + 2009-08-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * configure.ac (AC_PREREQ): Bump to 2.64. diff --git a/libobjc/encoding.c b/libobjc/encoding.c index d2a8a4d..4ae29a7 100644 --- a/libobjc/encoding.c +++ b/libobjc/encoding.c @@ -904,7 +904,7 @@ objc_layout_structure_next_member (struct objc_struct_layout *layout) /* The following are used only if the field is a bitfield */ register const char *bfld_type = 0; - register int bfld_type_size, bfld_type_align = 0, bfld_field_size = 0; + register int bfld_type_align = 0, bfld_field_size = 0; /* The current type without the type qualifiers */ const char *type; @@ -927,7 +927,6 @@ objc_layout_structure_next_member (struct objc_struct_layout *layout) bfld_type++) /* do nothing */; - bfld_type_size = objc_sizeof_type (bfld_type) * BITS_PER_UNIT; bfld_type_align = objc_alignof_type (bfld_type) * BITS_PER_UNIT; bfld_field_size = atoi (objc_skip_typespec (bfld_type)); layout->record_size += bfld_field_size; @@ -958,7 +957,6 @@ objc_layout_structure_next_member (struct objc_struct_layout *layout) bfld_type++) /* do nothing */; - bfld_type_size = objc_sizeof_type (bfld_type) * BITS_PER_UNIT; bfld_type_align = objc_alignof_type (bfld_type) * BITS_PER_UNIT; bfld_field_size = atoi (objc_skip_typespec (bfld_type)); } diff --git a/libobjc/sarray.c b/libobjc/sarray.c index 147fd43..bb80ae0 100644 --- a/libobjc/sarray.c +++ b/libobjc/sarray.c @@ -422,7 +422,7 @@ sarray_free (struct sarray *array) { nindices -= 1; } #else /* OBJC_SPARSE2 */ - struct sbucket *bkt = array->buckets[counter]; + struct sbucket *bkt = old_buckets[counter]; if ((bkt != array->empty_bucket) && (bkt->version.version == array->version.version)) { |