Differences From Artifact [bc01872668]:
- File
src/OFDataArray.m
— part of check-in
[9ddd33a258]
at
2013-01-12 17:29:24
on branch trunk
— Rename *UsingEncoding: to *WithEncoding:.
This reverts 5362941.
Even though *UsingEncoding: is what Foundation uses, *WithEncoding: is
more natural and is more consistent with the rest. Also, this means this
restores it to the API of 0.7. (user: js, size: 14781) [annotate] [blame] [check-ins using]
To Artifact [df33921628]:
- File src/OFDataArray.m — part of check-in [9c421b6ff0] at 2013-01-13 03:17:11 on branch trunk — OFBigDataArray: Always keep at least one page. (user: js, size: 15096) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
643 644 645 646 647 648 649 |
count += count_;
size = newSize;
}
- (void)removeItemsInRange: (of_range_t)range
{
| | | | | > | | > > > > | > | | | | > > > | > > > > | | < | 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 |
count += count_;
size = newSize;
}
- (void)removeItemsInRange: (of_range_t)range
{
size_t pageSize, newSize;
if (range.length > SIZE_MAX - range.location ||
range.location + range.length > count)
@throw [OFOutOfRangeException exceptionWithClass: [self class]];
memmove(items + range.location * itemSize,
items + (range.location + range.length) * itemSize,
(count - range.location - range.length) * itemSize);
count -= range.length;
pageSize = [OFSystemInfo pageSize];
newSize = (count * itemSize + pageSize - 1) & ~(pageSize - 1);
if (size != newSize && newSize >= pageSize) {
@try {
items = [self resizeMemory: items
size: newSize];
} @catch (OFOutOfMemoryException *e) {
/* We don't care, as we only made it smaller */
}
size = newSize;
}
}
- (void)removeLastItem
{
size_t pageSize, newSize;
if (count == 0)
return;
count--;
pageSize = [OFSystemInfo pageSize];
newSize = (count * itemSize + pageSize - 1) & ~(pageSize - 1);
if (size != newSize && newSize >= pageSize) {
@try {
items = [self resizeMemory: items
size: newSize];
} @catch (OFOutOfMemoryException *e) {
/* We don't care, as we only made it smaller */
}
size = newSize;
}
}
- (void)removeAllItems
{
size_t pageSize = [OFSystemInfo pageSize];
@try {
items = [self resizeMemory: items
size: pageSize];
size = pageSize;
} @catch (OFOutOfMemoryException *e) {
/* We don't care, as we only made it smaller */
}
count = 0;
}
@end
|