Просмотр исходного кода

network_interface: Replace default return value with std::nullopt

Morph 4 лет назад
Родитель
Сommit
a32a7dacf4
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      src/core/network/network_interface.cpp

+ 6 - 6
src/core/network/network_interface.cpp

@@ -180,11 +180,11 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
 #endif
 #endif
 
 
 std::optional<NetworkInterface> GetSelectedNetworkInterface() {
 std::optional<NetworkInterface> GetSelectedNetworkInterface() {
-    const std::string& selected_network_interface = Settings::values.network_interface.GetValue();
+    const auto& selected_network_interface = Settings::values.network_interface.GetValue();
     const auto network_interfaces = Network::GetAvailableNetworkInterfaces();
     const auto network_interfaces = Network::GetAvailableNetworkInterfaces();
     if (network_interfaces.size() == 0) {
     if (network_interfaces.size() == 0) {
         LOG_ERROR(Network, "GetAvailableNetworkInterfaces returned no interfaces");
         LOG_ERROR(Network, "GetAvailableNetworkInterfaces returned no interfaces");
-        return {};
+        return std::nullopt;
     }
     }
 
 
     const auto res =
     const auto res =
@@ -192,12 +192,12 @@ std::optional<NetworkInterface> GetSelectedNetworkInterface() {
             return iface.name == selected_network_interface;
             return iface.name == selected_network_interface;
         });
         });
 
 
-    if (res != network_interfaces.end()) {
-        return *res;
-    } else {
+    if (res == network_interfaces.end()) {
         LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", selected_network_interface);
         LOG_ERROR(Network, "Couldn't find selected interface \"{}\"", selected_network_interface);
-        return {};
+        return std::nullopt;
     }
     }
+
+    return *res;
 }
 }
 
 
 } // namespace Network
 } // namespace Network