From 2fb9d6af71923d9d5641b1a0708d003b6c472268 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Sat, 16 Feb 2019 00:26:49 +0530 Subject: ConfTextStorage: Make fieldType an enum Signed-off-by: Roopesh Chander --- .../WireGuard/UI/macOS/View/ConfTextStorage.swift | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'WireGuard/WireGuard/UI/macOS') diff --git a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift index 47c05b1..48a32ed 100644 --- a/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift +++ b/WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift @@ -92,7 +92,11 @@ class ConfTextStorage: NSTextStorage { func evaluateExcludePrivateIPs(highlightSpans: UnsafePointer) { var spans = highlightSpans - var fieldType = 0 + enum FieldType: String { + case dns + case allowedips + } + var fieldType: FieldType? resetLastPeer() while spans.pointee.type != HighlightEnd { let span = spans.pointee @@ -111,19 +115,12 @@ class ConfTextStorage: NSTextStorage { hasOnePeer = true } } else if span.type == HighlightField { - let field = substring.lowercased() - if field == "dns" { - fieldType = 1 - } else if field == "allowedips" { - fieldType = 2 - } else { - fieldType = 0 - } - } else if span.type == HighlightIP && fieldType == 1 { + fieldType = FieldType(rawValue: substring.lowercased()) + } else if span.type == HighlightIP && fieldType == .dns { if let parsed = DNSServer(from: substring) { lastOnePeerDNSServers.append(parsed) } - } else if span.type == HighlightIP && fieldType == 2 { + } else if span.type == HighlightIP && fieldType == .allowedips { let next = spans.successor() let nextnext = next.successor() if next.pointee.type == HighlightDelimiter && nextnext.pointee.type == HighlightCidr { -- cgit v1.2.3-59-g8ed1b