Remove unused code

* configure.ac (AC_CHECK_TYPES): Remove struct opthdr and
struct t_opthdr.
* net.c (print_sock_optmgmt): Remove.

diff --git a/configure.ac b/configure.ac
index 96e72ca0a1945a97bbb0a69c3e59fed0d74ae5ae..6467a009f442955df05b7f32713d007de769124b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -195,8 +195,6 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
 #include <netinet/in.h>])
 AC_LITTLE_ENDIAN_LONG_LONG
 AC_OFF_T_IS_LONG_LONG
-AC_CHECK_TYPES([struct opthdr],,, [#include <sys/socket.h>])
-AC_CHECK_TYPES([struct t_opthdr],,, [#include <sys/tiuser.h>])
 
 AC_CHECK_FUNCS(m4_normalize([
        fork

diff --git a/net.c b/net.c
index 9ae783a9345b518c296db0f2faba1ed42efd03d8..652b9afb351431fd6bc0d25a945cfc868a5ef6d8 100644 (file)
--- a/net.c
+++ b/net.c
@@ -2287,41 +2287,6 @@ printsockopt(struct tcb *tcp, int level, int name, long addr, int len)
        return 0;
 }
 
-#ifdef HAVE_STRUCT_OPTHDR
-
-void
-print_sock_optmgmt(struct tcb *tcp, long addr, int len)
-{
-       int c = 0;
-       struct opthdr hdr;
-
-       while (len >= (int) sizeof hdr) {
-               if (umove(tcp, addr, &hdr) < 0) break;
-               if (c++) {
-                       tprints(", ");
-               }
-               else if (len > hdr.len + sizeof hdr) {
-                       tprints("[");
-               }
-               tprints("{");
-               addr += sizeof hdr;
-               len -= sizeof hdr;
-               printsockopt(tcp, hdr.level, hdr.name, addr, hdr.len);
-               if (hdr.len > 0) {
-                       addr += hdr.len;
-                       len -= hdr.len;
-               }
-               tprints("}");
-       }
-       if (len > 0) {
-               if (c++) tprints(", ");
-               printstr(tcp, addr, len);
-       }
-       if (c > 1) tprints("]");
-}
-
-#endif
-
 int
 sys_setsockopt(struct tcb *tcp)
 {