From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 21 Jun 2016 16:44:15 +0000 (+0000)
Subject: net.c: use SO_LINGER unconditionally
X-Git-Tag: v4.13~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8ed94b53ace398836ebfb64381a7b0554d5f35f;p=strace

net.c: use SO_LINGER unconditionally

* net.c (print_linger, print_getsockopt, print_setsockopt): Do not check
for SO_LINGER availability.
---

diff --git a/net.c b/net.c
index ef42219f..8b2c3899 100644
--- a/net.c
+++ b/net.c
@@ -1164,7 +1164,6 @@ print_sockopt_fd_level_name(struct tcb *tcp, int fd, unsigned int level,
 	tprints(", ");
 }
 
-#ifdef SO_LINGER
 static void
 print_linger(struct tcb *tcp, long addr, int len)
 {
@@ -1180,7 +1179,6 @@ print_linger(struct tcb *tcp, long addr, int len)
 		linger.l_onoff,
 		linger.l_linger);
 }
-#endif /* SO_LINGER */
 
 #ifdef SO_PEERCRED
 static void
@@ -1247,11 +1245,9 @@ print_getsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
 	switch (level) {
 	case SOL_SOCKET:
 		switch (name) {
-#ifdef SO_LINGER
 		case SO_LINGER:
 			print_linger(tcp, addr, len);
 			goto done;
-#endif
 #ifdef SO_PEERCRED
 		case SO_PEERCRED:
 			print_ucred(tcp, addr, len);
@@ -1443,11 +1439,9 @@ print_setsockopt(struct tcb *tcp, unsigned int level, unsigned int name,
 	switch (level) {
 	case SOL_SOCKET:
 		switch (name) {
-#ifdef SO_LINGER
 		case SO_LINGER:
 			print_linger(tcp, addr, len);
 			goto done;
-#endif
 		}
 		break;