Clean up findalldevs code.

[libpcap] / pcap-win32.c

diff --git a/pcap-win32.c b/pcap-win32.c
index d998637e6baa58621b8d6db7b6ea6deb3230ebe7..b64c8a629fa20f83538d2c2b4c41e18af0ab78ac 100644 (file)
--- a/pcap-win32.c
+++ b/pcap-win32.c
@@ -1359,8 +1359,8 @@ pcap_add_if_win32(pcap_if_t **devlist, char *name, bpf_u_int32 flags,
        /*
         * Add an entry for this interface, with no addresses.
         */
-       if (add_or_find_if(&curdev, devlist, name, flags, description,
-           errbuf) == -1) {
+       curdev = add_dev(devlist, name, flags, description, errbuf);
+       if (curdev == NULL) {
                /*
                 * Failure.
                 */
@@ -1391,8 +1391,6 @@ pcap_add_if_win32(pcap_if_t **devlist, char *name, bpf_u_int32 flags,
                 * "curdev" is an entry for this interface; add an entry for
                 * this address to its list of addresses.
                 */
-               if(curdev == NULL)
-                       break;
                res = add_addr_to_dev(curdev,
                    (struct sockaddr *)&if_addrs[if_addr_size].IPAddress,
                    sizeof (struct sockaddr_storage),