Author: rfm
Date: Thu May 19 09:32:34 2016
New Revision: 39781
URL: http://svn.gna.org/viewcvs/gnustep?rev=39781&view=rev
Log:
64bit tweak
Modified:
libs/ucsdata/trunk/GSUnicodeData.m
Modified: libs/ucsdata/trunk/GSUnicodeData.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ucsdata/trunk/GSUnicodeData.m?rev=39781&r1=39780&r2=39781&view=diff
==============================================================================
--- libs/ucsdata/trunk/GSUnicodeData.m (original)
+++ libs/ucsdata/trunk/GSUnicodeData.m Thu May 19 09:32:34 2016
@@ -92,55 +92,56 @@
NSData *data;
NSString *dbString, *line;
NSRange range;
- unsigned stringEnd, lineStart, lineEnd, contentEnd, mapValue;
+ NSUInteger stringEnd, lineStart, lineEnd, contentEnd, mapValue;
GSUniChar *ucdEntry;
- [super init];
- _ucdEntries = NSCreateMapTable(NSIntMapKeyCallBacks,
- NSObjectMapValueCallBacks, 65536);
+ if (nil != (self = [super init]))
+ {
+ _ucdEntries = NSCreateMapTable(NSIntMapKeyCallBacks,
+ NSObjectMapValueCallBacks, 65536);
- data = [NSData dataWithContentsOfFile: path];
- if (data == nil)
- {
- [self dealloc];
- return nil;
+ data = [NSData dataWithContentsOfFile: path];
+ if (data == nil)
+ {
+ [self dealloc];
+ return nil;
+ }
+
+ dbString = [[NSString alloc] initWithData: data
+ encoding: NSASCIIStringEncoding];
+ if (dbString == nil)
+ {
+ [self dealloc];
+ return nil;
+ }
+
+ range = NSMakeRange(0, 1);
+ stringEnd = [dbString length];
+ do
+ {
+ NSAutoreleasePool *subpool = [NSAutoreleasePool new];
+ [dbString getLineStart: &lineStart
+ end: &lineEnd
+ contentsEnd: &contentEnd
+ forRange: range];
+ line = [dbString substringWithRange:
+ NSMakeRange(lineStart, contentEnd - lineStart)];
+ ucdEntry = [[GSUniChar alloc] initWithString: line];
+ if (ucdEntry != nil)
+ {
+ mapValue = (unsigned)[ucdEntry character];
+ NSMapInsert(_ucdEntries, (void *)(uintptr_t)mapValue, ucdEntry);
+ }
+ else
+ {
+ NSLog(@"Bad line '%@'", line);
+ }
+
+ range = NSMakeRange(lineEnd, 1);
+ [subpool release];
+ }
+ while (lineEnd < stringEnd);
}
-
- dbString = [[NSString alloc] initWithData: data
- encoding: NSASCIIStringEncoding];
- if (dbString == nil)
- {
- [self dealloc];
- return nil;
- }
-
- range = NSMakeRange(0, 1);
- stringEnd = [dbString length];
- do
- {
- NSAutoreleasePool *subpool = [NSAutoreleasePool new];
- [dbString getLineStart: &lineStart
- end: &lineEnd
- contentsEnd: &contentEnd
- forRange: range];
- line = [dbString substringWithRange:
- NSMakeRange(lineStart, contentEnd - lineStart)];
- ucdEntry = [[GSUniChar alloc] initWithString: line];
- if (ucdEntry != nil)
- {
- mapValue = (unsigned)[ucdEntry character];
- NSMapInsert(_ucdEntries, (void *)(uintptr_t)mapValue, ucdEntry);
- }
- else
- {
- NSLog(@"Bad line '%@'", line);
- }
-
- range = NSMakeRange(lineEnd, 1);
- [subpool release];
- }
- while (lineEnd < stringEnd);
-
return self;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
