ObjFW  Diff

Differences From Artifact [8b0f05ccee]:

To Artifact [6763734ad5]:


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

566
567
568
569
570
571
572
573

574
575

576
577
578

579
580
581
582
583
584
585
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
566
567


568
569
570
571
572
573
574
575

576
577
578
579
580
581
582
583

584
585

586
587
588

589
590
591
592
593
594
595
596







+

-
-
-
-
+
+
+
+



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






-
-
+
+






-
+







-
+

-
+


-
+








	s->cStringLength = newCStringLength;
	s->length = newLength;
}

- (void)replaceOccurrencesOfString: (OFString*)string
			withString: (OFString*)replacement
			   inRange: (of_range_t)range
{
	const char *UTF8String = [string UTF8String];
	const char *replacementUTF8String = [replacement UTF8String];
	size_t UTF8StringLength = [string UTF8StringLength];
	size_t replacementUTF8StringLength = [replacement UTF8StringLength];
	const char *searchString = [string UTF8String];
	const char *replacementString = [replacement UTF8String];
	size_t searchLength = [string UTF8StringLength];
	size_t replacementLength = [replacement UTF8StringLength];
	size_t i, last, newCStringLength, newLength;
	char *newCString;

	if (s->UTF8) {
		range.start = of_string_index_to_position(s->cString,
	if (UTF8StringLength > s->cStringLength)
		    range.start, s->cStringLength);
		range.length = of_string_index_to_position(s->cString,
		    range.start + range.length, s->cStringLength) - range.start;
	}

	if (range.start + range.length > [self UTF8StringLength])
		@throw [OFOutOfRangeException exceptionWithClass: isa];

	if ([string UTF8StringLength] > range.length)
		return;

	newCString = NULL;
	newCStringLength = 0;
	newLength = s->length;

	for (i = 0, last = 0; i <= s->cStringLength - UTF8StringLength; i++) {
		if (memcmp(s->cString + i, UTF8String, UTF8StringLength))
	for (i = range.start, last = 0; i <= range.length - searchLength; i++) {
		if (memcmp(s->cString + i, searchString, searchLength))
			continue;

		@try {
			newCString = [self
			    resizeMemory: newCString
				  toSize: newCStringLength + i - last +
					  replacementUTF8StringLength + 1];
					  replacementLength + 1];
		} @catch (id e) {
			[self freeMemory: newCString];
			@throw e;
		}
		memcpy(newCString + newCStringLength, s->cString + last,
		    i - last);
		memcpy(newCString + newCStringLength + i - last,
		    replacementUTF8String, replacementUTF8StringLength);
		    replacementString, replacementLength);

		newCStringLength += i - last + replacementUTF8StringLength;
		newCStringLength += i - last + replacementLength;
		newLength = newLength - [string length] + [replacement length];

		i += UTF8StringLength - 1;
		i += searchLength - 1;
		last = i + 1;
	}

	@try {
		newCString = [self
		    resizeMemory: newCString
			  toSize: newCStringLength +