From 1746dfe06e77cf2b892eeaadc621ed28d824a09b Mon Sep 17 00:00:00 2001
From: cy <cy@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 14 May 2016 19:09:32 +0000
Subject: [PATCH] MFC r298030: Use NULL instead of 0 for pointer comparison.

git-svn-id: svn://svn.freebsd.org/base/stable/10@299749 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 contrib/ipfilter/bpf_filter.c                 | 6 +++---
 sys/contrib/ipfilter/netinet/ip_fil_freebsd.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/ipfilter/bpf_filter.c b/contrib/ipfilter/bpf_filter.c
index d75570e29..bd465761a 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/contrib/ipfilter/bpf_filter.c
@@ -132,7 +132,7 @@ m_xword(m, k, err)
 		return EXTRACT_LONG(cp);
 	}
 	m0 = m->m_next;
-	if (m0 == 0 || M_LEN(m0) + len - k < 4)
+	if (m0 == NULL || M_LEN(m0) + len - k < 4)
 		goto bad;
 	*err = 0;
 	np = MTOD(m0, u_char *);
@@ -168,7 +168,7 @@ m_xhalf(m, k, err)
 		return EXTRACT_SHORT(cp);
 	}
 	m0 = m->m_next;
-	if (m0 == 0)
+	if (m0 == NULL)
 		goto bad;
 	*err = 0;
 	return (cp[0] << 8) | MTOD(m0, u_char *)[0];
@@ -205,7 +205,7 @@ bpf_filter(pc, p, wirelen, buflen)
 	} else
 		m = NULL;
 
-	if (pc == 0)
+	if (pc == NULL)
 		/*
 		 * No filter means accept all.
 		 */
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
index f10699d27..6754ef313 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -742,7 +742,7 @@ ipf_fastroute(m0, mpp, fin, fdp)
 	*/
 	if (M_WRITABLE(m) == 0) {
 		m0 = m_dup(m, M_DONTWAIT);
-		if (m0 != 0) {
+		if (m0 != NULL) {
 			FREE_MB_T(m);
 			m = m0;
 			*mpp = m;
@@ -893,7 +893,7 @@ ipf_fastroute(m0, mpp, fin, fdp)
 #else
 		MGET(m, M_DONTWAIT, MT_HEADER);
 #endif
-		if (m == 0) {
+		if (m == NULL) {
 			m = m0;
 			error = ENOBUFS;
 			goto bad;
-- 
2.45.0