From 08a58ea957aa37411fcbcb53a8590518f4c487d8 Mon Sep 17 00:00:00 2001 From: rwatson Date: Fri, 14 Jun 2002 04:02:25 +0000 Subject: Missed in earlier commit -- I did cvs commit src/lib/libc. Oops. --- lib/libc_r/uthread/Makefile.inc | 2 -- lib/libc_r/uthread/pthread_private.h | 6 ----- lib/libc_r/uthread/uthread_cap_get_fd.c | 48 --------------------------------- lib/libc_r/uthread/uthread_cap_set_fd.c | 46 ------------------------------- lib/libkse/thread/Makefile.inc | 2 -- lib/libkse/thread/thr_private.h | 6 ----- lib/libpthread/thread/Makefile.inc | 2 -- lib/libpthread/thread/thr_private.h | 6 ----- 8 files changed, 118 deletions(-) delete mode 100644 lib/libc_r/uthread/uthread_cap_get_fd.c delete mode 100644 lib/libc_r/uthread/uthread_cap_set_fd.c diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc index f9ee7f6..d35894e 100644 --- a/lib/libc_r/uthread/Makefile.inc +++ b/lib/libc_r/uthread/Makefile.inc @@ -32,8 +32,6 @@ SRCS+= \ uthread_autoinit.c \ uthread_bind.c \ uthread_cancel.c \ - uthread_cap_get_fd.c \ - uthread_cap_set_fd.c \ uthread_clean.c \ uthread_close.c \ uthread_cond.c \ diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index 3fef49c..ef45706 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -1222,12 +1222,6 @@ int __sys___acl_set_fd(int, acl_type_t, struct acl *); int __sys_aio_suspend(const struct aiocb * const[], int, const struct timespec *); #endif -/* #include */ -#ifdef _SYS_CAPABILITY_H -int __sys___cap_get_fd(int, struct cap *); -int __sys___cap_set_fd(int, struct cap *); -#endif - /* #include */ #ifdef _SYS_EVENT_H_ int __sys_kevent(int, const struct kevent *, int, struct kevent *, diff --git a/lib/libc_r/uthread/uthread_cap_get_fd.c b/lib/libc_r/uthread/uthread_cap_get_fd.c deleted file mode 100644 index 0f0b3e3..0000000 --- a/lib/libc_r/uthread/uthread_cap_get_fd.c +++ /dev/null @@ -1,48 +0,0 @@ -/*- - * Copyright (c) 2001 Thomas Moestl - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include -#include -#include -#include "pthread_private.h" - -__weak_reference(___cap_get_fd, __cap_get_fd); - -int -___cap_get_fd(int fd, struct cap *cap_p) -{ - int error; - - if ((error = _FD_LOCK(fd, FD_READ, NULL)) == 0) { - error = __sys___cap_get_fd(fd, cap_p); - _FD_UNLOCK(fd, FD_READ); - } - return (error); -} - - diff --git a/lib/libc_r/uthread/uthread_cap_set_fd.c b/lib/libc_r/uthread/uthread_cap_set_fd.c deleted file mode 100644 index 5a8b668..0000000 --- a/lib/libc_r/uthread/uthread_cap_set_fd.c +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * Copyright (c) 2001 Thomas Moestl - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include -#include -#include -#include "pthread_private.h" - -__weak_reference(___cap_set_fd, __cap_set_fd); - -int -___cap_set_fd(int fd, cap_t cap_p) -{ - int error; - - if ((error = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) { - error = __sys___cap_set_fd(fd, cap_p); - _FD_UNLOCK(fd, FD_WRITE); - } - return (error); -} diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index f9ee7f6..d35894e 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -32,8 +32,6 @@ SRCS+= \ uthread_autoinit.c \ uthread_bind.c \ uthread_cancel.c \ - uthread_cap_get_fd.c \ - uthread_cap_set_fd.c \ uthread_clean.c \ uthread_close.c \ uthread_cond.c \ diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 3fef49c..ef45706 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -1222,12 +1222,6 @@ int __sys___acl_set_fd(int, acl_type_t, struct acl *); int __sys_aio_suspend(const struct aiocb * const[], int, const struct timespec *); #endif -/* #include */ -#ifdef _SYS_CAPABILITY_H -int __sys___cap_get_fd(int, struct cap *); -int __sys___cap_set_fd(int, struct cap *); -#endif - /* #include */ #ifdef _SYS_EVENT_H_ int __sys_kevent(int, const struct kevent *, int, struct kevent *, diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index f9ee7f6..d35894e 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -32,8 +32,6 @@ SRCS+= \ uthread_autoinit.c \ uthread_bind.c \ uthread_cancel.c \ - uthread_cap_get_fd.c \ - uthread_cap_set_fd.c \ uthread_clean.c \ uthread_close.c \ uthread_cond.c \ diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index 3fef49c..ef45706 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -1222,12 +1222,6 @@ int __sys___acl_set_fd(int, acl_type_t, struct acl *); int __sys_aio_suspend(const struct aiocb * const[], int, const struct timespec *); #endif -/* #include */ -#ifdef _SYS_CAPABILITY_H -int __sys___cap_get_fd(int, struct cap *); -int __sys___cap_set_fd(int, struct cap *); -#endif - /* #include */ #ifdef _SYS_EVENT_H_ int __sys_kevent(int, const struct kevent *, int, struct kevent *, -- cgit v1.1