ObjFW  Diff

Differences From Artifact [f856f20ee2]:

To Artifact [cdc962433d]:


506
507
508
509
510
511
512
513



514

515

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

533
534
535
536
537
538
539
540
	if (key == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];

	hash = [key hash];
	last = size;

	for (i = hash & (size - 1); i < last && data[i].key != nil &&



	    (data[i].key == DELETED || ![data[i].key isEqual: key]); i++);



	if (i < last && (data[i].key == nil || data[i].key == DELETED))
		return nil;

	/* In case the last bucket is already used */
	if (i >= last) {
		last = hash & (size - 1);

		for (i = 0; i < last && data[i].key != nil &&
		    (data[i].key == DELETED || ![data[i].key isEqual: key]);
		    i++);
	}

	/* Key not in dictionary */
	if (i >= last || data[i].key == nil || data[i].key == DELETED ||
	    ![data[i].key isEqual: key])
		return nil;


	return [[data[i].object retain] autorelease];
}

- (size_t)count
{
	return count;
}








|
>
>
>
|
>
|
>
|



<
|

|
|
|
|
<
<
<
|
|
|
>
|







506
507
508
509
510
511
512
513
514
515
516
517
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
	if (key == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];

	hash = [key hash];
	last = size;

	for (i = hash & (size - 1); i < last && data[i].key != nil; i++) {
		if (data[i].key == DELETED)
			continue;

		if ([data[i].key isEqual: key])
			return [[data[i].object retain] autorelease];
	}

	if (i < last)
		return nil;

	/* In case the last bucket is already used */

	last = hash & (size - 1);

	for (i = 0; i < last && data[i].key != nil; i++) {
		if (data[i].key == DELETED)
			continue;




		if ([data[i].key isEqual: key])
			return [[data[i].object retain] autorelease];
	}

	return nil;
}

- (size_t)count
{
	return count;
}