]> granicus.if.org Git - strace/commitdiff
net.c: use AF_IPX unconditionally
authorDmitry V. Levin <ldv@altlinux.org>
Sun, 19 Jun 2016 22:02:45 +0000 (22:02 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sun, 19 Jun 2016 22:02:45 +0000 (22:02 +0000)
* net.c (sockaddr_buf_t, print_sockaddr, SYS_FUNC(socket)): Do not check
for AF_IPX availability.

net.c

diff --git a/net.c b/net.c
index 1a6c265f692bdd2489a1906d9f009691816627e7..8b43444d273b076a89d1218033fd629209590300 100644 (file)
--- a/net.c
+++ b/net.c
@@ -126,9 +126,7 @@ typedef union {
 #ifdef HAVE_INET_NTOP
        struct sockaddr_in6 sa6;
 #endif
-#if defined(AF_IPX)
        struct sockaddr_ipx sipx;
-#endif
        struct sockaddr_ll ll;
        struct sockaddr_nl nl;
 #ifdef HAVE_BLUETOOTH_BLUETOOTH_H
@@ -189,7 +187,6 @@ print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen)
                }
                break;
 #endif
-#if defined(AF_IPX)
        case AF_IPX:
                {
                        int i;
@@ -207,7 +204,7 @@ print_sockaddr(struct tcb *tcp, const sockaddr_buf_t *addr, const int addrlen)
                        tprintf("/[%02x]", addr->sipx.sipx_type);
                }
                break;
-#endif /* AF_IPX */
+
        case AF_PACKET:
                {
                        int i;
@@ -777,14 +774,14 @@ SYS_FUNC(socket)
        case AF_INET6:
                printxval(inet_protocols, tcp->u_arg[2], "IPPROTO_???");
                break;
-#ifdef AF_IPX
+
        case AF_IPX:
                /* BTW: I don't believe this.. */
                tprints("[");
                printxval(addrfams, tcp->u_arg[2], "AF_???");
                tprints("]");
                break;
-#endif /* AF_IPX */
+
        case AF_NETLINK:
                printxval(netlink_protocols, tcp->u_arg[2], "NETLINK_???");
                break;