Author: rmottola
Date: Fri Nov 13 01:06:18 2015
New Revision: 39169
URL: http://svn.gna.org/viewcvs/gnustep?rev=39169&view=rev
Log:
Parse length and location with scanInteger and not scanInt
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Source/NSRange.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=39169&r1=39168&r2=39169&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Fri Nov 13 01:06:18 2015
@@ -1,3 +1,8 @@
+2015-11-13 Riccardo Mottola <[email protected]>
+
+ * Source/NSRange.m: (NSRangeFromString)
+ Parse length and location with scanInteger and not scanInt (suggested
by Fred Kiefer to fix 64bit)
+
2015-11-02 Richard Frith-Macdonald <[email protected]>
* Source/NSXMLElement.m: (insertChild:atIndex:) if the child already
Modified: libs/base/trunk/Source/NSRange.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSRange.m?rev=39169&r1=39168&r2=39169&view=diff
==============================================================================
--- libs/base/trunk/Source/NSRange.m (original)
+++ libs/base/trunk/Source/NSRange.m Fri Nov 13 01:06:18 2015
@@ -1,5 +1,5 @@
/** NSRange - range functions
- * Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+ * Copyright (C) 1993-2015 Free Software Foundation, Inc.
*
* Written by: Adam Fedor <[email protected]>
* Date: Mar 1995
@@ -36,10 +36,10 @@
static Class NSStringClass = 0;
static Class NSScannerClass = 0;
-static SEL scanIntSel;
+static SEL scanIntegerSel;
static SEL scanStringSel;
static SEL scannerSel;
-static BOOL (*scanIntImp)(NSScanner*, SEL, int*);
+static BOOL (*scanIntegerImp)(NSScanner*, SEL, NSInteger*);
static BOOL (*scanStringImp)(NSScanner*, SEL, NSString*, NSString**);
static id (*scannerImp)(Class, SEL, NSString*);
@@ -50,11 +50,11 @@
{
NSStringClass = [NSString class];
NSScannerClass = [NSScanner class];
- scanIntSel = @selector(scanInt:);
+ scanIntegerSel = @selector(scanInteger:);
scanStringSel = @selector(scanString:intoString:);
scannerSel = @selector(scannerWithString:);
- scanIntImp = (BOOL (*)(NSScanner*, SEL, int*))
- [NSScannerClass instanceMethodForSelector: scanIntSel];
+ scanIntegerImp = (BOOL (*)(NSScanner*, SEL, NSInteger*))
+ [NSScannerClass instanceMethodForSelector: scanIntegerSel];
scanStringImp = (BOOL (*)(NSScanner*, SEL, NSString*, NSString**))
[NSScannerClass instanceMethodForSelector: scanStringSel];
scannerImp = (id (*)(Class, SEL, NSString*))
@@ -73,11 +73,11 @@
if ((*scanStringImp)(scanner, scanStringSel, @"{", NULL)
&& (*scanStringImp)(scanner, scanStringSel, @"location", NULL)
&& (*scanStringImp)(scanner, scanStringSel, @"=", NULL)
- && (*scanIntImp)(scanner, scanIntSel, (int*)&range.location)
+ && (*scanIntegerImp)(scanner, scanIntegerSel, (NSInteger*)&range.location)
&& (*scanStringImp)(scanner, scanStringSel, @",", NULL)
&& (*scanStringImp)(scanner, scanStringSel, @"length", NULL)
&& (*scanStringImp)(scanner, scanStringSel, @"=", NULL)
- && (*scanIntImp)(scanner, scanIntSel, (int*)&range.length)
+ && (*scanIntegerImp)(scanner, scanIntegerSel, (NSInteger*)&range.length)
&& (*scanStringImp)(scanner, scanStringSel, @"}", NULL))
return range;
else
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
