Merge pull request #830 from swiftlang/android/6pick

compnerd · web-flow · commit 7efdd76924ca · 2024-11-19T17:36:23.000-08:00
[release/6.0] Testing: add some force unwraps for Android
diff --git a/Sources/Testing/Support/FileHandle.swift b/Sources/Testing/Support/FileHandle.swift
@@ -257,7 +257,7 @@ extension FileHandle {
     try withUnsafeCFILEHandle { file in
       try withUnsafeTemporaryAllocation(byteCount: 1024, alignment: 1) { buffer in
         repeat {
-          let countRead = fread(buffer.baseAddress, 1, buffer.count, file)
+          let countRead = fread(buffer.baseAddress!, 1, buffer.count, file)
           if 0 != ferror(file) {
             throw CError(rawValue: swt_errno())
           }
@@ -295,7 +295,7 @@ extension FileHandle {
         }
       }
 
-      let countWritten = fwrite(bytes.baseAddress, MemoryLayout<UInt8>.stride, bytes.count, file)
+      let countWritten = fwrite(bytes.baseAddress!, MemoryLayout<UInt8>.stride, bytes.count, file)
       if countWritten < bytes.count {
         throw CError(rawValue: swt_errno())
       }

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ extension FileHandle {`
`257`	`257`	`try withUnsafeCFILEHandle { file in`
`258`	`258`	`try withUnsafeTemporaryAllocation(byteCount: 1024, alignment: 1) { buffer in`
`259`	`259`	`repeat {`
`260`		`- let countRead = fread(buffer.baseAddress, 1, buffer.count, file)`
	`260`	`+ let countRead = fread(buffer.baseAddress!, 1, buffer.count, file)`
`261`	`261`	`if 0 != ferror(file) {`
`262`	`262`	`throw CError(rawValue: swt_errno())`
`263`	`263`	`}`
`@@ -295,7 +295,7 @@ extension FileHandle {`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`298`		`- let countWritten = fwrite(bytes.baseAddress, MemoryLayout<UInt8>.stride, bytes.count, file)`
	`298`	`+ let countWritten = fwrite(bytes.baseAddress!, MemoryLayout<UInt8>.stride, bytes.count, file)`
`299`	`299`	`if countWritten < bytes.count {`
`300`	`300`	`throw CError(rawValue: swt_errno())`
`301`	`301`	`}`