mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-26 18:21:04 +00:00
Tidied some range stuff.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3581 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
205e47ed25
commit
ff8b01532f
1 changed files with 10 additions and 4 deletions
|
@ -783,6 +783,7 @@ handle_printf_atsign (FILE *stream,
|
||||||
{
|
{
|
||||||
start = aRange.location; stop = NSMaxRange(aRange); step = 1;
|
start = aRange.location; stop = NSMaxRange(aRange); step = 1;
|
||||||
}
|
}
|
||||||
|
range.location = 0;
|
||||||
range.length = 0;
|
range.length = 0;
|
||||||
for (i = start; i != stop; i+=step)
|
for (i = start; i != stop; i+=step)
|
||||||
{
|
{
|
||||||
|
@ -2286,12 +2287,17 @@ else
|
||||||
NSString *substring = nil;
|
NSString *substring = nil;
|
||||||
|
|
||||||
range = [self rangeOfString:@"." options:NSBackwardsSearch];
|
range = [self rangeOfString:@"." options:NSBackwardsSearch];
|
||||||
if (range.length == 0
|
if (range.length == 0)
|
||||||
|| range.location < ([self rangeOfCharacterFromSet: pathSeps()
|
substring = nil;
|
||||||
options: NSBackwardsSearch]).location)
|
else
|
||||||
|
{
|
||||||
|
NSRange range2 = [self rangeOfCharacterFromSet: pathSeps()
|
||||||
|
options: NSBackwardsSearch];
|
||||||
|
if (range2.length > 0 && range.location < range2.location)
|
||||||
substring = nil;
|
substring = nil;
|
||||||
else
|
else
|
||||||
substring = [self substringFromIndex:range.location + 1];
|
substring = [self substringFromIndex:range.location + 1];
|
||||||
|
}
|
||||||
|
|
||||||
if (!substring)
|
if (!substring)
|
||||||
substring = [[NSString new] autorelease];
|
substring = [[NSString new] autorelease];
|
||||||
|
|
Loading…
Reference in a new issue