gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust formatting

Browse source
This commit is contained in:
Nuntius 2021-08-17 15:03:09 +00:00
parent c3daa41f2d
commit ca5e4fc239
2 changed files with 21 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Headers/Foundation/NSURL.h
View file

@ -102,9 +102,7 @@ GS_EXPORT_CLASS
+ (instancetype) fileURLWithPath: (NSString *)aPath
isDirectory: (BOOL)isDir
relativeToURL: (NSURL *)baseURL;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_11, GS_API_LATEST)
/** Create and return a file URL with the supplied path, relative to a base URL.
*/
+ (instancetype) fileURLWithPath:(NSString *)aPath relativeToURL:(NSURL *)baseURL;
@ -170,9 +168,7 @@ GS_EXPORT_CLASS
*/
- (instancetype) initFileURLWithPath: (NSString *)aPath
relativeToURL: (NSURL *)baseURL;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_11, GS_API_LATEST)
/**
* Initialise as a file URL with the specified path (which must
* be a valid path on the local filesystem) relative to the base URL.<br />

46
Source/NSURL.m
View file

@ -591,15 +591,15 @@ static NSUInteger urlAlign;
isDirectory: (BOOL)isDir
relativeToURL: (NSURL *)baseURL
{
return AUTORELEASE([[NSURL alloc] initFileURLWithPath:aPath
isDirectory:isDir
relativeToURL:baseURL]);
return AUTORELEASE([[NSURL alloc] initFileURLWithPath: aPath
isDirectory: isDir
relativeToURL: baseURL]);
}
+ (id)fileURLWithPath:(NSString *)aPath relativeToURL:(NSURL *)baseURL
+ (id)fileURLWithPath: (NSString *)aPath relativeToURL: (NSURL *)baseURL
{
return AUTORELEASE([[NSURL alloc] initFileURLWithPath:aPath
relativeToURL:baseURL]);
return AUTORELEASE([[NSURL alloc] initFileURLWithPath: aPath
relativeToURL: baseURL]);
}
+ (id) fileURLWithPathComponents: (NSArray*)components
@ -642,21 +642,18 @@ static NSUInteger urlAlign;
- (id) initFileURLWithPath: (NSString *)aPath
{
/* isDirectory flag will be overwritten if a directory exists. */
self = [self initFileURLWithPath:aPath isDirectory:NO relativeToURL:nil];
return self;
return [self initFileURLWithPath: aPath isDirectory: NO relativeToURL: nil];
}
- (id) initFileURLWithPath: (NSString *)aPath isDirectory: (BOOL)isDir
{
self = [self initFileURLWithPath:aPath isDirectory:isDir relativeToURL:nil];
return self;
return [self initFileURLWithPath: aPath isDirectory: isDir relativeToURL: nil];
}
- (id) initFileURLWithPath: (NSString *)aPath relativeToURL: (NSURL *)baseURL
{
/* isDirectory flag will be overwritten if a directory exists. */
self = [self initFileURLWithPath:aPath isDirectory:NO relativeToURL:baseURL];
return self;
return [self initFileURLWithPath: aPath isDirectory: NO relativeToURL: baseURL];
}
- (id) initFileURLWithPath: (NSString *)aPath
@ -676,30 +673,29 @@ static NSUInteger urlAlign;
if ([aPath isAbsolutePath] == NO)
{
if (baseURL)
{
/* Append aPath to baseURL */
aPath = [[baseURL relativePath] stringByAppendingPathComponent:aPath];
}
{
/* Append aPath to baseURL */
aPath = [[baseURL relativePath] stringByAppendingPathComponent:aPath];
}
else
{
aPath =
[[mgr currentDirectoryPath] stringByAppendingPathComponent:aPath];
}
{
aPath =
[[mgr currentDirectoryPath] stringByAppendingPathComponent:aPath];
}
}
if ([mgr fileExistsAtPath:aPath isDirectory:&flag] == YES)
{
if ([aPath isAbsolutePath] == NO)
{
aPath = [aPath stringByStandardizingPath];
}
{
aPath = [aPath stringByStandardizingPath];
}
isDir = flag;
}
if (isDir == YES && [aPath hasSuffix:@"/"] == NO)
{
aPath = [aPath stringByAppendingString:@"/"];
}
self = [self initWithScheme:NSURLFileScheme host:@"" path:aPath];
return self;
return [self initWithScheme: NSURLFileScheme host: @"" path: aPath];
}
- (id) initWithScheme: (NSString*)aScheme