Skip to content

Commit ac33719

Browse files
karemanparkera
authored andcommitted
Update NSFileHandle API to match Darwin Foundation. (#420)
1 parent 59ca9dd commit ac33719

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Foundation/NSFileHandle.swift

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,25 +193,28 @@ extension FileHandle {
193193
internal static var _stdinFileHandle: FileHandle = {
194194
return FileHandle(fileDescriptor: STDIN_FILENO, closeOnDealloc: false)
195195
}()
196-
public class func fileHandleWithStandardInput() -> FileHandle {
196+
197+
public class func standardInput() -> FileHandle {
197198
return _stdinFileHandle
198199
}
199200

200201
internal static var _stdoutFileHandle: FileHandle = {
201202
return FileHandle(fileDescriptor: STDOUT_FILENO, closeOnDealloc: false)
202203
}()
203-
public class func fileHandleWithStandardOutput() -> FileHandle {
204+
205+
public class func standardOutput() -> FileHandle {
204206
return _stdoutFileHandle
205207
}
206208

207209
internal static var _stderrFileHandle: FileHandle = {
208210
return FileHandle(fileDescriptor: STDERR_FILENO, closeOnDealloc: false)
209211
}()
210-
public class func fileHandleWithStandardError() -> FileHandle {
212+
213+
public class func standardError() -> FileHandle {
211214
return _stderrFileHandle
212215
}
213216

214-
public class func fileHandleWithNullDevice() -> FileHandle {
217+
public class func nullDevice() -> FileHandle {
215218
NSUnimplemented()
216219
}
217220

@@ -239,17 +242,17 @@ extension FileHandle {
239242
}
240243
}
241244

242-
public convenience init(forReadingFromURL url: URL) throws {
245+
public convenience init(forReadingFrom url: URL) throws {
243246
let fd = try FileHandle._openFileDescriptorForURL(url, flags: O_RDONLY, reading: true)
244247
self.init(fileDescriptor: fd, closeOnDealloc: true)
245248
}
246249

247-
public convenience init(forWritingToURL url: URL) throws {
250+
public convenience init(forWritingTo url: URL) throws {
248251
let fd = try FileHandle._openFileDescriptorForURL(url, flags: O_WRONLY, reading: false)
249252
self.init(fileDescriptor: fd, closeOnDealloc: true)
250253
}
251254

252-
public convenience init(forUpdatingURL url: URL) throws {
255+
public convenience init(forUpdating url: URL) throws {
253256
let fd = try FileHandle._openFileDescriptorForURL(url, flags: O_RDWR, reading: false)
254257
self.init(fileDescriptor: fd, closeOnDealloc: true)
255258
}

0 commit comments

Comments
 (0)