From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 20 Dec 2016 17:55:04 +0000 (+0000)
Subject: tests: rewrite ip_mreq.c without asserts
X-Git-Tag: v4.16~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f249e065a841338f2d69145549e28210fbd0fe22;p=strace

tests: rewrite ip_mreq.c without asserts

* tests/ip_mreq.c: Do not include <assert.h>.
(main): Do not use assert.  Use sprintrc instead of errno2name.
---

diff --git a/tests/ip_mreq.c b/tests/ip_mreq.c
index 86cd2bc3..5c6db3d9 100644
--- a/tests/ip_mreq.c
+++ b/tests/ip_mreq.c
@@ -31,7 +31,6 @@
 #if defined IP_ADD_MEMBERSHIP && defined IPV6_ADD_MEMBERSHIP \
  && defined IPV6_JOIN_ANYCAST && defined HAVE_IF_INDEXTONAME
 
-# include <assert.h>
 # include <stdio.h>
 # include <unistd.h>
 # include <sys/socket.h>
@@ -47,6 +46,7 @@ main(void)
 
 	struct ip_mreq m4;
 	struct ipv6_mreq m6;
+	int rc;
 
 	inet_pton(AF_INET, multi4addr, &m4.imr_multiaddr);
 	inet_pton(AF_INET, interface, &m4.imr_interface);
@@ -72,58 +72,58 @@ main(void)
 	       ", imr_interface=inet_addr(\"%s\")}, %u) = 0\n",
 	       multi4addr, interface, (unsigned) sizeof(m4));
 
-	assert(setsockopt(0, SOL_IP, IP_ADD_MEMBERSHIP, &m4, 1) == -1);
+	rc = setsockopt(0, SOL_IP, IP_ADD_MEMBERSHIP, &m4, 1);
 	printf("setsockopt(0, SOL_IP, IP_ADD_MEMBERSHIP, \"\\%hho\", 1)"
-	       " = -1 %s (%m)\n",
-	       * (unsigned char *) (void *) &m4, errno2name());
+	       " = %s\n",
+	       * (unsigned char *) (void *) &m4, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IP, IP_DROP_MEMBERSHIP, &m4, 1) == -1);
+	rc = setsockopt(0, SOL_IP, IP_DROP_MEMBERSHIP, &m4, 1);
 	printf("setsockopt(0, SOL_IP, IP_DROP_MEMBERSHIP, \"\\%hho\", 1)"
-	       " = -1 %s (%m)\n",
-	       * (unsigned char *) (void *) &m4, errno2name());
+	       " = %s\n",
+	       * (unsigned char *) (void *) &m4, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &m6, 1) == -1);
+	rc = setsockopt(0, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &m6, 1);
 	printf("setsockopt(0, SOL_IPV6, IPV6_ADD_MEMBERSHIP, \"\\%hho\", 1)"
-	       " = -1 %s (%m)\n",
-	       * (unsigned char *) (void *) &m6, errno2name());
-	assert(setsockopt(0, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &m6, 1) == -1);
+	       " = %s\n",
+	       * (unsigned char *) (void *) &m6, sprintrc(rc));
+	rc = setsockopt(0, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &m6, 1);
 	printf("setsockopt(0, SOL_IPV6, IPV6_DROP_MEMBERSHIP, \"\\%hho\", 1)"
-	       " = -1 %s (%m)\n",
-	       * (unsigned char *) (void *) &m6, errno2name());
+	       " = %s\n",
+	       * (unsigned char *) (void *) &m6, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &m6, sizeof(m6)) == -1);
+	rc = setsockopt(0, SOL_IPV6, IPV6_ADD_MEMBERSHIP, &m6, sizeof(m6));
 	printf("setsockopt(0, SOL_IPV6, IPV6_ADD_MEMBERSHIP"
 	       ", {ipv6mr_multiaddr=inet_pton(\"%s\")"
-	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = -1 %s (%m)\n",
-	       multi6addr, errno2name());
+	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = %s\n",
+	       multi6addr, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &m6, sizeof(m6)) == -1);
+	rc = setsockopt(0, SOL_IPV6, IPV6_DROP_MEMBERSHIP, &m6, sizeof(m6));
 	printf("setsockopt(0, SOL_IPV6, IPV6_DROP_MEMBERSHIP"
 	       ", {ipv6mr_multiaddr=inet_pton(\"%s\")"
-	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = -1 %s (%m)\n",
-	       multi6addr, errno2name());
+	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = %s\n",
+	       multi6addr, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IPV6, IPV6_JOIN_ANYCAST, &m6, 1) == -1);
+	rc = setsockopt(0, SOL_IPV6, IPV6_JOIN_ANYCAST, &m6, 1);
 	printf("setsockopt(0, SOL_IPV6, IPV6_JOIN_ANYCAST, \"\\%hho\", 1)"
-	       " = -1 %s (%m)\n",
-	       * (unsigned char *) (void *) &m6, errno2name());
+	       " = %s\n",
+	       * (unsigned char *) (void *) &m6, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IPV6, IPV6_LEAVE_ANYCAST, &m6, 1) == -1);
+	rc = setsockopt(0, SOL_IPV6, IPV6_LEAVE_ANYCAST, &m6, 1);
 	printf("setsockopt(0, SOL_IPV6, IPV6_LEAVE_ANYCAST, \"\\%hho\", 1)"
-	       " = -1 %s (%m)\n",
-	       * (unsigned char *) (void *) &m6, errno2name());
+	       " = %s\n",
+	       * (unsigned char *) (void *) &m6, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IPV6, IPV6_JOIN_ANYCAST, &m6, sizeof(m6)) == -1);
+	rc = setsockopt(0, SOL_IPV6, IPV6_JOIN_ANYCAST, &m6, sizeof(m6));
 	printf("setsockopt(0, SOL_IPV6, IPV6_JOIN_ANYCAST"
 	       ", {ipv6mr_multiaddr=inet_pton(\"%s\")"
-	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = -1 %s (%m)\n",
-	       multi6addr, errno2name());
+	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = %s\n",
+	       multi6addr, sprintrc(rc));
 
-	assert(setsockopt(0, SOL_IPV6, IPV6_LEAVE_ANYCAST, &m6, sizeof(m6)) == -1);
+	rc = setsockopt(0, SOL_IPV6, IPV6_LEAVE_ANYCAST, &m6, sizeof(m6));
 	printf("setsockopt(0, SOL_IPV6, IPV6_LEAVE_ANYCAST"
 	       ", {ipv6mr_multiaddr=inet_pton(\"%s\")"
-	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = -1 %s (%m)\n",
-	       multi6addr, errno2name());
+	       ", ipv6mr_interface=if_nametoindex(\"lo\")}, 20) = %s\n",
+	       multi6addr, sprintrc(rc));
 
 	puts("+++ exited with 0 +++");
 	return 0;