summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjulian <julian@FreeBSD.org>2001-08-19 04:30:13 +0000
committerjulian <julian@FreeBSD.org>2001-08-19 04:30:13 +0000
commitb753f3c491f356a2769a44e37d94c9e2d975d4cf (patch)
treecb1e9d42eef0b5b99f61d164f5b2b62986d3c6e4
parentd01d678e4da36081c27805c5ccb5b83ec528cfe9 (diff)
downloadFreeBSD-src-b753f3c491f356a2769a44e37d94c9e2d975d4cf.zip
FreeBSD-src-b753f3c491f356a2769a44e37d94c9e2d975d4cf.tar.gz
Forgot to remove this un-needed test. (M_WAITOK won't fail)
I vaguely remember someone once proving it COULD return NULL.. was that changed? Reminded by: BDE MFC after: 2 weeks
-rw-r--r--sys/kern/uipc_mbuf.c2
-rw-r--r--sys/kern/uipc_usrreq.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index d68299c..9944227 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -303,7 +303,7 @@ nospace:
* continuing for "len" bytes, into the indicated buffer.
*/
void
-m_copydata(struct mbuf *m, int off, int len, caddr_t cp)
+m_copydata(const struct mbuf *m, int off, int len, caddr_t cp)
{
unsigned count;
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index d21641f..043bc6b 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -855,8 +855,6 @@ unp_pcblist(SYSCTL_HANDLER_ARGS)
}
unp_list = malloc(n * sizeof *unp_list, M_TEMP, M_WAITOK);
- if (unp_list == 0)
- return ENOMEM;
for (unp = LIST_FIRST(head), i = 0; unp && i < n;
unp = LIST_NEXT(unp, unp_link)) {
OpenPOWER on IntegriCloud