From 8594d2c0319e406d1be66e249617de7a6acc177b Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 1 Apr 2014 14:01:16 -0500 Subject: [PATCH] Make _struct_sockaddr_u_impl() tapset function output more consistent. * tapset/linux/aux_syscalls.stp (_struct_sockaddr_u_impl): Make output more consistent. When _struct_sockaddr_u_impl() succeeds, it returns '{INFO}'. When it failed, it returned '[...]'. Now when it fails it returns '{...}'. * testsuite/systemtap.syscall/bind.c: Updated expected test output. * testsuite/systemtap.syscall/connect.c: Updated expected test output. * testsuite/systemtap.syscall/sendto.c: Updated expected test output. --- tapset/linux/aux_syscalls.stp | 2 +- testsuite/systemtap.syscall/bind.c | 2 +- testsuite/systemtap.syscall/connect.c | 2 +- testsuite/systemtap.syscall/sendto.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tapset/linux/aux_syscalls.stp b/tapset/linux/aux_syscalls.stp index bf8182e25..6f5fdaab8 100644 --- a/tapset/linux/aux_syscalls.stp +++ b/tapset/linux/aux_syscalls.stp @@ -472,7 +472,7 @@ function _struct_sockaddr_u_impl:string(uaddr:long, len:long, what:long) if (_stp_copy_from_user(CONTEXT->buf, ptr, len)) { - strlcpy(STAP_RETVALUE, "[...]", MAXSTRINGLEN); + strlcpy(STAP_RETVALUE, "{...}", MAXSTRINGLEN); return; } diff --git a/testsuite/systemtap.syscall/bind.c b/testsuite/systemtap.syscall/bind.c index 8832726f4..6e3f05b1a 100644 --- a/testsuite/systemtap.syscall/bind.c +++ b/testsuite/systemtap.syscall/bind.c @@ -48,7 +48,7 @@ int main() //staptest// bind (-1, {AF_INET, 0.0.0.0, NNNN}, 16) = -NNNN (EBADF) bind(sock_inet_stream, (struct sockaddr *)-1, sizeof(struct sockaddr_in)); - //staptest// bind (NNNN, \[\.\.\.\], 16) = -NNNN (EFAULT) + //staptest// bind (NNNN, {\.\.\.}, 16) = -NNNN (EFAULT) bind(sock_inet_stream, (struct sockaddr *)&sin1, 3); //staptest// bind (NNNN, {.+}, 3) = -NNNN (EINVAL) diff --git a/testsuite/systemtap.syscall/connect.c b/testsuite/systemtap.syscall/connect.c index feba7bcac..a9350025d 100644 --- a/testsuite/systemtap.syscall/connect.c +++ b/testsuite/systemtap.syscall/connect.c @@ -114,7 +114,7 @@ int main() //staptest// socket (PF_INET, SOCK_STREAM, IPPROTO_IP) = NNNN connect(s, (struct sockaddr *)-1, sizeof(sin1)); - //staptest// connect (NNNN, \[\.\.\.\], 16) = -NNNN (EFAULT) + //staptest// connect (NNNN, {\.\.\.\}, 16) = -NNNN (EFAULT) connect(s, (struct sockaddr *)&sin1, -1); //staptest// connect (NNNN, {unknown .+}, 4294967295) = -NNNN (EINVAL) diff --git a/testsuite/systemtap.syscall/sendto.c b/testsuite/systemtap.syscall/sendto.c index 3c27038a6..efcca65ca 100644 --- a/testsuite/systemtap.syscall/sendto.c +++ b/testsuite/systemtap.syscall/sendto.c @@ -149,7 +149,7 @@ int main() //staptest// sendto (NNNN, XXXX, 1024, 0x0, {unknown .+}, 4294967295) = -NNNN (EINVAL) sendto(s, buf, sizeof(buf), 0, (struct sockaddr *)-1, sizeof(sin1)); - //staptest// sendto (NNNN, XXXX, 1024, 0x0, \[\.\.\.\], 16) = -NNNN (EFAULT) + //staptest// sendto (NNNN, XXXX, 1024, 0x0, {\.\.\.}, 16) = -NNNN (EFAULT) // Ignore the return value on this sendto() call. sendto(s, buf, sizeof(buf), -1, (struct sockaddr *)&sin1, sizeof(sin1)); -- 2.43.5