From 5c28a8d474a0cc47afeb24ca1ec5c29c0dd7e4bf Mon Sep 17 00:00:00 2001 From: David Xu Date: Sun, 22 Oct 2006 00:09:41 +0000 Subject: [PATCH] Use macro TAILQ_FOREACH_SAFE instead of expanding it. --- sys/kern/kern_sig.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index d038efa37bf..a975914cec3 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -276,8 +276,7 @@ sigqueue_get(sigqueue_t *sq, int signo, ksiginfo_t *si) SIGDELSET(sq->sq_kill, signo); } - for (ksi = TAILQ_FIRST(&sq->sq_list); ksi != NULL; ksi = next) { - next = TAILQ_NEXT(ksi, ksi_link); + TAILQ_FOREACH_SAFE(ksi, &sq->sq_list, ksi_link, next) { if (ksi->ksi_signo == signo) { if (count == 0) { TAILQ_REMOVE(&sq->sq_list, ksi, ksi_link); @@ -428,8 +427,7 @@ sigqueue_move_set(sigqueue_t *src, sigqueue_t *dst, sigset_t *setp) p1 = src->sq_proc; p2 = dst->sq_proc; /* Move siginfo to target list */ - for (ksi = TAILQ_FIRST(&src->sq_list); ksi != NULL; ksi = next) { - next = TAILQ_NEXT(ksi, ksi_link); + TAILQ_FOREACH_SAFE(ksi, &src->sq_list, ksi_link, next) { if (SIGISMEMBER(set, ksi->ksi_signo)) { TAILQ_REMOVE(&src->sq_list, ksi, ksi_link); if (p1 != NULL) @@ -475,8 +473,7 @@ sigqueue_delete_set(sigqueue_t *sq, sigset_t *set) KASSERT(sq->sq_flags & SQ_INIT, ("src sigqueue not inited")); /* Remove siginfo queue */ - for (ksi = TAILQ_FIRST(&sq->sq_list); ksi != NULL; ksi = next) { - next = TAILQ_NEXT(ksi, ksi_link); + TAILQ_FOREACH_SAFE(ksi, &sq->sq_list, ksi_link, next) { if (SIGISMEMBER(*set, ksi->ksi_signo)) { TAILQ_REMOVE(&sq->sq_list, ksi, ksi_link); ksi->ksi_sigq = NULL;