Skip to content

Android: FILE is an opaque struct since API 24 #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2021
Merged

Android: FILE is an opaque struct since API 24 #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions Sources/NIOSSL/PosixPort.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@
// can lift anything missing from there and move it over without change.
import NIO

private let sysFopen: @convention(c) (UnsafePointer<CChar>?, UnsafePointer<CChar>?) -> UnsafeMutablePointer<FILE>? = fopen
#if os(Android)
internal typealias FILEPointer = OpaquePointer
#else
internal typealias FILEPointer = UnsafeMutablePointer<FILE>
#endif

private let sysFopen: @convention(c) (UnsafePointer<CChar>?, UnsafePointer<CChar>?) -> FILEPointer? = fopen
private let sysMlock: @convention(c) (UnsafeRawPointer?, size_t) -> CInt = mlock
private let sysMunlock: @convention(c) (UnsafeRawPointer?, size_t) -> CInt = munlock
private let sysFclose: @convention(c) (UnsafeMutablePointer<FILE>?) -> CInt = fclose
private let sysFclose: @convention(c) (FILEPointer?) -> CInt = fclose

// Sadly, stat has different signatures with glibc and macOS libc.
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(Android)
Expand Down Expand Up @@ -81,14 +87,14 @@ internal func wrapErrorIsNullReturnCall<T>(where function: String = #function, _
// MARK:- Our functions
internal enum Posix {
@inline(never)
internal static func fopen(file: UnsafePointer<CChar>, mode: UnsafePointer<CChar>) throws -> UnsafeMutablePointer<FILE> {
internal static func fopen(file: UnsafePointer<CChar>, mode: UnsafePointer<CChar>) throws -> FILEPointer {
return try wrapErrorIsNullReturnCall {
sysFopen(file, mode)
}
}

@inline(never)
internal static func fclose(file: UnsafeMutablePointer<FILE>) throws -> CInt {
internal static func fclose(file: FILEPointer) throws -> CInt {
return try wrapSyscall {
sysFclose(file)
}
Expand Down