ObjFW  Diff

Differences From Artifact [c70541cdfe]:

To Artifact [af6bd066da]:


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
{
	OFEnumerator *enumerator;
	int i;

	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;
}








<
<
|

<
<





<
<
<



|
<
<
<

<







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
{
	OFEnumerator *enumerator;
	int i;

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

	if (enumerator == nil) {


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


	}

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




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

		if (object == nil)



			return i;


		objects[i] = object;
	}

	return i;
}