ObjFW  Diff

Differences From Artifact [4ee8184863]:

To Artifact [e74beec694]:


167
168
169
170
171
172
173
174






























175
176
177

178
179

180
181
182
183
184

185
186

187
188
189
190
191
192
193
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206

207
208

209
210
211
212
213

214
215

216
217
218
219
220
221
222
223








+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


-
+

-
+




-
+

-
+







	return new;
}

- (id)objectAtIndex: (size_t)index
{
	return *((OFObject**)[array itemAtIndex: index]);
}

- (size_t)indexOfObject: (id)obj
{
	id *objs = [array cArray];
	size_t i, count = [array count];

	if (objs == NULL)
		return SIZE_MAX;

	for (i = 0; i < count; i++)
		if ([objs[i] isEqual: obj])
			return i;

	return SIZE_MAX;
}

- (size_t)indexOfObjectIdenticalTo: (id)obj
{
	id *objs = [array cArray];
	size_t i, count = [array count];

	if (objs == NULL)
		return SIZE_MAX;

	for (i = 0; i < count; i++)
		if (objs[i] == obj)
			return i;

	return SIZE_MAX;
}

- (id)firstObject
{
	void *first = [array firstItem];
	id *first = [array firstItem];

	return (first != NULL ? *((id*)first) : nil);
	return (first != NULL ? *first : nil);
}

- (id)lastObject
{
	void *last = [array lastItem];
	id *last = [array lastItem];

	return (last != NULL ? *((id*)last) : nil);
	return (last != NULL ? *last : nil);
}

- (BOOL)isEqual: (id)obj
{
	OFObject **objs, **objs2;
	size_t i, len, len2;

208
209
210
211
212
213
214
215

216
217
218
219
220
221
222

223
224
225
226
227
228
229
238
239
240
241
242
243
244

245
246
247
248
249
250
251

252
253
254
255
256
257
258
259







-
+






-
+







			return NO;

	return YES;
}

- (uint32_t)hash
{
	OFObject **carray = [array cArray];
	OFObject **objs = [array cArray];
	size_t i, count = [array count];
	uint32_t hash;

	OF_HASH_INIT(hash);

	for (i = 0; i < count; i++) {
		uint32_t h = [carray[i] hash];
		uint32_t h = [objs[i] hash];

		OF_HASH_ADD(hash, h >> 24);
		OF_HASH_ADD(hash, (h >> 16) & 0xFF);
		OF_HASH_ADD(hash, (h >> 8) & 0xFF);
		OF_HASH_ADD(hash, h & 0xFF);
	}