Revision: 4988
http://skim-app.svn.sourceforge.net/skim-app/?rev=4988&view=rev
Author: hofman
Date: 2008-11-23 18:48:37 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
different implementation of previous change, as const's can't be assigned
Modified Paths:
--------------
trunk/NSData_SKExtensions.m
Modified: trunk/NSData_SKExtensions.m
===================================================================
--- trunk/NSData_SKExtensions.m 2008-11-23 18:31:38 UTC (rev 4987)
+++ trunk/NSData_SKExtensions.m 2008-11-23 18:48:37 UTC (rev 4988)
@@ -51,15 +51,14 @@
}
- (unsigned)indexOfBytes:(const void *)patternBytes length:(unsigned
int)patternLength options:(int)mask range:(NSRange)searchRange {
+ unsigned int selfLength = [self length];
+ if (searchRange.location > selfLength || NSMaxRange(searchRange) >
selfLength)
+ [NSException raise:NSRangeException format:@"Range {%u,%u} exceeds
length %u", searchRange.location, searchRange.length, selfLength];
+
unsigned const char *selfBufferStart, *selfPtr, *selfPtrEnd, *selfPtrMax;
- unsigned const char firstPatternByte;
- unsigned int selfLength;
+ unsigned const char firstPatternByte = *(const char *)patternBytes;
BOOL backward = (mask & NSBackwardsSearch) != 0;
- selfLength = [self length];
- if (searchRange.location > selfLength || NSMaxRange(searchRange) >
selfLength)
- [NSException raise:NSRangeException format:@"Range {%u,%u} exceeds
length %u", searchRange.location, searchRange.length, selfLength];
-
if (patternLength == 0)
return searchRange.location;
if (patternLength > searchRange.length) {
@@ -67,7 +66,6 @@
return NSNotFound;
}
- firstPatternByte = *(const char *)patternBytes;
selfBufferStart = [self bytes];
selfPtrMax = selfBufferStart + NSMaxRange(searchRange) + 1 - patternLength;
if (backward) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
