s3: libsmb: namequery.c: Remove unused remove_duplicate_addrs2().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index d131976377e7ef034de9a0c7a6a6386d3fb144f6..a7d68fcedcb87510b0e0ac8b71b8055c17966ff9 100644 (file)
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1229,61 +1229,6 @@ static void sort_sa_list(struct samba_sockaddr *salist, size_t count)
        TYPESAFE_QSORT(salist, count, samba_sockaddr_compare);
 }
 
-#if 0
-/**********************************************************************
- Remove any duplicate address/port pairs in the list
- *********************************************************************/
-
-size_t remove_duplicate_addrs2(struct ip_service *iplist, size_t count )
-{
-       size_t i, j;
-
-       DEBUG(10,("remove_duplicate_addrs2: "
-                       "looking for duplicate address/port pairs\n"));
-
-       /* One loop to set duplicates to a zero addr. */
-       for ( i=0; i<count; i++ ) {
-               bool ok;
-               struct samba_sockaddr sa_i = {0};
-
-               ok = sockaddr_storage_to_samba_sockaddr(&sa_i, &iplist[i].ss);
-               if (!ok) {
-                       continue;
-               }
-
-               if (is_zero_addr(&sa_i.u.ss)) {
-                       continue;
-               }
-
-               for ( j=i+1; j<count; j++ ) {
-                       struct samba_sockaddr sa_j = {0};
-
-                       ok = sockaddr_storage_to_samba_sockaddr(&sa_j,
-                                                       &iplist[j].ss);
-                       if (!ok) {
-                               continue;
-                       }
-
-                       if (sockaddr_equal(&sa_i.u.sa, &sa_j.u.sa) &&
-                                       iplist[i].port == iplist[j].port) {
-                               zero_sockaddr(&iplist[j].ss);
-                       }
-               }
-       }
-
-       /* Now remove any addresses set to zero above. */
-       for (i = 0; i < count; i++) {
-               while (i < count &&
-                               is_zero_addr(&iplist[i].ss)) {
-                       ARRAY_DEL_ELEMENT(iplist, i, count);
-                       count--;
-               }
-       }
-
-       return count;
-}
-#endif
-
 /**********************************************************************
  Remove any duplicate address/port pairs in the samba_sockaddr array.
  *********************************************************************/

diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
index ef717738ac690c51e6076b7e05bc22adeefde5e4..e023b441fd8cf2d2b8ede1070001b89073d2b6cf 100644 (file)
--- a/source3/libsmb/namequery.h
+++ b/source3/libsmb/namequery.h
@@ -47,7 +47,6 @@ bool name_status_find(const char *q_name,
                        int type,
                        const struct sockaddr_storage *to_ss,
                        fstring name);
-size_t remove_duplicate_addrs2(struct ip_service *iplist, size_t count );
 size_t remove_duplicate_addrs2_sa(struct samba_sockaddr *salist, size_t count);
 struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
                                   struct tevent_context *ev,