summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormvs <mvs@cvs.openbsd.org>2021-02-23 11:43:42 +0000
committermvs <mvs@cvs.openbsd.org>2021-02-23 11:43:42 +0000
commit576d89a739a6c2709fd34486ea54b923e2802f7d (patch)
tree8fe10c9d9b6da6dcf3ac5325039f140008a8601a
parent21a5243843fac6353f746e40c882bfabf580d043 (diff)
Use NULL instead of 0 in `m_nextpkt' assignment.
ok deraadt@ dlg@
-rw-r--r--sys/net/pf.c4
-rw-r--r--sys/netinet/ip_output.c4
-rw-r--r--sys/netinet6/ip6_output.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index d1b1eb3442a..fc76da389cf 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.1111 2021/02/16 03:12:32 dlg Exp $ */
+/* $OpenBSD: pf.c,v 1.1112 2021/02/23 11:43:40 mvs Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -6087,7 +6087,7 @@ pf_route(struct pf_pdesc *pd, struct pf_state *s)
for (m0 = m1; m0; m0 = m1) {
m1 = m0->m_nextpkt;
- m0->m_nextpkt = 0;
+ m0->m_nextpkt = NULL;
if (error == 0)
error = ifp->if_output(ifp, m0, sintosa(dst), rt);
else
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 374c768cb30..306504fc2f6 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_output.c,v 1.365 2021/02/10 18:28:06 bluhm Exp $ */
+/* $OpenBSD: ip_output.c,v 1.366 2021/02/23 11:43:41 mvs Exp $ */
/* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */
/*
@@ -518,7 +518,7 @@ sendit:
for (; m; m = m0) {
m0 = m->m_nextpkt;
- m->m_nextpkt = 0;
+ m->m_nextpkt = NULL;
if (error == 0)
error = ifp->if_output(ifp, m, sintosa(dst), ro->ro_rt);
else
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 67972c0d72b..79add8aa7f5 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.253 2021/02/02 17:55:12 claudio Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.254 2021/02/23 11:43:41 mvs Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -753,11 +753,11 @@ reroute:
* Remove leading garbages.
*/
m = m0->m_nextpkt;
- m0->m_nextpkt = 0;
+ m0->m_nextpkt = NULL;
m_freem(m0);
for (m0 = m; m; m = m0) {
m0 = m->m_nextpkt;
- m->m_nextpkt = 0;
+ m->m_nextpkt = NULL;
if (error == 0) {
ip6stat_inc(ip6s_ofragments);
error = ifp->if_output(ifp, m, sin6tosa(dst),