Removed:

- uthread_signal.c; libc_r does not wrap signal() since 1998/04/29.

- uthread_attr_setprio.c; it was never connected to the build, and
  pthread_attr_setprio() does not exist in POSIX.

- uthread_sigblock.c and uthread_sigsetmask.c; these were no-ops
  bloating libc_r's space.

pthread_private.h:

- Removed prototypes of non-syscalls: send().

- Removed prototypes of unused syscalls: sigpending(), sigsuspend(),
  and select().

- Fixed prototype of fork().

- MFS: Fixed prototypes of <sys/socket.h> syscalls.

Reviewed by:	deischen
Approved by:	deischen, jasone

2 files changed, 10 insertions, 16 deletions

diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc
index 0eb1d59..1ec09c5 100644
--- a/lib/libpthread/thread/Makefile.inc
+++ b/lib/libpthread/thread/Makefile.inc
@@ -113,11 +113,9 @@ SRCS+= \
 	uthread_shutdown.c \
 	uthread_sig.c \
 	uthread_sigaction.c \
-	uthread_sigblock.c \
 	uthread_sigmask.c \
 	uthread_sigpending.c \
 	uthread_sigprocmask.c \
-	uthread_sigsetmask.c \
 	uthread_sigsuspend.c \
 	uthread_sigwait.c \
 	uthread_single_np.c \
diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h
index cc3ec79..9081b72 100644
--- a/lib/libpthread/thread/thr_private.h
+++ b/lib/libpthread/thread/thr_private.h
@@ -1262,9 +1262,7 @@ int	__sys_aio_suspend(const struct aiocb * const[], int, const struct timespec *
 /* #include <signal.h> */
 #ifdef _SIGNAL_H_
 int     __sys_sigaction(int, const struct sigaction *, struct sigaction *);
-int     __sys_sigpending(sigset_t *);
 int     __sys_sigprocmask(int, const sigset_t *, sigset_t *);
-int     __sys_sigsuspend(const sigset_t *);
 int     __sys_sigreturn(ucontext_t *);
 int     __sys_sigaltstack(const struct sigaltstack *, struct sigaltstack *);
 #endif
@@ -1289,23 +1287,22 @@ int	__sys_kevent(int, const struct kevent *, int, struct kevent *,
 
 /* #include <sys/socket.h> */
 #ifdef  _SYS_SOCKET_H_
-int     __sys_accept(int, struct sockaddr *, int *);
-int     __sys_bind(int, const struct sockaddr *, int);
-int     __sys_connect(int, const struct sockaddr *, int);
-int     __sys_getpeername(int, struct sockaddr *, int *);
-int     __sys_getsockname(int, struct sockaddr *, int *);
-int     __sys_getsockopt(int, int, int, void *, int *);
+int	__sys_accept(int, struct sockaddr *, socklen_t *);
+int	__sys_bind(int, const struct sockaddr *, socklen_t);
+int	__sys_connect(int, const struct sockaddr *, socklen_t);
+int	__sys_getpeername(int, struct sockaddr *, socklen_t *);
+int	__sys_getsockname(int, struct sockaddr *, socklen_t *);
+int	__sys_getsockopt(int, int, int, void *, socklen_t *);
 int     __sys_listen(int, int);
-int     __sys_setsockopt(int, int, int, const void *, int);
+int	__sys_setsockopt(int, int, int, const void *, socklen_t);
 int     __sys_shutdown(int, int);
 int     __sys_socket(int, int, int);
 int     __sys_socketpair(int, int, int, int *);
-ssize_t __sys_recvfrom(int, void *, size_t, int, struct sockaddr *, int *);
+ssize_t	__sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
 ssize_t __sys_recvmsg(int, struct msghdr *, int);
-ssize_t __sys_send(int, const void *, size_t, int);
 int	__sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
 ssize_t __sys_sendmsg(int, const struct msghdr *, int);
-ssize_t __sys_sendto(int, const void *,size_t, int, const struct sockaddr *, int);
+ssize_t	__sys_sendto(int, const void *,size_t, int, const struct sockaddr *, socklen_t);
 #endif
 
 /* #include <unistd.h> */
@@ -1315,10 +1312,9 @@ int     __sys_dup(int);
 int     __sys_dup2(int, int);
 int     __sys_execve(const char *, char * const *, char * const *);
 int     __sys_fchown(int, uid_t, gid_t);
-int	__sys_fork(void);
+pid_t	__sys_fork(void);
 int     __sys_fsync(int);
 int	__sys_pipe(int *);
-int     __sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
 long    __sys_fpathconf(int, int);
 ssize_t __sys_read(int, void *, size_t);
 ssize_t __sys_write(int, const void *, size_t);