summaryrefslogtreecommitdiffstats
path: root/sys/netinet6
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2003-12-23 02:36:43 +0000
committerpeter <peter@FreeBSD.org>2003-12-23 02:36:43 +0000
commit7cc77e03ae647ad532a0a4b708811e38ed15c9e4 (patch)
treed22ef24bdd562f18d9dfc77f257b3dd71335c80f /sys/netinet6
parent409dd19ac040f6465a4e73882c919f0dc679c18e (diff)
downloadFreeBSD-src-7cc77e03ae647ad532a0a4b708811e38ed15c9e4.zip
FreeBSD-src-7cc77e03ae647ad532a0a4b708811e38ed15c9e4.tar.gz
Catch a few places where NULL (pointer) was used where 0 (integer) was
expected.
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/in6_src.c2
-rw-r--r--sys/netinet6/ip6_mroute.c2
-rw-r--r--sys/netinet6/ip6_output.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 88ace1c..ab513a8 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -640,7 +640,7 @@ in6_selectroute(dstsock, opts, mopts, ro, retifp, retrt, clone)
rtalloc((struct route *)ro);
} else {
ro->ro_rt = rtalloc1(&((struct route *)ro)
- ->ro_dst, NULL, 0UL);
+ ->ro_dst, 0, 0UL);
if (ro->ro_rt)
RT_UNLOCK(ro->ro_rt);
}
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index a68237e..95872b8 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1857,7 +1857,7 @@ pim6_input(mp, offp, proto)
#endif
rc = if_simloop(mif6table[reg_mif_num].m6_ifp, m,
- dst.sin6_family, NULL);
+ dst.sin6_family, 0);
/* prepare the register head to send to the mrouting daemon */
m = mcp;
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 99addae..55dbd03 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1481,10 +1481,10 @@ ip6_ctloutput(so, sopt)
struct mbuf *m;
error = soopt_getm(sopt, &m); /* XXX */
- if (error != NULL)
+ if (error != 0)
break;
error = soopt_mcopyin(sopt, m); /* XXX */
- if (error != NULL)
+ if (error != 0)
break;
error = ip6_pcbopts(&in6p->in6p_outputopts,
m, so, sopt);
@@ -3405,7 +3405,7 @@ ip6_mloopback(ifp, m, dst)
in6_clearscope(&ip6->ip6_src);
in6_clearscope(&ip6->ip6_dst);
- (void)if_simloop(ifp, copym, dst->sin6_family, NULL);
+ (void)if_simloop(ifp, copym, dst->sin6_family, 0);
}
/*
OpenPOWER on IntegriCloud