ObjFW: Diff

Differences From Artifact [340e813c87]:

File src/OFArray.m — part of check-in [9338313079] at 2009-05-05 14:00:10 on branch trunk — There is a good reason to return id and not OFObject*.
When using OFObject*, you have to cast to get rid of a warning when
calling methods on the returned object. (user: js, size: 1779) [annotate] [blame] [check-ins using]

File src/OFArray.m — part of check-in [64bc94cdb3] at 2009-05-05 17:59:49 on branch trunk — Rename - objects / - items in OFArray / OFDataArray to - count. (user: js, size: 1777) [annotate] [blame] [check-ins using]

︙
35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61	35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61	- + - + - +	[self free]; @throw e; } return self; } ~~- (size_t)~~objects~~~~ - (size_t)count { ~~return [array ~~items~~];~~ return [array count]; } - (id)copy { OFArray new = [OFArray array]; OFObject *objs; size_t len, i; objs = [array data]; ~~len = [array ~~items~~];~~ len = [array count]; [new->array addNItems: len fromCArray: objs]; for (i = 0; i < len; i++) [objs[i] retain];
︙
82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 ~~109~~ 110 111 112 113 114 115 116 117 118 119	82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119	- + - +	- removeNObjects: (size_t)nobjects { OFObject objs; size_t len, i; objs = [array data]; ~~len = [array ~~items~~];~~ len = [array count]; if (nobjects > len) @throw [OFOutOfRangeException newWithClass: isa]; for (i = len - nobjects; i < len; i++) [objs[i] release]; [array removeNItems: nobjects]; return self; } - free { OFObject objs; size_t len, i; if (array != nil) { objs = [array data]; ~~len = [array ~~items~~];~~ len = [array count]; for (i = 0; i < len; i++) [objs[i] release]; [array release]; } return [super free]; } @end