ObjFW  Diff

Differences From Artifact [940c27c632]:

To Artifact [29eff2abae]:


309
310
311
312
313
314
315
316
317


318
319
320
321
322
323
324
325
326
327

328
329
330
331
332
333
334
335


336
337

338
339
340
341
342
343
344
345
346
347


348
349
350
351
352
353
354
355
356
357

358
359
360
361
362
363
364
365


366
367

368
369
370
371
372
373
374
309
310
311
312
313
314
315


316
317
318
319
320
321
322
323
324
325
326

327
328
329
330
331
332
333


334
335
336

337
338
339
340
341
342
343
344
345


346
347
348
349
350
351
352
353
354
355
356

357
358
359
360
361
362
363


364
365
366

367
368
369
370
371
372
373
374







-
-
+
+









-
+






-
-
+
+

-
+








-
-
+
+









-
+






-
-
+
+

-
+








	return NO;
}

- (OFArray*)allKeys
{
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	id *cArray = [self allocMemoryForNItems: [self count]
					 ofSize: sizeof(id)];
	id *keys = [self allocMemoryForNItems: [self count]
				       ofSize: sizeof(id)];
	OFArray *ret;
	OFEnumerator *enumerator;
	id key;
	size_t i = 0;

	pool = [[OFAutoreleasePool alloc] init];
	enumerator = [self keyEnumerator];

	while ((key = [enumerator nextObject]) != nil)
		cArray[i++] = key;
		keys[i++] = key;

	assert(i == [self count]);

	[pool release];

	@try {
		ret = [OFArray arrayWithCArray: cArray
					length: [self count]];
		ret = [OFArray arrayWithObjects: keys
					  count: [self count]];
	} @finally {
		[self freeMemory: cArray];
		[self freeMemory: keys];
	}

	return ret;
}

- (OFArray*)allObjects
{
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	id *cArray = [self allocMemoryForNItems: [self count]
					 ofSize: sizeof(id)];
	id *objects = [self allocMemoryForNItems: [self count]
					  ofSize: sizeof(id)];
	OFArray *ret;
	OFEnumerator *enumerator;
	id object;
	size_t i = 0;

	pool = [[OFAutoreleasePool alloc] init];
	enumerator = [self objectEnumerator];

	while ((object = [enumerator nextObject]) != nil)
		cArray[i++] = object;
		objects[i++] = object;

	assert(i == [self count]);

	[pool release];

	@try {
		ret = [OFArray arrayWithCArray: cArray
					length: [self count]];
		ret = [OFArray arrayWithObjects: objects
					  count: [self count]];
	} @finally {
		[self freeMemory: cArray];
		[self freeMemory: objects];
	}

	return ret;
}

- (OFEnumerator*)objectEnumerator
{