From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 1 Dec 2014 19:08:44 +0000 (+0000)
Subject: Remove unused <sys/acl.h> based code
X-Git-Tag: v4.10~354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=v4.9-46-g681452b;p=strace

Remove unused <sys/acl.h> based code

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.
---

diff --git a/configure.ac b/configure.ac
index f4ba2582..aec1d47d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 81889732..522b541f 100644
--- 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
index 87559c64..00000000
--- a/xlat/aclcmds.in
+++ /dev/null
@@ -1,6 +0,0 @@
-SETACL
-GETACL
-GETACLCNT
-ACL_GET
-ACL_SET
-ACL_CNT