@@ -105,30 +105,30 @@ return self; } - (instancetype)initWithItems: (const void *)items - itemSize: (size_t)itemSize count: (size_t)count + itemSize: (size_t)itemSize { self = [super initWithItems: items - itemSize: itemSize - count: count]; + count: count + itemSize: itemSize]; _capacity = _count; return self; } - (instancetype)initWithItemsNoCopy: (void *)items - itemSize: (size_t)itemSize count: (size_t)count + itemSize: (size_t)itemSize freeWhenDone: (bool)freeWhenDone { self = [self initWithItems: items - itemSize: itemSize - count: count]; + count: count + itemSize: itemSize]; if (freeWhenDone) free(items); return self; @@ -177,12 +177,12 @@ if (range.length > SIZE_MAX - range.location || range.location + range.length > _count) @throw [OFOutOfRangeException exception]; return [OFData dataWithItems: _items + (range.location * _itemSize) - itemSize: _itemSize - count: range.length]; + count: range.length + itemSize: _itemSize]; } - (void)addItem: (const void *)item { if (SIZE_MAX - _count < 1) @@ -301,12 +301,12 @@ } - (id)copy { return [[OFData alloc] initWithItems: _items - itemSize: _itemSize - count: _count]; + count: _count + itemSize: _itemSize]; } - (void)makeImmutable { if (_capacity != _count) {