@@ -65,11 +65,11 @@ - (size_t)itemsize { return itemsize; } -- (void*)data +- (void*)cArray { return data; } - (void*)itemAtIndex: (size_t)index @@ -100,12 +100,12 @@ memcpy(data + count++ * itemsize, item, itemsize); return self; } -- addNItems: (size_t)nitems - fromCArray: (void*)carray +- addNItems: (size_t)nitems + fromCArray: (void*)carray { if (nitems > SIZE_MAX - count) @throw [OFOutOfRangeException newWithClass: isa]; data = [self resizeMemory: data @@ -145,11 +145,11 @@ { if (![obj isKindOfClass: [OFDataArray class]]) return NO; if ([obj count] != count || [obj itemsize] != itemsize) return NO; - if (memcmp([obj data], data, count * itemsize)) + if (memcmp([obj cArray], data, count * itemsize)) return NO; return YES; } @@ -163,19 +163,19 @@ if ([obj itemsize] != itemsize) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if ([obj count] == count) - return memcmp(data, [obj data], count * itemsize); + return memcmp(data, [obj cArray], count * itemsize); if (count > [obj count]) { - if ((ret = memcmp(data, [obj data], [obj count] * itemsize))) + if ((ret = memcmp(data, [obj cArray], [obj count] * itemsize))) return ret; return *(char*)[self itemAtIndex: [obj count]]; } else { - if ((ret = memcmp(data, [obj data], count * itemsize))) + if ((ret = memcmp(data, [obj cArray], count * itemsize))) return ret; return *(char*)[obj itemAtIndex: count] * -1; } }