summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2013-11-12 15:39:09 +0000
committerDmitry V. Levin <ldv@altlinux.org>2013-11-12 15:39:09 +0000
commit70e84c4e251829d3ccb954637209a9dd47dd37a0 (patch)
tree8670411a531806531d43150139a64e63f7d31242
parente2de3bdd121f8decb8c33c0e1ecc0520f7827bd3 (diff)
downloadstrace-70e84c4e251829d3ccb954637209a9dd47dd37a0.tar.gz
strace-70e84c4e251829d3ccb954637209a9dd47dd37a0.tar.bz2
strace-70e84c4e251829d3ccb954637209a9dd47dd37a0.tar.xz
Remove unused code
* configure.ac (AC_CHECK_TYPES): Remove struct opthdr and struct t_opthdr. * net.c (print_sock_optmgmt): Remove.
-rw-r--r--configure.ac2
-rw-r--r--net.c35
2 files changed, 0 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac
index 96e72ca..6467a00 100644
--- 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 9ae783a..652b9af 100644
--- 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)
{