diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2021-12-10 15:14:44 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-01-09 08:00:00 +0000 |
| commit | 3675eebdd507bc6c1316f6eb5f192ebbb85dc6b9 (patch) | |
| tree | debb22f84f7f3dd1a196461aae89476a80cb900f | |
| parent | 5fba350406ffd9979c5a122bdad94e8c90dfeec6 (diff) | |
| download | strace-3675eebdd507bc6c1316f6eb5f192ebbb85dc6b9.tar.gz | |
Remove MCAST_JOIN_GROUP #ifdef guards
These are long defined (before Linux 2.6.12 and since glibc-2.3.4~748),
so there seems to be no need to conditionalise on them.
* src/net.c [!MCAST_JOIN_GROUP]: Enable case MCAST_JOIN_GROUP
and case MCAST_LEAVE_GROUP.
* src/print_group_req.c [!MCAST_JOIN_GROUP]: Enable
DEF_MPERS_TYPE(struct_group_req) include, struct_group_req typedef,
and print_group_req function.
Complements: v5.15~141 "xlat: add fallback values to sock_ip_options"
Complements: v5.15~140 "xlat: add fallback values to sock_ipv6_options"
| -rw-r--r-- | src/net.c | 4 | ||||
| -rw-r--r-- | src/print_group_req.c | 8 |
2 files changed, 0 insertions, 12 deletions
@@ -1046,12 +1046,10 @@ print_setsockopt(struct tcb *const tcp, const unsigned int level, case IP_DROP_MEMBERSHIP: print_mreq(tcp, addr, len); return; -#ifdef MCAST_JOIN_GROUP case MCAST_JOIN_GROUP: case MCAST_LEAVE_GROUP: print_group_req(tcp, addr, len); return; -#endif /* MCAST_JOIN_GROUP */ } break; @@ -1069,12 +1067,10 @@ print_setsockopt(struct tcb *const tcp, const unsigned int level, print_mreq6(tcp, addr, len); return; #endif /* IPV6_ADD_MEMBERSHIP */ -#ifdef MCAST_JOIN_GROUP case MCAST_JOIN_GROUP: case MCAST_LEAVE_GROUP: print_group_req(tcp, addr, len); return; -#endif /* MCAST_JOIN_GROUP */ } break; diff --git a/src/print_group_req.c b/src/print_group_req.c index b9c422b13..0ed746d8e 100644 --- a/src/print_group_req.c +++ b/src/print_group_req.c @@ -8,17 +8,11 @@ #include "defs.h" #include <netinet/in.h> -#ifdef MCAST_JOIN_GROUP - # include DEF_MPERS_TYPE(struct_group_req) typedef struct group_req struct_group_req; -#endif /* MCAST_JOIN_GROUP */ - #include MPERS_DEFS -#ifdef MCAST_JOIN_GROUP - MPERS_PRINTER_DECL(void, print_group_req, struct tcb *const tcp, const kernel_ulong_t addr, const int len) { @@ -34,5 +28,3 @@ MPERS_PRINTER_DECL(void, print_group_req, struct tcb *const tcp, tprint_struct_end(); } } - -#endif /* MCAST_JOIN_GROUP */ |