Skip to content

Fix build warnings from use of & to create a pointer to buffer. #445

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
Vkt0r merged 2 commits into from
Apr 11, 2020
Merged

Fix build warnings from use of & to create a pointer to buffer. #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d89ac4
Fix build warnings from use of & to create a pointer to `buffer`.
ken-broadsheet Apr 10, 2020
85f1262
Add to changelog.
ken-broadsheet Apr 10, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ All notable changes to this project will be documented in this file. Changes not
- Update `HttpParser` so it percent-encodes the URL components before initializing `URLComponents`. ([#423](https://github.com/httpswift/swifter/pull/423)) by [@nejcvivod](https://github.com/nejcvivod)
- Update `SwifterTestsHttpParser` with a test for parsing bracketed query strings. ([#423](https://github.com/httpswift/swifter/pull/423)) by [@nejcvivod](https://github.com/nejcvivod)
- Use `swift_version` CocoaPods DSL. ([#425](https://github.com/httpswift/swifter/pull/425)) by [@dnkoutso](https://github.com/dnkoutso)
- Fix compiler warnings in Socket+File.swift for iOS, tvOS, and Linux platforms by using `withUnsafeBytes` rather than `&` to get a scoped UnsafeRawPointer.

# [1.4.7]

Expand Down
14 changes: 9 additions & 5 deletions XCode/Sources/Socket+File.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ import Foundation
}
var writeCounter = 0
while writeCounter < readResult {
#if os(Linux)
let writeResult = send(target, &buffer + writeCounter, readResult - writeCounter, Int32(MSG_NOSIGNAL))
#else
let writeResult = write(target, &buffer + writeCounter, readResult - writeCounter)
#endif
let writeResult = buffer.withUnsafeBytes { (ptr) -> Int in
let start = ptr.baseAddress! + writeCounter
let len = readResult - writeCounter
#if os(Linux)
return send(target, start, len, Int32(MSG_NOSIGNAL))
#else
return write(target, start, len)
#endif
}
guard writeResult > 0 else {
return Int32(writeResult)
}
Expand Down