@@ -431,13 +431,15 @@ s->cStringLength = newCStringLength; s->length += string->s->length; } -- (void)deleteCharactersFromIndex: (size_t)start - toIndex: (size_t)end +- (void)deleteCharactersInRange: (of_range_t)range { + size_t start = range.start; + size_t end = range.start + range.length; + if (start > end) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if (end > s->length) @@ -463,20 +465,15 @@ /* We don't really care, as we only made it smaller */ [e release]; } } -- (void)deleteCharactersInRange: (of_range_t)range -{ - [self deleteCharactersFromIndex: range.start - toIndex: range.start + range.length]; -} - -- (void)replaceCharactersFromIndex: (size_t)start - toIndex: (size_t)end - withString: (OFString*)replacement -{ +- (void)replaceCharactersInRange: (of_range_t)range + withString: (OFString*)replacement +{ + size_t start = range.start; + size_t end = range.start + range.length; size_t newCStringLength, newLength; if (start > end) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; @@ -506,18 +503,10 @@ s->cStringLength = newCStringLength; s->length = newLength; } -- (void)replaceCharactersInRange: (of_range_t)range - withString: (OFString*)replacement -{ - [self replaceCharactersFromIndex: range.start - toIndex: range.start + range.length - withString: replacement]; -} - - (void)replaceOccurrencesOfString: (OFString*)string withString: (OFString*)replacement { const char *cString = [string cString]; const char *replacementCString = [replacement cString];