Index: src/OFArray.h ================================================================== --- src/OFArray.h +++ src/OFArray.h @@ -85,11 +85,11 @@ - (size_t)count; /** * \return The objects of the array as a C array */ -- (id*)data; +- (id*)cArray; /** * Returns a specific object of the OFDataArray. * * \param index The number of the object to return Index: src/OFArray.m ================================================================== --- src/OFArray.m +++ src/OFArray.m @@ -136,13 +136,13 @@ - (size_t)count { return [array count]; } -- (id*)data +- (id*)cArray { - return [array data]; + return [array cArray]; } - (id)copy { return [self retain]; @@ -152,11 +152,11 @@ { OFArray *new = [[OFMutableArray alloc] init]; OFObject **objs; size_t len, i; - objs = [array data]; + objs = [array cArray]; len = [array count]; [new->array addNItems: len fromCArray: objs]; @@ -190,12 +190,12 @@ len2 = [obj count]; if (len != len2) return NO; - objs = [array data]; - objs2 = [obj data]; + objs = [array cArray]; + objs2 = [obj cArray]; for (i = 0; i < len; i++) if (![objs[i] isEqual: objs2[i]]) return NO; @@ -206,11 +206,11 @@ { OFObject **objs; size_t len, i; if (array != nil) { - objs = [array data]; + objs = [array cArray]; len = [array count]; for (i = 0; i < len; i++) [objs[i] release]; Index: src/OFDataArray.h ================================================================== --- src/OFDataArray.h +++ src/OFDataArray.h @@ -51,13 +51,13 @@ * \return The size of each item in the OFDataArray in bytes */ - (size_t)itemsize; /** - * \return All elements of the OFDataArray + * \return All elements of the OFDataArray as a C array */ -- (void*)data; +- (void*)cArray; /** * Compares the OFDataArray to another object. * * \param obj An object to compare with Index: src/OFDataArray.m ================================================================== --- src/OFDataArray.m +++ src/OFDataArray.m @@ -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; } } Index: src/OFDictionary.m ================================================================== --- src/OFDictionary.m +++ src/OFDictionary.m @@ -145,19 +145,19 @@ } - initWithObjects: (OFArray*)objs forKeys: (OFArray*)keys { - id *objs_data, *keys_data; + id *objs_carray, *keys_carray; size_t objs_count, i; const SEL sel = @selector(setObject:forKey:); IMP set = [OFMutableDictionary instanceMethodForSelector: sel]; self = [self init]; - objs_data = [objs data]; - keys_data = [keys data]; + objs_carray = [objs cArray]; + keys_carray = [keys cArray]; objs_count = [objs count]; if (objs == nil || keys == nil || objs_count != [keys count]) { Class c = isa; [self dealloc]; @@ -165,11 +165,11 @@ selector: _cmd]; } @try { for (i = 0; i < objs_count; i++) - set(self, sel, objs_data[i], keys_data[i]); + set(self, sel, objs_carray[i], keys_carray[i]); } @catch (OFException *e) { [self dealloc]; @throw e; } Index: src/OFMutableArray.m ================================================================== --- src/OFMutableArray.m +++ src/OFMutableArray.m @@ -19,11 +19,11 @@ { OFArray *new = [[OFArray alloc] init]; OFObject **objs; size_t len, i; - objs = [array data]; + objs = [array cArray]; len = [array count]; [new->array addNItems: len fromCArray: objs]; @@ -44,11 +44,11 @@ - removeNObjects: (size_t)nobjects { OFObject **objs; size_t len, i; - objs = [array data]; + objs = [array cArray]; len = [array count]; if (nobjects > len) @throw [OFOutOfRangeException newWithClass: isa]; Index: src/OFXMLElement.m ================================================================== --- src/OFXMLElement.m +++ src/OFXMLElement.m @@ -121,11 +121,11 @@ - (OFString*)string { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; char *str_c; size_t len, i, j, attrs_count; - OFXMLAttribute **attrs_data; + OFXMLAttribute **attrs_carray; OFString *ret, *tmp; len = [name cStringLength] + 4; str_c = [self allocMemoryWithSize: len]; @@ -133,17 +133,17 @@ *str_c = '<'; memcpy(str_c + 1, [name cString], [name cStringLength]); i = [name cStringLength] + 1; /* Attributes */ - attrs_data = [attrs data]; + attrs_carray = [attrs cArray]; attrs_count = [attrs count]; for (j = 0; j < attrs_count; j++) { /* FIXME: Add namespace support */ - OFString *attr_name = [attrs_data[j] name]; - tmp = [[attrs_data[j] stringValue] stringByXMLEscaping]; + OFString *attr_name = [attrs_carray[j] name]; + tmp = [[attrs_carray[j] stringValue] stringByXMLEscaping]; len += [attr_name cStringLength] + [tmp cStringLength] + 4; @try { str_c = [self resizeMemory: str_c toSize: len]; @@ -168,22 +168,22 @@ /* Childen */ if (stringval != nil || children != nil) { if (stringval != nil) tmp = [stringval stringByXMLEscaping]; else if (children != nil) { - OFXMLElement **data = [children data]; - size_t count = [children count]; + OFXMLElement **children_carray = [children cArray]; + size_t children_count = [children count]; IMP append; tmp = [OFMutableString string]; append = [tmp methodForSelector: @selector(appendCStringWithoutUTF8Checking:)]; - for (j = 0; j < count; j++) + for (j = 0; j < children_count; j++) append(tmp, @selector( appendCStringWithoutUTF8Checking:), - [[data[j] string] cString]); + [[children_carray[j] string] cString]); } len += [tmp cStringLength] + [name cStringLength] + 2; @try { str_c = [self resizeMemory: str_c Index: tests/dataarray.m ================================================================== --- tests/dataarray.m +++ tests/dataarray.m @@ -52,11 +52,11 @@ other = (class == [OFDataArray class] ? [OFBigDataArray class] : [OFDataArray class]); TEST(@"-[isEqual:]", (array[1] = [other dataArrayWithItemSize: 4096]) && [array[1] addNItems: [array[0] count] - fromCArray: [array[0] data]] && + fromCArray: [array[0] cArray]] && [array[1] isEqual: array[0]] && [array[1] removeNItems: 1] && ![array[0] isEqual: array[1]]) TEST(@"-[copy]", (array[1] = [[array[0] copy] autorelease]) && [array[0] isEqual: array[1]]) @@ -72,11 +72,11 @@ TEST(@"Building strings", (array[0] = [class dataArrayWithItemSize: 1]) && [array[0] addNItems: 6 fromCArray: (void*)str] && [array[0] addItem: ""] && - !strcmp([array[0] data], str)) + !strcmp([array[0] cArray], str)) EXPECT_EXCEPTION(@"Detect out of range in -[itemAtIndex:]", OFOutOfRangeException, [array[0] itemAtIndex: [array[0] count]]) EXPECT_EXCEPTION(@"Detect out of range in -[addNItems:fromCArray:]", Index: tests/xmlparser.m ================================================================== --- tests/xmlparser.m +++ tests/xmlparser.m @@ -33,11 +33,11 @@ static void callback(enum event_type et, OFString *name, OFString *prefix, OFString *ns, OFArray *attrs, OFString *string, OFString *comment) { OFString *msg; - id *data; + id *carray; size_t count; i++; msg = [OFString stringWithFormat: @"Parsing part #%d", i]; @@ -46,50 +46,50 @@ case 5: TEST(msg, et == STRING && [string isEqual: @"bar"]) break; case 2: /* FIXME: Namespace */ - data = [attrs data]; + carray = [attrs cArray]; count = [attrs count]; TEST(msg, et == TAG_START && [name isEqual: @"bar"] && [prefix isEqual: @"foo"] && ns == nil && attrs != nil && count == 2 && /* Attribute 1 */ - [[data[0] name] isEqual: @"bar"] && - [data[0] prefix] == nil && - [[data[0] stringValue] isEqual: @"b&az"] && - [data[0] namespace] == nil && + [[carray[0] name] isEqual: @"bar"] && + [carray[0] prefix] == nil && + [[carray[0] stringValue] isEqual: @"b&az"] && + [carray[0] namespace] == nil && /* Attribute 2 */ - [[data[1] name] isEqual: @"qux"] && - [[data[1] prefix] isEqual: @"qux"] && - [[data[1] stringValue] isEqual: @" quux "] && - [data[1] namespace] == nil) + [[carray[1] name] isEqual: @"qux"] && + [[carray[1] prefix] isEqual: @"qux"] && + [[carray[1] stringValue] isEqual: @" quux "] && + [carray[1] namespace] == nil) break; case 3: TEST(msg, et == STRING && [string isEqual: @"foo