From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 26 Jun 2016 23:56:59 +0000 (+0000)
Subject: Assume that libc provides struct msghdr.msg_control
X-Git-Tag: v4.13~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf0ef0852cc92ee2ae19aaf3557b7e685a3921d1;p=strace

Assume that libc provides struct msghdr.msg_control

* configure.ac (AC_CHECK_MEMBERS): Remove struct msghdr.msg_control.
* net.c (do_msghdr): Remove HAVE_STRUCT_MSGHDR_MSG_CONTROL check.
---

diff --git a/configure.ac b/configure.ac
index 9afda736..74288d83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,8 +344,6 @@ AC_CHECK_MEMBERS(m4_normalize([
 	struct stat.st_rdev
 ]))
 
-AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include <sys/socket.h>])
-
 AC_CHECK_MEMBERS([struct timex.tai],,, [#include <sys/timex.h>])
 
 AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include <sys/utsname.h>])
diff --git a/net.c b/net.c
index 613a1df9..113632cb 100644
--- a/net.c
+++ b/net.c
@@ -413,17 +413,12 @@ do_msghdr(struct tcb *tcp, struct msghdr *msg, unsigned long data_size)
 	tprint_iov_upto(tcp, (unsigned long)msg->msg_iovlen,
 			(unsigned long)msg->msg_iov, IOV_DECODE_STR, data_size);
 
-#ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
 	tprintf(", msg_controllen=%lu", (unsigned long)msg->msg_controllen);
 	if (msg->msg_controllen)
 		printcmsghdr(tcp, (unsigned long) msg->msg_control,
 			     msg->msg_controllen);
 	tprints(", msg_flags=");
 	printflags(msg_flags, msg->msg_flags, "MSG_???");
-#else /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
-	tprintf("msg_accrights=%#lx, msg_accrightslen=%u",
-		(unsigned long) msg->msg_accrights, msg->msg_accrightslen);
-#endif /* !HAVE_STRUCT_MSGHDR_MSG_CONTROL */
 	tprints("}");
 }