From d7f91f28889bb343f050efd6f70700ece0449afc Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 13 Dec 2018 19:02:48 +0100
Subject: [PATCH] Simplify C strings

---
 WireGuard/Shared/Logging/Logger.swift | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/WireGuard/Shared/Logging/Logger.swift b/WireGuard/Shared/Logging/Logger.swift
index f8ef70a..b8dbdfd 100644
--- a/WireGuard/Shared/Logging/Logger.swift
+++ b/WireGuard/Shared/Logging/Logger.swift
@@ -12,9 +12,7 @@ public class Logger {
 
     init(withFilePath filePath: String, withTag tag: String) {
         self.tag = tag
-        self.log = filePath.withCString { fileC -> OpaquePointer? in
-            open_log(fileC)
-        }
+        self.log = open_log(filePath)
         if self.log == nil {
             os_log("Cannot open log file for writing. Log will not be saved to file.", log: OSLog.default, type: .error)
         }
@@ -22,20 +20,15 @@ public class Logger {
 
     func log(message: String) {
         guard let log = log else { return }
-        String(format: "[%@] %@", tag, message.trimmingCharacters(in: .newlines)).withCString { messageC in
-            write_msg_to_log(log, messageC)
-        }
+        write_msg_to_log(log, String(format: "[%@] %@", tag, message.trimmingCharacters(in: .newlines)))
     }
 
     func writeLog(mergedWith otherLogFile: String, to targetFile: String) -> Bool {
         guard let log = log else { return false }
-        guard let other = otherLogFile.withCString({ otherC -> OpaquePointer? in
-            return open_log(otherC)
-        }) else { return false }
-        defer { close_log(other) }
-        return targetFile.withCString { fileC -> Bool in
-            return write_logs_to_file(fileC, log, other) == 0
-        }
+        guard let other = open_log(otherLogFile) else { return false }
+        let ret = write_logs_to_file(targetFile, log, other)
+        close_log(other)
+        return ret == 0
     }
 
     static func configureGlobal(withFilePath filePath: String?, withTag tag: String) {