summaryrefslogtreecommitdiff
path: root/sys/compat/ultrix/ultrix_misc.c
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2001-05-16 12:50:22 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2001-05-16 12:50:22 +0000
commita1ba5f046489f61451990b86f39a64f15b7a177a (patch)
tree592ed6a3cf10a0b29b117e9b3506d9e32bf50813 /sys/compat/ultrix/ultrix_misc.c
parent885c6fa9e2c5dae9c5fbc277bc5b7018e4d78ac8 (diff)
No need to check M_WAIT/M_WAITOK malloc return values. (art@ ok)
Diffstat (limited to 'sys/compat/ultrix/ultrix_misc.c')
-rw-r--r--sys/compat/ultrix/ultrix_misc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index 5afb61b3363..7e8f7c560f7 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ultrix_misc.c,v 1.17 2001/05/05 21:26:44 art Exp $ */
+/* $OpenBSD: ultrix_misc.c,v 1.18 2001/05/16 12:50:21 ho Exp $ */
/* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */
/*
@@ -372,8 +372,6 @@ ultrix_sys_setsockopt(p, v, retval)
#define SO_DONTLINGER (~SO_LINGER)
if (SCARG(uap, name) == SO_DONTLINGER) {
m = m_get(M_WAIT, MT_SOOPTS);
- if (m == NULL)
- return (ENOBUFS);
mtod(m, struct linger *)->l_onoff = 0;
m->m_len = sizeof(struct linger);
return (sosetopt((struct socket *)fp->f_data, SCARG(uap, level),
@@ -383,8 +381,6 @@ ultrix_sys_setsockopt(p, v, retval)
return (EINVAL);
if (SCARG(uap, val)) {
m = m_get(M_WAIT, MT_SOOPTS);
- if (m == NULL)
- return (ENOBUFS);
if ((error = copyin(SCARG(uap, val), mtod(m, caddr_t),
(u_int)SCARG(uap, valsize))) != 0) {
(void) m_free(m);