Make retryOnInterrupt always explicit internally

Author: milseman

Sources/System/FileOperations.swift

@@ -70,7 +70,7 @@ extension FileDescriptor {
     _ mode: FileDescriptor.AccessMode,
     options: FileDescriptor.OpenOptions,
     permissions: FilePermissions?,
-    retryOnInterrupt: Bool = true
+    retryOnInterrupt: Bool
   ) -> Result<FileDescriptor, Errno> {
     let oFlag = mode.rawValue | options.rawValue
     let descOrError: Result<CInt, Errno> = valueOrErrno(retryOnInterrupt: retryOnInterrupt) {
@@ -96,7 +96,7 @@ extension FileDescriptor {
 
   @usableFromInline
   internal func _close() -> Result<(), Errno> {
-    nothingOrErrno(system_close(self.rawValue))
+    nothingOrErrno(retryOnInterrupt: false) { system_close(self.rawValue) }
   }
 
   /// Reposition the offset for the given file descriptor.
@@ -120,8 +120,9 @@ extension FileDescriptor {
   internal func _seek(
     offset: Int64, from whence: FileDescriptor.SeekOrigin
   ) -> Result<Int64, Errno> {
-    let newOffset = system_lseek(self.rawValue, _COffT(offset), whence.rawValue)
-    return valueOrErrno(Int64(newOffset))
+    valueOrErrno(retryOnInterrupt: false) {
+      Int64(system_lseek(self.rawValue, _COffT(offset), whence.rawValue))
+    }
   }
 
 
@@ -163,7 +164,7 @@ extension FileDescriptor {
   @usableFromInline
   internal func _read(
     into buffer: UnsafeMutableRawBufferPointer,
-    retryOnInterrupt: Bool = true
+    retryOnInterrupt: Bool
   ) throws -> Result<Int, Errno> {
     valueOrErrno(retryOnInterrupt: retryOnInterrupt) {
       system_read(self.rawValue, buffer.baseAddress, buffer.count)

Sources/System/Util.swift

@@ -9,14 +9,14 @@
 
 // Results in errno if i == -1
 // @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
-internal func valueOrErrno<I: FixedWidthInteger>(
+private func valueOrErrno<I: FixedWidthInteger>(
   _ i: I
 ) -> Result<I, Errno> {
   i == -1 ? .failure(Errno.current) : .success(i)
 }
 
 // @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
-internal func nothingOrErrno<I: FixedWidthInteger>(
+private func nothingOrErrno<I: FixedWidthInteger>(
   _ i: I
 ) -> Result<(), Errno> {
   valueOrErrno(i).map { _ in () }
@@ -36,6 +36,13 @@ internal func valueOrErrno<I: FixedWidthInteger>(
   } while true
 }
 
+// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
+internal func nothingOrErrno<I: FixedWidthInteger>(
+  retryOnInterrupt: Bool, _ f: () -> I
+) -> Result<(), Errno> {
+  valueOrErrno(retryOnInterrupt: retryOnInterrupt, f).map { _ in () }
+}
+
 // Run a precondition for debug client builds
 internal func _debugPrecondition(
   _ condition: @autoclosure () -> Bool,