瀏覽代碼

network: narrow down scope of "result" in win32 code for
GetAvailableNetworkInterfaces

Sönke Holz 5 年之前
父節點
當前提交
8513e59431
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      src/core/network/network_interface.cpp

+ 5 - 4
src/core/network/network_interface.cpp

@@ -22,8 +22,6 @@ namespace Network {
 #ifdef _WIN32
 #ifdef _WIN32
 
 
 std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
 std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
-    std::vector<NetworkInterface> result;
-
     std::vector<u8> adapter_addresses_raw;
     std::vector<u8> adapter_addresses_raw;
     auto adapter_addresses = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_addresses_raw.data());
     auto adapter_addresses = reinterpret_cast<PIP_ADAPTER_ADDRESSES>(adapter_addresses_raw.data());
     DWORD ret = ERROR_BUFFER_OVERFLOW;
     DWORD ret = ERROR_BUFFER_OVERFLOW;
@@ -44,6 +42,8 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
     }
     }
 
 
     if (ret == NO_ERROR) {
     if (ret == NO_ERROR) {
+        std::vector<NetworkInterface> result;
+
         for (auto current_address = adapter_addresses; current_address != nullptr;
         for (auto current_address = adapter_addresses; current_address != nullptr;
              current_address = current_address->Next) {
              current_address = current_address->Next) {
             if (current_address->FirstUnicastAddress == nullptr ||
             if (current_address->FirstUnicastAddress == nullptr ||
@@ -63,11 +63,12 @@ std::vector<NetworkInterface> GetAvailableNetworkInterfaces() {
                 .name{Common::UTF16ToUTF8(std::wstring{current_address->FriendlyName})},
                 .name{Common::UTF16ToUTF8(std::wstring{current_address->FriendlyName})},
                 .ip_address{ip_addr}});
                 .ip_address{ip_addr}});
         }
         }
+
+        return result;
     } else {
     } else {
         LOG_ERROR(Network, "Failed to get network interfaces with GetAdaptersAddresses");
         LOG_ERROR(Network, "Failed to get network interfaces with GetAdaptersAddresses");
+        return {};
     }
     }
-
-    return result;
 }
 }
 
 
 #else
 #else