From d33523160658b54127ac63bcaefa6080d8dbe373 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Wed, 19 Jan 2000 06:13:59 +0000 Subject: Fix bde'isms in acl/extattr syscall interface, renaming syscalls to prettier (?) names, adding some const's around here, et al. This is commit 4 out of 3, updating the userland library to reflect kernel interface changes. Reviewed by: bde --- lib/libc/posix1e/acl_delete.c | 8 ++++---- lib/libc/posix1e/acl_get.c | 8 ++++---- lib/libc/posix1e/acl_init.c | 2 +- lib/libc/posix1e/acl_set.c | 4 ++-- lib/libc/posix1e/acl_support.c | 2 +- lib/libc/posix1e/acl_valid.c | 4 ++-- lib/libposix1e/acl_delete.c | 8 ++++---- lib/libposix1e/acl_get.c | 8 ++++---- lib/libposix1e/acl_init.c | 2 +- lib/libposix1e/acl_set.c | 4 ++-- lib/libposix1e/acl_support.c | 2 +- lib/libposix1e/acl_valid.c | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) (limited to 'lib') diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c index 537a55ee85de..c3aa268ec51b 100644 --- a/lib/libc/posix1e/acl_delete.c +++ b/lib/libc/posix1e/acl_delete.c @@ -37,7 +37,7 @@ int acl_delete_def_fd(int filedes) { - return (acl_syscall_delete_fd(filedes, ACL_TYPE_DEFAULT)); + return (__acl_delete_fd(filedes, ACL_TYPE_DEFAULT)); } @@ -45,7 +45,7 @@ int acl_delete_def_file(const char *path_p) { - return (acl_syscall_delete_file(path_p, ACL_TYPE_DEFAULT)); + return (__acl_delete_file(path_p, ACL_TYPE_DEFAULT)); } @@ -53,7 +53,7 @@ int acl_delete_file(const char *path_p, acl_type_t type) { - return (acl_syscall_delete_file(path_p, type)); + return (__acl_delete_file(path_p, type)); } @@ -61,5 +61,5 @@ int acl_delete_fd(int filedes, acl_type_t type) { - return (acl_syscall_delete_fd(filedes, type)); + return (__acl_delete_fd(filedes, type)); } diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c index 3871229d2eca..1293f0b73907 100644 --- a/lib/libc/posix1e/acl_get.c +++ b/lib/libc/posix1e/acl_get.c @@ -40,12 +40,12 @@ acl_get_file(const char *path_p, acl_type_t type) struct acl *aclp; int error; - aclp = acl_init(MAX_ACL_ENTRIES); + aclp = acl_init(ACL_MAX_ENTRIES); if (!aclp) { return (0); } - error = acl_syscall_get_file(path_p, type, aclp); + error = __acl_get_file(path_p, type, aclp); if (error) { acl_free(aclp); return (0); @@ -61,12 +61,12 @@ acl_get_fd(int fd, acl_type_t type) struct acl *aclp; int error; - aclp = acl_init(MAX_ACL_ENTRIES); + aclp = acl_init(ACL_MAX_ENTRIES); if (!aclp) { return (0); } - error = acl_syscall_get_fd(fd, type, aclp); + error = __acl_get_fd(fd, type, aclp); if (error) { acl_free(aclp); return (0); diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c index 11308edea637..a082ea8716ae 100644 --- a/lib/libc/posix1e/acl_init.c +++ b/lib/libc/posix1e/acl_init.c @@ -40,7 +40,7 @@ acl_init(int count) { struct acl *acl; - if (count > MAX_ACL_ENTRIES) { + if (count > ACL_MAX_ENTRIES) { errno = ENOMEM; return (0); } diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c index 6a04328e097b..18734220efd4 100644 --- a/lib/libc/posix1e/acl_set.c +++ b/lib/libc/posix1e/acl_set.c @@ -54,7 +54,7 @@ acl_set_file(const char *path_p, acl_type_t type, acl_t acl) } } - return (acl_syscall_set_file(path_p, type, acl)); + return (__acl_set_file(path_p, type, acl)); } @@ -71,5 +71,5 @@ acl_set_fd(int fd, acl_t acl, acl_type_t type) } } - return (acl_syscall_set_fd(fd, type, acl)); + return (__acl_set_fd(fd, type, acl)); } diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c index 22b1710ac4bf..9f9ae262a844 100644 --- a/lib/libc/posix1e/acl_support.c +++ b/lib/libc/posix1e/acl_support.c @@ -429,7 +429,7 @@ acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id, acl_perm_t perm) { struct acl_entry *e; - if (acl->acl_cnt >= MAX_ACL_ENTRIES) { + if (acl->acl_cnt >= ACL_MAX_ENTRIES) { errno = ENOMEM; return (-1); } diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c index 683525e45e0a..602d4d5067e8 100644 --- a/lib/libc/posix1e/acl_valid.c +++ b/lib/libc/posix1e/acl_valid.c @@ -77,7 +77,7 @@ acl_valid_file(const char *pathp, acl_type_t type, acl_t acl) } } - return (acl_syscall_aclcheck_file(pathp, type, acl)); + return (__acl_aclcheck_file(pathp, type, acl)); } @@ -94,5 +94,5 @@ acl_valid_fd(int fd, acl_type_t type, acl_t acl) } } - return (acl_syscall_aclcheck_fd(fd, type, acl)); + return (__acl_aclcheck_fd(fd, type, acl)); } diff --git a/lib/libposix1e/acl_delete.c b/lib/libposix1e/acl_delete.c index 537a55ee85de..c3aa268ec51b 100644 --- a/lib/libposix1e/acl_delete.c +++ b/lib/libposix1e/acl_delete.c @@ -37,7 +37,7 @@ int acl_delete_def_fd(int filedes) { - return (acl_syscall_delete_fd(filedes, ACL_TYPE_DEFAULT)); + return (__acl_delete_fd(filedes, ACL_TYPE_DEFAULT)); } @@ -45,7 +45,7 @@ int acl_delete_def_file(const char *path_p) { - return (acl_syscall_delete_file(path_p, ACL_TYPE_DEFAULT)); + return (__acl_delete_file(path_p, ACL_TYPE_DEFAULT)); } @@ -53,7 +53,7 @@ int acl_delete_file(const char *path_p, acl_type_t type) { - return (acl_syscall_delete_file(path_p, type)); + return (__acl_delete_file(path_p, type)); } @@ -61,5 +61,5 @@ int acl_delete_fd(int filedes, acl_type_t type) { - return (acl_syscall_delete_fd(filedes, type)); + return (__acl_delete_fd(filedes, type)); } diff --git a/lib/libposix1e/acl_get.c b/lib/libposix1e/acl_get.c index 3871229d2eca..1293f0b73907 100644 --- a/lib/libposix1e/acl_get.c +++ b/lib/libposix1e/acl_get.c @@ -40,12 +40,12 @@ acl_get_file(const char *path_p, acl_type_t type) struct acl *aclp; int error; - aclp = acl_init(MAX_ACL_ENTRIES); + aclp = acl_init(ACL_MAX_ENTRIES); if (!aclp) { return (0); } - error = acl_syscall_get_file(path_p, type, aclp); + error = __acl_get_file(path_p, type, aclp); if (error) { acl_free(aclp); return (0); @@ -61,12 +61,12 @@ acl_get_fd(int fd, acl_type_t type) struct acl *aclp; int error; - aclp = acl_init(MAX_ACL_ENTRIES); + aclp = acl_init(ACL_MAX_ENTRIES); if (!aclp) { return (0); } - error = acl_syscall_get_fd(fd, type, aclp); + error = __acl_get_fd(fd, type, aclp); if (error) { acl_free(aclp); return (0); diff --git a/lib/libposix1e/acl_init.c b/lib/libposix1e/acl_init.c index 11308edea637..a082ea8716ae 100644 --- a/lib/libposix1e/acl_init.c +++ b/lib/libposix1e/acl_init.c @@ -40,7 +40,7 @@ acl_init(int count) { struct acl *acl; - if (count > MAX_ACL_ENTRIES) { + if (count > ACL_MAX_ENTRIES) { errno = ENOMEM; return (0); } diff --git a/lib/libposix1e/acl_set.c b/lib/libposix1e/acl_set.c index 6a04328e097b..18734220efd4 100644 --- a/lib/libposix1e/acl_set.c +++ b/lib/libposix1e/acl_set.c @@ -54,7 +54,7 @@ acl_set_file(const char *path_p, acl_type_t type, acl_t acl) } } - return (acl_syscall_set_file(path_p, type, acl)); + return (__acl_set_file(path_p, type, acl)); } @@ -71,5 +71,5 @@ acl_set_fd(int fd, acl_t acl, acl_type_t type) } } - return (acl_syscall_set_fd(fd, type, acl)); + return (__acl_set_fd(fd, type, acl)); } diff --git a/lib/libposix1e/acl_support.c b/lib/libposix1e/acl_support.c index 22b1710ac4bf..9f9ae262a844 100644 --- a/lib/libposix1e/acl_support.c +++ b/lib/libposix1e/acl_support.c @@ -429,7 +429,7 @@ acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id, acl_perm_t perm) { struct acl_entry *e; - if (acl->acl_cnt >= MAX_ACL_ENTRIES) { + if (acl->acl_cnt >= ACL_MAX_ENTRIES) { errno = ENOMEM; return (-1); } diff --git a/lib/libposix1e/acl_valid.c b/lib/libposix1e/acl_valid.c index 683525e45e0a..602d4d5067e8 100644 --- a/lib/libposix1e/acl_valid.c +++ b/lib/libposix1e/acl_valid.c @@ -77,7 +77,7 @@ acl_valid_file(const char *pathp, acl_type_t type, acl_t acl) } } - return (acl_syscall_aclcheck_file(pathp, type, acl)); + return (__acl_aclcheck_file(pathp, type, acl)); } @@ -94,5 +94,5 @@ acl_valid_fd(int fd, acl_type_t type, acl_t acl) } } - return (acl_syscall_aclcheck_fd(fd, type, acl)); + return (__acl_aclcheck_fd(fd, type, acl)); } -- cgit v1.3