Skip to content

Android: update Bionic declarations for nullability annotations added in NDK 26 #449

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
Nov 27, 2023
Merged

Android: update Bionic declarations for nullability annotations added in NDK 26 #449

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions Sources/NIOSSL/PosixPort.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,24 @@ internal typealias FILEPointer = OpaquePointer
internal typealias FILEPointer = UnsafeMutablePointer<FILE>
#endif

#if os(Android)
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
#else
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
#endif
private let sysFclose: @convention(c) (FILEPointer?) -> CInt = { fclose($0!) }

// Sadly, stat, lstat, and readlink have different signatures with glibc and macOS libc.
#if canImport(Darwin) || os(Android)
#if canImport(Darwin)
private let sysStat: @convention(c) (UnsafePointer<CChar>?, UnsafeMutablePointer<stat>?) -> CInt = stat(_:_:)
private let sysReadlink: @convention(c) (UnsafePointer<Int8>?, UnsafeMutablePointer<Int8>?, Int) -> Int = readlink
private let sysLstat: @convention(c) (UnsafePointer<Int8>?, UnsafeMutablePointer<stat>?) -> Int32 = lstat

#elseif os(Linux) || os(FreeBSD)
#elseif os(Linux) || os(FreeBSD) || os(Android)
private let sysStat: @convention(c) (UnsafePointer<CChar>, UnsafeMutablePointer<stat>) -> CInt = stat(_:_:)
private let sysReadlink: @convention(c) (UnsafePointer<Int8>, UnsafeMutablePointer<Int8>, Int) -> Int = readlink
private let sysLstat: @convention(c) (UnsafePointer<Int8>, UnsafeMutablePointer<stat>) -> Int32 = lstat
Expand Down
2 changes: 1 addition & 1 deletion Sources/NIOSSL/SSLContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ internal class DirectoryContents: Sequence, IteratorProtocol {

init(path: String) {
self.path = path
self.dir = opendir(path)
self.dir = opendir(path)!
}

func next() -> String? {
Expand Down