]> granicus.if.org Git - strace/commitdiff
Remove unused <sys/acl.h> based code
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 1 Dec 2014 19:08:44 +0000 (19: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/acl.h.
* file.c [HAVE_SYS_ACL_H]: Remove.
* xlat/aclcmds.in: Remove.

configure.ac
file.c
xlat/aclcmds.in [deleted file]

index f4ba2582013b39095a84ea76490c84b22c711038..aec1d47d9f8a89cd2ccc2de2066817a58de4ea9d 100644 (file)
@@ -241,7 +241,6 @@ AC_CHECK_HEADERS(m4_normalize([
        poll.h
        scsi/sg.h
        stropts.h
-       sys/acl.h
        sys/conf.h
        sys/epoll.h
        sys/filio.h
diff --git a/file.c b/file.c
index 81889732ca85fa2cc65f6fe9a0dbdff0674bee8d..522b541f9cbf77eca31803b6c018b98c6e666c20 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1335,75 +1335,6 @@ sys_xmknod(struct tcb *tcp)
        return 0;
 }
 
-# ifdef HAVE_SYS_ACL_H
-
-#  include <sys/acl.h>
-
-#include "xlat/aclcmds.h"
-
-int
-sys_acl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(aclcmds, tcp->u_arg[1], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[2]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[3]" if it's not NULL.
-                */
-               if (tcp->u_arg[3])
-                       tprintf(", %#lx", tcp->u_arg[3]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-int
-sys_facl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printxval(aclcmds, tcp->u_arg[1], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[2]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[3]" if it's not NULL.
-                */
-               if (tcp->u_arg[3])
-                       tprintf(", %#lx", tcp->u_arg[3]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-#include "xlat/aclipc.h"
-
-int
-sys_aclipc(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printxval(aclipc, tcp->u_arg[0], "???IPC???");
-               tprintf(", %#lx, ", tcp->u_arg[1]);
-               printxval(aclcmds, tcp->u_arg[2], "???ACL???");
-               tprintf(", %ld", tcp->u_arg[3]);
-               /*
-                * FIXME - dump out the list of aclent_t's pointed to
-                * by "tcp->u_arg[4]" if it's not NULL.
-                */
-               if (tcp->u_arg[4])
-                       tprintf(", %#lx", tcp->u_arg[4]);
-               else
-                       tprints(", NULL");
-       }
-       return 0;
-}
-
-# endif /* HAVE_SYS_ACL_H */
-
 #endif /* SPARC[64] */
 
 /* directory */
diff --git a/xlat/aclcmds.in b/xlat/aclcmds.in
deleted file mode 100644 (file)
index 87559c6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-SETACL
-GETACL
-GETACLCNT
-ACL_GET
-ACL_SET
-ACL_CNT