Skip to content

Commit bd4c6f3

Browse files
committed
Test FTP Server: Simplify imports
- Replace CFSwapInt16HostToBig(port) with port.bigEndian and Remove 'import CoreFoundation'. - Gate imports of Darwin and Glibc on canImport(). - Remove unnecessary imports.
1 parent e1071a9 commit bd4c6f3

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed

TestFoundation/FTPServer.swift

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,13 @@
1111
//This is a very rudimentary FTP server written plainly for testing URLSession FTP Implementation.
1212
import Dispatch
1313

14-
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
15-
import Foundation
14+
#if canImport(Glibc)
1615
import Glibc
17-
import XCTest
18-
#else
19-
import CoreFoundation
20-
import SwiftFoundation
16+
#elseif canImport(Darwin)
2117
import Darwin
22-
import SwiftXCTest
2318
#endif
2419

20+
2521
class _FTPSocket {
2622

2723
private var listenSocket: Int32!
@@ -88,10 +84,11 @@ class _FTPSocket {
8884
// Listen on the loopback address so that OSX doesnt pop up a dialog
8985
// asking to accept incoming connections if the firewall is enabled.
9086
let addr = UInt32(INADDR_LOOPBACK).bigEndian
87+
let netPort = port.bigEndian
9188
#if os(Linux)
92-
return sockaddr_in(sin_family: sa_family_t(AF_INET), sin_port: htons(port), sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
89+
return sockaddr_in(sin_family: sa_family_t(AF_INET), sin_port: netPort, sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
9390
#else
94-
return sockaddr_in(sin_len: 0, sin_family: sa_family_t(AF_INET), sin_port: CFSwapInt16HostToBig(port), sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
91+
return sockaddr_in(sin_len: 0, sin_family: sa_family_t(AF_INET), sin_port: netPort, sin_addr: in_addr(s_addr: addr), sin_zero: (0,0,0,0,0,0,0,0))
9592
#endif
9693
}
9794

TestFoundation/TestURLSessionFTP.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
//
99

1010
#if !os(Windows)
11-
#if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
12-
import Foundation
13-
import XCTest
14-
#else
15-
import SwiftFoundation
16-
import SwiftXCTest
17-
#endif
1811

1912
class TestURLSessionFTP : LoopbackFTPServerTest {
2013

0 commit comments

Comments
 (0)