diff options
| author | cy <cy@FreeBSD.org> | 2016-05-14 19:09:32 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2016-05-14 19:09:32 +0000 |
| commit | e70d0976c49bf148f03370b584d636bc7615b271 (patch) | |
| tree | 3a31f008ea4cd86863064b14eee081d35e848095 | |
| parent | c0fce3206c07db73705b223c4cb4ef41d586fbb7 (diff) | |
| download | FreeBSD-src-e70d0976c49bf148f03370b584d636bc7615b271.zip FreeBSD-src-e70d0976c49bf148f03370b584d636bc7615b271.tar.gz | |
MFC r298030: Use NULL instead of 0 for pointer comparison.
| -rw-r--r-- | contrib/ipfilter/bpf_filter.c | 6 | ||||
| -rw-r--r-- | 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 d75570e..bd46576 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 f10699d..6754ef3 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; |
