diff options
| author | alfred <alfred@FreeBSD.org> | 2002-06-29 00:29:12 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2002-06-29 00:29:12 +0000 |
| commit | 8cd894ca7009ef10fdf67d1a9583636aaf3b2c6f (patch) | |
| tree | 02c07184de3f283201ad58d9e78c7c346fa4003b /sys/kern/uipc_sockbuf.c | |
| parent | d47feb4376b0a9a2ebcf2bf3b98fdbb1e8c5cc49 (diff) | |
| download | FreeBSD-src-8cd894ca7009ef10fdf67d1a9583636aaf3b2c6f.zip FreeBSD-src-8cd894ca7009ef10fdf67d1a9583636aaf3b2c6f.tar.gz | |
More caddr_t removal.
Change struct knote's kn_hook from caddr_t to void *.
Diffstat (limited to 'sys/kern/uipc_sockbuf.c')
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index a9a4162..1e68f83 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -145,7 +145,7 @@ soisdisconnecting(so) so->so_state &= ~SS_ISCONNECTING; so->so_state |= (SS_ISDISCONNECTING|SS_CANTRCVMORE|SS_CANTSENDMORE); - wakeup((caddr_t)&so->so_timeo); + wakeup(&so->so_timeo); sowwakeup(so); sorwakeup(so); } @@ -157,7 +157,7 @@ soisdisconnected(so) so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state |= (SS_CANTRCVMORE|SS_CANTSENDMORE|SS_ISDISCONNECTED); - wakeup((caddr_t)&so->so_timeo); + wakeup(&so->so_timeo); sowwakeup(so); sorwakeup(so); } @@ -216,7 +216,7 @@ sonewconn(head, connstatus) } if (connstatus) { sorwakeup(head); - wakeup((caddr_t)&head->so_timeo); + wakeup(&head->so_timeo); so->so_state |= connstatus; } return (so); @@ -259,7 +259,7 @@ sbwait(sb) { sb->sb_flags |= SB_WAIT; - return (tsleep((caddr_t)&sb->sb_cc, + return (tsleep(&sb->sb_cc, (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK | PCATCH, "sbwait", sb->sb_timeo)); } @@ -276,7 +276,7 @@ sb_lock(sb) while (sb->sb_flags & SB_LOCK) { sb->sb_flags |= SB_WANT; - error = tsleep((caddr_t)&sb->sb_flags, + error = tsleep(&sb->sb_flags, (sb->sb_flags & SB_NOINTR) ? PSOCK : PSOCK|PCATCH, "sblock", 0); if (error) @@ -301,7 +301,7 @@ sowakeup(so, sb) sb->sb_flags &= ~SB_SEL; if (sb->sb_flags & SB_WAIT) { sb->sb_flags &= ~SB_WAIT; - wakeup((caddr_t)&sb->sb_cc); + wakeup(&sb->sb_cc); } if ((so->so_state & SS_ASYNC) && so->so_sigio != NULL) pgsigio(&so->so_sigio, SIGIO, 0); @@ -605,7 +605,7 @@ sbappendaddr(sb, asa, m0, control) if (m == 0) return (0); m->m_len = asa->sa_len; - bcopy((caddr_t)asa, mtod(m, caddr_t), asa->sa_len); + bcopy(asa, mtod(m, caddr_t), asa->sa_len); if (n) n->m_next = m0; /* concatenate data to control */ else |
