diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:07:48 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:07:48 +0000 |
commit | cd0f78cc701c582469fe6adabd95b8efb7b36fee (patch) | |
tree | ac2c1f74fc9f119d7b39c2bd501643c2e8596aeb | |
parent | 18ba45970aca2628ecd9a3ce54f61fa8bb80f38b (diff) | |
parent | 357f7d42d2fc961ee166622c3a383ebeff70e88d (diff) | |
download | strace-cd0f78cc701c582469fe6adabd95b8efb7b36fee.tar.gz |
Snap for 8570526 from 357f7d42d2fc961ee166622c3a383ebeff70e88d to mainline-media-swcodec-releaseaml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-release
Change-Id: I5c13839091ab2ce372f3254522aa213417d0b6f8
-rw-r--r-- | config.h | 4 | ||||
-rw-r--r-- | net.c | 2 | ||||
-rw-r--r-- | sockaddr.c | 20 |
3 files changed, 3 insertions, 23 deletions
@@ -978,7 +978,9 @@ #define HAVE_SIG_ATOMIC_T 1 /* Define to 1 if the system provides static_assert */ -/* #undef HAVE_STATIC_ASSERT */ +#if __STDC_VERSION__ >= 201112L +#define HAVE_STATIC_ASSERT 1 +#endif /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -51,8 +51,6 @@ #include <asm/types.h> #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> -#else -# include <linux/ipx.h> #endif #if defined(HAVE_LINUX_IP_VS_H) @@ -47,8 +47,6 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> -#else -# include <linux/ipx.h> #endif #include "xlat/addrfams.h" @@ -349,23 +347,6 @@ digis_end: tprints(", ..."); } -static void -print_sockaddr_data_ipx(const void *const buf, const int addrlen) -{ - const struct sockaddr_ipx *const sa_ipx = buf; - unsigned int i; - - PRINT_FIELD_NET_PORT("", *sa_ipx, sipx_port); - tprintf(", sipx_network=htonl(%#08x)" - ", sipx_node=[", - ntohl(sa_ipx->sipx_network)); - for (i = 0; i < IPX_NODE_LEN; ++i) { - tprintf("%s%#02x", i ? ", " : "", - sa_ipx->sipx_node[i]); - } - PRINT_FIELD_0X("], ", *sa_ipx, sipx_type); -} - void print_x25_addr(const void /* struct x25_address */ *addr_void) { @@ -605,7 +586,6 @@ static const struct { [AF_UNIX] = { print_sockaddr_data_un, SIZEOF_SA_FAMILY + 1 }, [AF_INET] = { print_sockaddr_data_in, sizeof(struct sockaddr_in) }, [AF_AX25] = { print_sockaddr_data_ax25, sizeof(struct sockaddr_ax25) }, - [AF_IPX] = { print_sockaddr_data_ipx, sizeof(struct sockaddr_ipx) }, [AF_X25] = { print_sockaddr_data_x25, sizeof(struct sockaddr_x25) }, [AF_INET6] = { print_sockaddr_data_in6, SIN6_MIN_LEN }, [AF_NETLINK] = { print_sockaddr_data_nl, SIZEOF_SA_FAMILY + 1 }, |