diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-07-15 17:55:08 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-07-15 17:55:08 +0000 |
| commit | 5cfe07714132d00e687dc9a48ff08a04ca986de0 (patch) | |
| tree | 42a1427d9751926ee4771287f6a3d47dbfb50e5b | |
| parent | Simplify the error path of the previous commit: by using ret = -1 by (diff) | |
| download | wireguard-openbsd-5cfe07714132d00e687dc9a48ff08a04ca986de0.tar.xz wireguard-openbsd-5cfe07714132d00e687dc9a48ff08a04ca986de0.zip | |
rename mbuf ** parameter from m to mp, to match other similar code
| -rw-r--r-- | sys/netinet/ip_mroute.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index a74c49f5c55..19ebc85000d 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.78 2015/06/30 15:30:17 mpi Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.79 2015/07/15 17:55:08 deraadt Exp $ */ /* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */ /* @@ -326,7 +326,7 @@ mfc_find(struct in_addr *o, struct in_addr *g) * Handle MRT setsockopt commands to modify the multicast routing tables. */ int -ip_mrouter_set(struct socket *so, int optname, struct mbuf **m) +ip_mrouter_set(struct socket *so, int optname, struct mbuf **mp) { int error; @@ -335,36 +335,36 @@ ip_mrouter_set(struct socket *so, int optname, struct mbuf **m) else switch (optname) { case MRT_INIT: - error = ip_mrouter_init(so, *m); + error = ip_mrouter_init(so, *mp); break; case MRT_DONE: error = ip_mrouter_done(); break; case MRT_ADD_VIF: - error = add_vif(*m); + error = add_vif(*mp); break; case MRT_DEL_VIF: - error = del_vif(*m); + error = del_vif(*mp); break; case MRT_ADD_MFC: - error = add_mfc(*m); + error = add_mfc(*mp); break; case MRT_DEL_MFC: - error = del_mfc(*m); + error = del_mfc(*mp); break; case MRT_ASSERT: - error = set_assert(*m); + error = set_assert(*mp); break; case MRT_API_CONFIG: - error = set_api_config(*m); + error = set_api_config(*mp); break; default: error = ENOPROTOOPT; break; } - if (*m) - m_free(*m); + if (*mp) + m_free(*mp); return (error); } @@ -372,27 +372,27 @@ ip_mrouter_set(struct socket *so, int optname, struct mbuf **m) * Handle MRT getsockopt commands */ int -ip_mrouter_get(struct socket *so, int optname, struct mbuf **m) +ip_mrouter_get(struct socket *so, int optname, struct mbuf **mp) { int error; if (so != ip_mrouter) error = ENOPROTOOPT; else { - *m = m_get(M_WAIT, MT_SOOPTS); + *mp = m_get(M_WAIT, MT_SOOPTS); switch (optname) { case MRT_VERSION: - error = get_version(*m); + error = get_version(*mp); break; case MRT_ASSERT: - error = get_assert(*m); + error = get_assert(*mp); break; case MRT_API_SUPPORT: - error = get_api_support(*m); + error = get_api_support(*mp); break; case MRT_API_CONFIG: - error = get_api_config(*m); + error = get_api_config(*mp); break; default: error = ENOPROTOOPT; @@ -400,7 +400,7 @@ ip_mrouter_get(struct socket *so, int optname, struct mbuf **m) } if (error) - m_free(*m); + m_free(*mp); } return (error); |