From 955de09c9e0e318642089fe63c4c1d44517e3ff8 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 3 Nov 2018 19:35:25 +0100
Subject: Global: run through swiftlint

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 WireGuard/WireGuard/VPN/DNSResolver.swift                |  4 ++--
 .../WireGuard/VPN/PacketTunnelOptionsGenerator.swift     |  4 ++--
 WireGuard/WireGuard/VPN/TunnelsManager.swift             | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'WireGuard/WireGuard/VPN')

diff --git a/WireGuard/WireGuard/VPN/DNSResolver.swift b/WireGuard/WireGuard/VPN/DNSResolver.swift
index 4ceabdc..e750454 100644
--- a/WireGuard/WireGuard/VPN/DNSResolver.swift
+++ b/WireGuard/WireGuard/VPN/DNSResolver.swift
@@ -109,8 +109,8 @@ extension DNSResolver {
                 // getaddrinfo succeeded
                 let ipv4Buffer = UnsafeMutablePointer<Int8>.allocate(capacity: Int(INET_ADDRSTRLEN))
                 let ipv6Buffer = UnsafeMutablePointer<Int8>.allocate(capacity: Int(INET6_ADDRSTRLEN))
-                var ipv4AddressString: String? = nil
-                var ipv6AddressString: String? = nil
+                var ipv4AddressString: String?
+                var ipv6AddressString: String?
                 while (resultPointer != nil) {
                     let result = resultPointer!.pointee
                     resultPointer = result.ai_next
diff --git a/WireGuard/WireGuard/VPN/PacketTunnelOptionsGenerator.swift b/WireGuard/WireGuard/VPN/PacketTunnelOptionsGenerator.swift
index 9b9ae0a..35d4bb7 100644
--- a/WireGuard/WireGuard/VPN/PacketTunnelOptionsGenerator.swift
+++ b/WireGuard/WireGuard/VPN/PacketTunnelOptionsGenerator.swift
@@ -6,8 +6,8 @@ import Network
 
 class PacketTunnelOptionsGenerator {
     static func generateOptions(from tc: TunnelConfiguration,
-                                withResolvedEndpoints resolvedEndpoints: [Endpoint?]) -> [String:NSObject] {
-        var options: [String:NSObject] = [:]
+                                withResolvedEndpoints resolvedEndpoints: [Endpoint?]) -> [String: NSObject] {
+        var options: [String: NSObject] = [:]
 
         // Interface name
 
diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 39328a6..2ea3377 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -32,7 +32,7 @@ enum TunnelManagementError: Error {
 class TunnelsManager {
 
     private var tunnels: [TunnelContainer]
-    weak var delegate: TunnelsManagerDelegate? = nil
+    weak var delegate: TunnelsManagerDelegate?
 
     private var isAddingTunnel: Bool = false
     private var isModifyingTunnel: Bool = false
@@ -58,7 +58,7 @@ class TunnelsManager {
             completionHandler(nil, TunnelManagementError.tunnelAlreadyExistsWithThatName)
             return
         }
-        
+
         if self.tunnels.contains(where: { $0.name == tunnelName }) {
             completionHandler(nil, TunnelManagementError.tunnelAlreadyExistsWithThatName)
             return
@@ -97,7 +97,7 @@ class TunnelsManager {
             return
         }
         let tail = tunnelConfigurations.dropFirst()
-        self.add(tunnelConfiguration: head) { [weak self, tail] (tunnel, error) in
+        self.add(tunnelConfiguration: head) { [weak self, tail] (_, error) in
             DispatchQueue.main.async {
                 self?.addMultiple(tunnelConfigurations: tail, numberSuccessful: numberSuccessful + (error == nil ? 1 : 0), completionHandler: completionHandler)
             }
@@ -115,7 +115,7 @@ class TunnelsManager {
 
         let tunnelProviderManager = tunnel.tunnelProvider
         let isNameChanged = (tunnelName != tunnelProviderManager.localizedDescription)
-        var oldName: String? = nil
+        var oldName: String?
         if (isNameChanged) {
             if self.tunnels.contains(where: { $0.name == tunnelName }) {
                 completionHandler(TunnelManagementError.tunnelAlreadyExistsWithThatName)
@@ -238,7 +238,7 @@ class TunnelContainer: NSObject {
     fileprivate let tunnelProvider: NETunnelProviderManager
     private var statusObservationToken: AnyObject?
 
-    private var dnsResolver: DNSResolver? = nil
+    private var dnsResolver: DNSResolver?
 
     init(tunnel: NETunnelProviderManager) {
         self.name = tunnel.localizedDescription ?? "Unnamed"
@@ -314,9 +314,9 @@ class TunnelContainer: NSObject {
         assert(resolvedEndpoints.allSatisfy { (resolvedEndpoint) in
             guard let resolvedEndpoint = resolvedEndpoint else { return true }
             switch (resolvedEndpoint.host) {
-            case .ipv4(_): return true
-            case .ipv6(_): return true
-            case .name(_, _): return false
+            case .ipv4: return true
+            case .ipv6: return true
+            case .name: return false
             }
         })
 
-- 
cgit v1.2.3-59-g8ed1b