svn commit: r202881 - in head/sys: kern sys

[Konstantin Belousov]

Author: kib
Date: Sat Jan 23 11:43:30 2010
New Revision: 202881
URL: http://svn.freebsd.org/changeset/base/202881

Log:
  Staticise sigqueue manipulation functions used only in kern_sig.c.
  
  MFC after:	1 week

Modified:
  head/sys/kern/kern_sig.c
  head/sys/sys/signalvar.h

Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c	Sat Jan 23 11:42:31 2010	(r202880)
+++ head/sys/kern/kern_sig.c	Sat Jan 23 11:43:30 2010	(r202881)
@@ -279,7 +279,7 @@ sigqueue_init(sigqueue_t *list, struct p
  * 	0	-	signal not found
  *	others	-	signal number
  */ 
-int
+static int
 sigqueue_get(sigqueue_t *sq, int signo, ksiginfo_t *si)
 {
 	struct proc *p = sq->sq_proc;
@@ -341,7 +341,7 @@ sigqueue_take(ksiginfo_t *ksi)
 		SIGDELSET(sq->sq_signals, ksi->ksi_signo);
 }
 
-int
+static int
 sigqueue_add(sigqueue_t *sq, int signo, ksiginfo_t *si)
 {
 	struct proc *p = sq->sq_proc;
@@ -426,7 +426,7 @@ sigqueue_flush(sigqueue_t *sq)
 	SIGEMPTYSET(sq->sq_kill);
 }
 
-void
+static void
 sigqueue_collect_set(sigqueue_t *sq, sigset_t *set)
 {
 	ksiginfo_t *ksi;
@@ -438,7 +438,7 @@ sigqueue_collect_set(sigqueue_t *sq, sig
 	SIGSETOR(*set, sq->sq_kill);
 }
 
-void
+static void
 sigqueue_move_set(sigqueue_t *src, sigqueue_t *dst, sigset_t *setp)
 {
 	sigset_t tmp, set;
@@ -482,7 +482,7 @@ sigqueue_move_set(sigqueue_t *src, sigqu
 	sigqueue_collect_set(src, &src->sq_signals);
 }
 
-void
+static void
 sigqueue_move(sigqueue_t *src, sigqueue_t *dst, int signo)
 {
 	sigset_t set;
@@ -492,7 +492,7 @@ sigqueue_move(sigqueue_t *src, sigqueue_
 	sigqueue_move_set(src, dst, &set);
 }
 
-void
+static void
 sigqueue_delete_set(sigqueue_t *sq, sigset_t *set)
 {
 	struct proc *p = sq->sq_proc;
@@ -526,7 +526,7 @@ sigqueue_delete(sigqueue_t *sq, int sign
 }
 
 /* Remove a set of signals for a process */
-void
+static void
 sigqueue_delete_set_proc(struct proc *p, sigset_t *set)
 {
 	sigqueue_t worklist;
@@ -553,7 +553,7 @@ sigqueue_delete_proc(struct proc *p, int
 	sigqueue_delete_set_proc(p, &set);
 }
 
-void
+static void
 sigqueue_delete_stopmask_proc(struct proc *p)
 {
 	sigset_t set;

Modified: head/sys/sys/signalvar.h
==============================================================================
--- head/sys/sys/signalvar.h	Sat Jan 23 11:42:31 2010	(r202880)
+++ head/sys/sys/signalvar.h	Sat Jan 23 11:43:30 2010	(r202881)
@@ -355,18 +355,10 @@ void	ksiginfo_free(ksiginfo_t *);
 void	sigqueue_init(struct sigqueue *queue, struct proc *p);
 void	sigqueue_flush(struct sigqueue *queue);
 void	sigqueue_delete_proc(struct proc *p, int sig);
-void	sigqueue_delete_set(struct sigqueue *queue, sigset_t *set);
 void	sigqueue_delete(struct sigqueue *queue, int sig);
-void	sigqueue_move_set(struct sigqueue *src, sigqueue_t *dst, sigset_t *);
-int	sigqueue_get(struct sigqueue *queue, int sig, ksiginfo_t *info);
-int	sigqueue_add(struct sigqueue *queue, int sig, ksiginfo_t *info);
-void	sigqueue_collect_set(struct sigqueue *queue, sigset_t *set);
-void	sigqueue_move(struct sigqueue *, struct sigqueue *, int sig);
-void	sigqueue_delete_set_proc(struct proc *, sigset_t *);
-void	sigqueue_delete_stopmask_proc(struct proc *);
 void	sigqueue_take(ksiginfo_t *ksi);
 int	kern_sigtimedwait(struct thread *, sigset_t,
-		ksiginfo_t *, struct timespec *);
+	    ksiginfo_t *, struct timespec *);
 int	kern_sigprocmask(struct thread *td, int how,
 	    sigset_t *set, sigset_t *oset, int flags);
 /*