gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 09:41:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

variable initialisation fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35597 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2012-09-23 16:25:20 +00:00
parent 83b4735655
commit c5c25f4c8d
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-09-24 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: Fix error spotted by Fred.
2012-09-24 Richard Frith-Macdonald <rfm@gnu.org> 2012-09-24 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSFileHandle.h: deprecate old method for setting * Headers/Foundation/NSFileHandle.h: deprecate old method for setting

6
Source/NSBundle.m
View file

@ -123,17 +123,17 @@ altLang(NSString *full)
} }
} }
if ([canon rangeOfString: @"-"].length > 1) if ((r = [canon rangeOfString: @"-"]).length > 1)
{ {
dialect = [canon substringFromIndex: NSMaxRange(r)]; dialect = [canon substringFromIndex: NSMaxRange(r)];
lang = [canon substringToIndex: r.location]; lang = [canon substringToIndex: r.location];
if ([dialect rangeOfString: @"_"].length > 1) if ((r = [dialect rangeOfString: @"_"]).length > 1)
{ {
region = [dialect substringFromIndex: NSMaxRange(r)]; region = [dialect substringFromIndex: NSMaxRange(r)];
dialect = [dialect substringToIndex: r.location]; dialect = [dialect substringToIndex: r.location];
} }
} }
else if ([canon rangeOfString: @"_"].length > 1) else if ((r = [canon rangeOfString: @"_"]).length > 1)
{ {
region = [canon substringFromIndex: NSMaxRange(r)]; region = [canon substringFromIndex: NSMaxRange(r)];
lang = [canon substringToIndex: r.location]; lang = [canon substringToIndex: r.location];