From d88cc6469042c405baedcb17b7058f99c72287c2 Mon Sep 17 00:00:00 2001 From: Claudio Jeker Date: Fri, 9 Nov 2018 14:14:33 +0000 Subject: M_LEADINGSPACE() and M_TRAILINGSPACE() are just wrappers for m_leadingspace() and m_trailingspace(). Convert all callers to call directly the functions and remove the defines. OK krw@, mpi@ --- sys/net/ppp-deflate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/net/ppp-deflate.c') diff --git a/sys/net/ppp-deflate.c b/sys/net/ppp-deflate.c index 384e30a0f8e..05bdb5d2aa0 100644 --- a/sys/net/ppp-deflate.c +++ b/sys/net/ppp-deflate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp-deflate.c,v 1.14 2017/09/08 05:36:53 deraadt Exp $ */ +/* $OpenBSD: ppp-deflate.c,v 1.15 2018/11/09 14:14:31 claudio Exp $ */ /* $NetBSD: ppp-deflate.c,v 1.1 1996/03/15 02:28:09 paulus Exp $ */ /* @@ -258,7 +258,7 @@ z_compress(arg, mret, mp, orig_len, maxolen) m->m_len = 0; if (maxolen + state->hdrlen > MLEN) MCLGET(m, M_DONTWAIT); - wspace = M_TRAILINGSPACE(m); + wspace = m_trailingspace(m); if (state->hdrlen + PPP_HDRLEN + 2 < wspace) { m->m_data += state->hdrlen; wspace -= state->hdrlen; @@ -319,7 +319,7 @@ z_compress(arg, mret, mp, orig_len, maxolen) if (maxolen - olen > MLEN) MCLGET(m, M_DONTWAIT); state->strm.next_out = mtod(m, u_char *); - state->strm.avail_out = wspace = M_TRAILINGSPACE(m); + state->strm.avail_out = wspace = m_trailingspace(m); } } if (m == NULL) { @@ -518,7 +518,7 @@ z_decompress(arg, mi, mop) mo->m_len = 0; mo->m_next = NULL; MCLGET(mo, M_DONTWAIT); - ospace = M_TRAILINGSPACE(mo); + ospace = m_trailingspace(mo); if (state->hdrlen + PPP_HDRLEN < ospace) { mo->m_data += state->hdrlen; ospace -= state->hdrlen; @@ -594,7 +594,7 @@ z_decompress(arg, mi, mop) } MCLGET(mo, M_DONTWAIT); state->strm.next_out = mtod(mo, u_char *); - state->strm.avail_out = ospace = M_TRAILINGSPACE(mo); + state->strm.avail_out = ospace = m_trailingspace(mo); } } } -- cgit v1.2.3