diff options
| author | David Chad <davidc@freebsd.org> | 2003-04-11 04:30:33 +0000 |
|---|---|---|
| committer | Loren J. Rittle <ljrittle@gcc.gnu.org> | 2003-04-11 04:30:33 +0000 |
| commit | 0b87e18ef1c2c54458dd76a54ea38ae1571dc237 (patch) | |
| tree | 8cb1d7bf41f29d8a1c0357dd74e7f0eb0660328f /libobjc/objc/sarray.h | |
| parent | 339a28b96a306cb323a66e9142ab090d36f42ba8 (diff) | |
| download | gcc-0b87e18ef1c2c54458dd76a54ea38ae1571dc237.zip gcc-0b87e18ef1c2c54458dd76a54ea38ae1571dc237.tar.gz gcc-0b87e18ef1c2c54458dd76a54ea38ae1571dc237.tar.bz2 | |
(in libobjc:)
libobjc/8562
(in libobjc:)
* objc/hash.h (hash_string): Constify correctly.
(compare_ptrs): Use direct compare.
* objc/objc-list.h (list_nth): Rename index to indx to avoid shadow.
* objc/sarray.h: Global rename index to indx to avoid shadow.
(in gcc/testsuite:)
* objc.dg/headers.m: New test.
Co-Authored-By: Loren J. Rittle <ljrittle@acm.org>
From-SVN: r65461
Diffstat (limited to 'libobjc/objc/sarray.h')
| -rw-r--r-- | libobjc/objc/sarray.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libobjc/objc/sarray.h b/libobjc/objc/sarray.h index 17da272..fa6e2f0 100644 --- a/libobjc/objc/sarray.h +++ b/libobjc/objc/sarray.h @@ -146,8 +146,8 @@ struct sarray* sarray_new(int, void* default_element); void sarray_free(struct sarray*); struct sarray* sarray_lazy_copy(struct sarray*); void sarray_realloc(struct sarray*, int new_size); -void sarray_at_put(struct sarray*, sidx index, void* elem); -void sarray_at_put_safe(struct sarray*, sidx index, void* elem); +void sarray_at_put(struct sarray*, sidx indx, void* elem); +void sarray_at_put_safe(struct sarray*, sidx indx, void* elem); struct sarray* sarray_hard_copy(struct sarray*); /* ... like the name? */ void sarray_remove_garbage(void); @@ -156,10 +156,10 @@ void sarray_remove_garbage(void); #ifdef PRECOMPUTE_SELECTORS /* Transform soffset values to ints and vica verca */ static inline unsigned int -soffset_decode(sidx index) +soffset_decode(sidx indx) { union sofftype x; - x.idx = index; + x.idx = indx; #ifdef OBJC_SPARSE3 return x.off.eoffset + (x.off.boffset*BUCKET_SIZE) @@ -186,9 +186,9 @@ soffset_encode(size_t offset) #else /* not PRECOMPUTE_SELECTORS */ static inline size_t -soffset_decode(sidx index) +soffset_decode(sidx indx) { - return index; + return indx; } static inline sidx @@ -198,13 +198,13 @@ soffset_encode(size_t offset) } #endif /* not PRECOMPUTE_SELECTORS */ -/* Get element from the Sparse array `array' at offset `index' */ +/* Get element from the Sparse array `array' at offset `indx' */ -static inline void* sarray_get(struct sarray* array, sidx index) +static inline void* sarray_get(struct sarray* array, sidx indx) { #ifdef PRECOMPUTE_SELECTORS union sofftype x; - x.idx = index; + x.idx = indx; #ifdef OBJC_SPARSE3 return array-> @@ -217,19 +217,19 @@ static inline void* sarray_get(struct sarray* array, sidx index) #else /* not PRECOMPUTE_SELECTORS */ #ifdef OBJC_SPARSE3 return array-> - indices[index/INDEX_CAPACITY]-> - buckets[(index/BUCKET_SIZE)%INDEX_SIZE]-> - elems[index%BUCKET_SIZE]; + indices[indx/INDEX_CAPACITY]-> + buckets[(indx/BUCKET_SIZE)%INDEX_SIZE]-> + elems[indx%BUCKET_SIZE]; #else /* OBJC_SPARSE2 */ - return array->buckets[index/BUCKET_SIZE]->elems[index%BUCKET_SIZE]; + return array->buckets[indx/BUCKET_SIZE]->elems[indx%BUCKET_SIZE]; #endif /* not OBJC_SPARSE3 */ #endif /* not PRECOMPUTE_SELECTORS */ } -static inline void* sarray_get_safe(struct sarray* array, sidx index) +static inline void* sarray_get_safe(struct sarray* array, sidx indx) { - if(soffset_decode(index) < array->capacity) - return sarray_get(array, index); + if(soffset_decode(indx) < array->capacity) + return sarray_get(array, indx); else return (array->empty_bucket->elems[0]); } |