From f06461d208333e6367d5670f7718e8fa7b7e849e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 6 Dec 2019 09:43:42 -0500
Subject: [PATCH 1/3] Common/Network: Make StringToMacAddress use a string_view

This function only ever reads the contents of the string in a non-owning
manner, so we can change the parameter over to being a string view.
---
 Source/Core/Common/Network.cpp | 2 +-
 Source/Core/Common/Network.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp
index 77d835a126..1451440cc2 100644
--- a/Source/Core/Common/Network.cpp
+++ b/Source/Core/Common/Network.cpp
@@ -43,7 +43,7 @@ std::string MacAddressToString(const MACAddress& mac)
                      mac[4], mac[5]);
 }
 
-std::optional<MACAddress> StringToMacAddress(const std::string& mac_string)
+std::optional<MACAddress> StringToMacAddress(std::string_view mac_string)
 {
   if (mac_string.empty())
     return {};
diff --git a/Source/Core/Common/Network.h b/Source/Core/Common/Network.h
index 3f3c343fe8..18a2f887e9 100644
--- a/Source/Core/Common/Network.h
+++ b/Source/Core/Common/Network.h
@@ -7,6 +7,7 @@
 #include <array>
 #include <optional>
 #include <string>
+#include <string_view>
 
 #include "Common/CommonTypes.h"
 
@@ -27,5 +28,5 @@ using MACAddress = std::array<u8, MAC_ADDRESS_SIZE>;
 
 MACAddress GenerateMacAddress(MACConsumer type);
 std::string MacAddressToString(const MACAddress& mac);
-std::optional<MACAddress> StringToMacAddress(const std::string& mac_string);
+std::optional<MACAddress> StringToMacAddress(std::string_view mac_string);
 }  // namespace Common

From cbfacc41bab03f0171981a64fe90949bc2456d3e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 6 Dec 2019 09:51:25 -0500
Subject: [PATCH 2/3] Common/Network: Remove unused header inclusions

Removes unused header dependencies.
---
 Source/Core/Common/Network.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp
index 1451440cc2..4c56eea8e7 100644
--- a/Source/Core/Common/Network.cpp
+++ b/Source/Core/Common/Network.cpp
@@ -6,8 +6,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstring>
-#include <ctime>
 
 #include <fmt/format.h>
 

From 81edcca8db0bbbe9904956d7038bd1a2abdd9a87 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 6 Dec 2019 09:59:09 -0500
Subject: [PATCH 3/3] Common/Network: Use std::nullopt in StringToMacAddress

Prevents unnecessary zeroing out of std::optional's internal buffer in
some implementations.
---
 Source/Core/Common/Network.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp
index 4c56eea8e7..a928e8e831 100644
--- a/Source/Core/Common/Network.cpp
+++ b/Source/Core/Common/Network.cpp
@@ -44,7 +44,7 @@ std::string MacAddressToString(const MACAddress& mac)
 std::optional<MACAddress> StringToMacAddress(std::string_view mac_string)
 {
   if (mac_string.empty())
-    return {};
+    return std::nullopt;
 
   int x = 0;
   MACAddress mac{};
@@ -68,7 +68,7 @@ std::optional<MACAddress> StringToMacAddress(std::string_view mac_string)
   // nibble is a character in the MAC address, making 12 characters
   // in total.
   if (x / 2 != MAC_ADDRESS_SIZE)
-    return {};
+    return std::nullopt;
 
   return std::make_optional(mac);
 }