ObjFW  Diff

Differences From Artifact [b0c221b8b7]:

To Artifact [c70541cdfe]:


518
519
520
521
522
523
524


525
































526
527
528
529
530
531
532
518
519
520
521
522
523
524
525
526

527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565







+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+







	    initWithDictionary: self] autorelease];
}

- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
			   objects: (id *)objects
			     count: (int)count
{
	OFEnumerator *enumerator;
	int i;
	OF_UNRECOGNIZED_SELECTOR

	memcpy(&enumerator, state->extra, sizeof(enumerator));

	if (enumerator == nil) {
		void *pool = objc_autoreleasePoolPush();

		enumerator = [[self keyEnumerator] retain];
		memcpy(state->extra, &enumerator, sizeof(enumerator));

		objc_autoreleasePoolPop(pool);
	}

	state->itemsPtr = objects;
	state->mutationsPtr = (unsigned long *)self;

	if (state->state == 1)
		return 0;

	for (i = 0; i < count; i++) {
		id object = [enumerator nextObject];

		if (object == nil) {
			state->state = 1;
			[enumerator release];

			return i;
		}

		objects[i] = object;
	}

	return i;
}

#ifdef OF_HAVE_BLOCKS
- (void)enumerateKeysAndObjectsUsingBlock:
    (of_dictionary_enumeration_block_t)block
{
	bool stop = false;