]> granicus.if.org Git - strace/commitdiff
net.c: use printaddr
authorDmitry V. Levin <ldv@altlinux.org>
Thu, 30 Jul 2015 13:53:42 +0000 (13:53 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Thu, 30 Jul 2015 13:53:42 +0000 (13:53 +0000)
* net.c (printsock, sys_recvfrom): Use printaddr.

net.c

diff --git a/net.c b/net.c
index 7412519bd3d2590bbf84cc565a01c547d6448ebe..3306cbbb9749a5abbaa66e24655ecf46f7150deb 100644 (file)
--- a/net.c
+++ b/net.c
@@ -147,7 +147,7 @@ printsock(struct tcb *tcp, long addr, int addrlen)
        char string_addr[100];
 
        if (addrlen < 2) {
-               tprintf("%#lx", addr);
+               printaddr(addr);
                return;
        }
 
@@ -814,7 +814,7 @@ SYS_FUNC(recvfrom)
        } else {
                /* buf */
                if (syserror(tcp)) {
-                       tprintf("%#lx", tcp->u_arg[1]);
+                       printaddr(tcp->u_arg[1]);
                } else {
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
                }
@@ -822,12 +822,8 @@ SYS_FUNC(recvfrom)
                tprintf(", %lu, ", tcp->u_arg[2]);
                /* flags */
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
-               if (syserror(tcp)) {
-                       tprintf(", %#lx, %#lx", tcp->u_arg[4], tcp->u_arg[5]);
-                       return 0;
-               }
                tprints(", ");
-               if (!tcp->u_arg[4] || !tcp->u_arg[5] ||
+               if (syserror(tcp) || !tcp->u_arg[4] || !tcp->u_arg[5] ||
                    umove(tcp, tcp->u_arg[5], &fromlen) < 0) {
                        /* from address, len */
                        printaddr(tcp->u_arg[4]);