Declare syscall parsers using SYS_FUNC macro
Introduce SYS_FUNC macro to declare and define all syscall parsers.
* Makefile.am (BUILT_SOURCES, CLEANFILES): Add sys_func.h.
(sys_func.h): New rule.
* defs.h (SYS_FUNC_NAME, SYS_FUNC): New macros.
* linux/syscall.h: Include "sys_func.h".
[NEED_UID16_PARSERS]: Use SYS_FUNC to declare uid16 syscall parsers.
Remove other declarations.
* linux/alpha/syscallent.h (160, 161): Add sys_ prefix to osf_statfs
and osf_fstatfs syscall parsers.
* *.c: Use SYS_FUNC to define syscall parsers.
diff --git a/net.c b/net.c
index 58c54c8..2ed950d 100644
--- a/net.c
+++ b/net.c
@@ -729,8 +729,7 @@
printflags(sock_type_flags, flags, "SOCK_???");
}
-int
-sys_socket(struct tcb *tcp)
+SYS_FUNC(socket)
{
if (entering(tcp)) {
printxval(domains, tcp->u_arg[0], "PF_???");
@@ -770,8 +769,7 @@
return 0;
}
-int
-sys_bind(struct tcb *tcp)
+SYS_FUNC(bind)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -782,14 +780,12 @@
return 0;
}
-int
-sys_connect(struct tcb *tcp)
+SYS_FUNC(connect)
{
return sys_bind(tcp);
}
-int
-sys_listen(struct tcb *tcp)
+SYS_FUNC(listen)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -828,22 +824,19 @@
return 0;
}
-int
-sys_accept(struct tcb *tcp)
+SYS_FUNC(accept)
{
do_sockname(tcp, -1);
return RVAL_FD;
}
-int
-sys_accept4(struct tcb *tcp)
+SYS_FUNC(accept4)
{
do_sockname(tcp, 3);
return RVAL_FD;
}
-int
-sys_send(struct tcb *tcp)
+SYS_FUNC(send)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -856,8 +849,7 @@
return 0;
}
-int
-sys_sendto(struct tcb *tcp)
+SYS_FUNC(sendto)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -877,8 +869,7 @@
#ifdef HAVE_SENDMSG
-int
-sys_sendmsg(struct tcb *tcp)
+SYS_FUNC(sendmsg)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -891,8 +882,7 @@
return 0;
}
-int
-sys_sendmmsg(struct tcb *tcp)
+SYS_FUNC(sendmmsg)
{
if (entering(tcp)) {
/* sockfd */
@@ -912,8 +902,7 @@
#endif /* HAVE_SENDMSG */
-int
-sys_recv(struct tcb *tcp)
+SYS_FUNC(recv)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -930,8 +919,7 @@
return 0;
}
-int
-sys_recvfrom(struct tcb *tcp)
+SYS_FUNC(recvfrom)
{
int fromlen;
@@ -977,8 +965,7 @@
#ifdef HAVE_SENDMSG
-int
-sys_recvmsg(struct tcb *tcp)
+SYS_FUNC(recvmsg)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -995,8 +982,7 @@
return 0;
}
-int
-sys_recvmmsg(struct tcb *tcp)
+SYS_FUNC(recvmmsg)
{
/* +5 chars are for "left " prefix */
static char str[5 + TIMESPEC_TEXT_BUFSIZE];
@@ -1044,8 +1030,7 @@
#include "xlat/shutdown_modes.h"
-int
-sys_shutdown(struct tcb *tcp)
+SYS_FUNC(shutdown)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
@@ -1055,8 +1040,7 @@
return 0;
}
-int
-sys_getsockname(struct tcb *tcp)
+SYS_FUNC(getsockname)
{
return do_sockname(tcp, -1);
}
@@ -1090,20 +1074,17 @@
return 0;
}
-int
-sys_pipe(struct tcb *tcp)
+SYS_FUNC(pipe)
{
return do_pipe(tcp, -1);
}
-int
-sys_pipe2(struct tcb *tcp)
+SYS_FUNC(pipe2)
{
return do_pipe(tcp, 1);
}
-int
-sys_socketpair(struct tcb *tcp)
+SYS_FUNC(socketpair)
{
int fds[2];
@@ -1306,8 +1287,7 @@
tprintf(", [%d]", len);
}
-int
-sys_getsockopt(struct tcb *tcp)
+SYS_FUNC(getsockopt)
{
if (entering(tcp)) {
print_sockopt_fd_level_name(tcp, tcp->u_arg[0],
@@ -1493,8 +1473,7 @@
tprintf(", %d", len);
}
-int
-sys_setsockopt(struct tcb *tcp)
+SYS_FUNC(setsockopt)
{
if (entering(tcp)) {
print_sockopt_fd_level_name(tcp, tcp->u_arg[0],