]> granicus.if.org Git - strace/commitdiff
Remove unused <sys/asynch.h> based code
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 1 Dec 2014 17:08:50 +0000 (17:08 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 1 Dec 2014 19:45:24 +0000 (19:45 +0000)
Starting with commit v4.6-240-g5afdf12, nobody compiles this
non-Linux code.

* configure.ac (AC_CHECK_HEADERS): Remove sys/asynch.h.
* file.c [HAVE_SYS_ASYNCH_H]: Remove.

configure.ac
file.c

index 4732778776e17800e85326d06bceae52580e0115..f4ba2582013b39095a84ea76490c84b22c711038 100644 (file)
@@ -242,7 +242,6 @@ AC_CHECK_HEADERS(m4_normalize([
        scsi/sg.h
        stropts.h
        sys/acl.h
-       sys/asynch.h
        sys/conf.h
        sys/epoll.h
        sys/filio.h
diff --git a/file.c b/file.c
index 0ec1d4b6e6b1be43c487e93e2b7b6d5c9d555a9b..81889732ca85fa2cc65f6fe9a0dbdff0674bee8d 100644 (file)
--- a/file.c
+++ b/file.c
@@ -196,10 +196,6 @@ struct __old_kernel_stat {
 # include <sys/mkdev.h>
 #endif
 
-#ifdef HAVE_SYS_ASYNCH_H
-# include <sys/asynch.h>
-#endif
-
 #ifdef O_LARGEFILE
 # if O_LARGEFILE == 0          /* biarch platforms in 64-bit mode */
 #  undef O_LARGEFILE
@@ -1786,84 +1782,6 @@ sys_getcwd(struct tcb *tcp)
        return 0;
 }
 
-#ifdef HAVE_SYS_ASYNCH_H
-
-int
-sys_aioread(struct tcb *tcp)
-{
-       struct aio_result_t res;
-
-       if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
-       } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %lu, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printxval(whence, tcp->u_arg[4], "L_???");
-               if (syserror(tcp) || tcp->u_arg[5] == 0
-                   || umove(tcp, tcp->u_arg[5], &res) < 0)
-                       tprintf(", %#lx", tcp->u_arg[5]);
-               else
-                       tprintf(", {aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
-       }
-       return 0;
-}
-
-int
-sys_aiowrite(struct tcb *tcp)
-{
-       struct aio_result_t res;
-
-       if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %lu, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printxval(whence, tcp->u_arg[4], "L_???");
-       }
-       else {
-               if (tcp->u_arg[5] == 0)
-                       tprints(", NULL");
-               else if (syserror(tcp)
-                   || umove(tcp, tcp->u_arg[5], &res) < 0)
-                       tprintf(", %#lx", tcp->u_arg[5]);
-               else
-                       tprintf(", {aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
-       }
-       return 0;
-}
-
-int
-sys_aiowait(struct tcb *tcp)
-{
-       if (entering(tcp))
-               printtv(tcp, tcp->u_arg[0]);
-       return 0;
-}
-
-int
-sys_aiocancel(struct tcb *tcp)
-{
-       struct aio_result_t res;
-
-       if (exiting(tcp)) {
-               if (tcp->u_arg[0] == 0)
-                       tprints("NULL");
-               else if (syserror(tcp)
-                   || umove(tcp, tcp->u_arg[0], &res) < 0)
-                       tprintf("%#lx", tcp->u_arg[0]);
-               else
-                       tprintf("{aio_return %d aio_errno %d}",
-                               res.aio_return, res.aio_errno);
-       }
-       return 0;
-}
-
-#endif /* HAVE_SYS_ASYNCH_H */
-
 #include "xlat/xattrflags.h"
 
 static void