From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 17 Jul 2015 21:12:05 +0000 (+0000)
Subject: process.c: use printaddr
X-Git-Tag: v4.11~409
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14446ebcf6aa09c0a389149fb2ea7a0c470c28ab;p=strace

process.c: use printaddr

* process.c (sys_ptrace): Use printaddr.
---

diff --git a/process.c b/process.c
index 73092a22..deeb7417 100644
--- a/process.c
+++ b/process.c
@@ -73,22 +73,20 @@ SYS_FUNC(ptrace)
 					break;
 			}
 			if (!x->str)
-				tprintf("%#lx, ", addr);
+				printaddr(addr);
 			else if (x->val > addr && x != struct_user_offsets) {
 				x--;
-				tprintf("%s + %ld, ", x->str, addr - x->val);
+				tprintf("%s + %ld", x->str, addr - x->val);
 			}
 			else
-				tprintf("%s, ", x->str);
+				tprints(x->str);
 		} else
 		if (tcp->u_arg[0] == PTRACE_GETREGSET
-		 || tcp->u_arg[0] == PTRACE_SETREGSET
-		) {
+		 || tcp->u_arg[0] == PTRACE_SETREGSET)
 			printxval(nt_descriptor_types, tcp->u_arg[2], "NT_???");
-			tprints(", ");
-		} else
-			tprintf("%#lx, ", addr);
-
+		else
+			printaddr(addr);
+		tprints(", ");
 
 		switch (tcp->u_arg[0]) {
 #ifndef IA64
@@ -118,7 +116,7 @@ SYS_FUNC(ptrace)
 			/* Don't print anything, do it at syscall return. */
 			break;
 		default:
-			tprintf("%#lx", tcp->u_arg[3]);
+			printaddr(tcp->u_arg[3]);
 			break;
 		}
 	} else {