svn commit: r298030 - in head: contrib/ipfilter sys/contrib/ipfilter/netinet
Cy Schubert
cy at FreeBSD.org
Fri Apr 15 03:43:18 UTC 2016
Author: cy
Date: Fri Apr 15 03:43:16 2016
New Revision: 298030
URL: https://svnweb.freebsd.org/changeset/base/298030
Log:
Use NULL instead of 0 for pointer comparison.
MFC after: 4 weeks
Modified:
head/contrib/ipfilter/bpf_filter.c
head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
Modified: head/contrib/ipfilter/bpf_filter.c
==============================================================================
--- head/contrib/ipfilter/bpf_filter.c Fri Apr 15 03:42:12 2016 (r298029)
+++ head/contrib/ipfilter/bpf_filter.c Fri Apr 15 03:43:16 2016 (r298030)
@@ -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.
*/
Modified: head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Fri Apr 15 03:42:12 2016 (r298029)
+++ head/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Fri Apr 15 03:43:16 2016 (r298030)
@@ -738,7 +738,7 @@ ipf_fastroute(m0, mpp, fin, fdp)
*/
if (M_WRITABLE(m) == 0) {
m0 = m_dup(m, M_NOWAIT);
- if (m0 != 0) {
+ if (m0 != NULL) {
FREE_MB_T(m);
m = m0;
*mpp = m;
@@ -885,7 +885,7 @@ ipf_fastroute(m0, mpp, fin, fdp)
#else
MGET(m, M_NOWAIT, MT_HEADER);
#endif
- if (m == 0) {
+ if (m == NULL) {
m = m0;
error = ENOBUFS;
goto bad;
More information about the svn-src-head
mailing list