d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Change the newly turned INVARIANTS #ifdef blocks (they were changed from

Browse Source 
DIAGNOSTIC yesterday) into KASSERT()'s as these help to increase code
  readability.
This commit is contained in:
Andrew R. Reiter 2002-05-21 18:52:24 +00:00
parent 720bbc8244
commit db40007d42
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netinet/if_atm.c
View File

@ -125,11 +125,8 @@ atm_rtrequest(req, rt, info)
break;
}
#ifdef INVARIANTS
if (rt->rt_ifp->if_ioctl == NULL)
panic("atm_rtrequest: atm null ioctl");
#endif
KASSERT(rt->rt_ifp->if_ioctl != NULL,
("atm_rtrequest: null ioctl"));
#ifdef NATM
/*
* let native ATM know we are using this VCI/VPI

7
sys/netinet/ip_input.c
View File

@ -309,10 +309,9 @@ ip_input(struct mbuf *m)
} else
rule = NULL ;
#ifdef INVARIANTS
if (m == NULL || (m->m_flags & M_PKTHDR) == 0)
panic("ip_input no HDR");
#endif
KASSERT(m != NULL && (m->m_flags & M_PKTHDR) != 0,
("ip_input: no HDR"));
ipstat.ips_total++;
if (m->m_pkthdr.len < sizeof(struct ip))

26
sys/netinet/ip_output.c
View File

@ -186,13 +186,11 @@ ip_output(m0, opt, ro, flags, imo)
(void)ipsec_setsocket(m, NULL);
#endif
#ifdef INVARIANTS
if ((m->m_flags & M_PKTHDR) == 0)
panic("ip_output no HDR");
if (!ro)
panic("ip_output no route, proto = %d",
mtod(m, struct ip *)->ip_p);
#endif
KASSERT((m->m_flags & M_PKTHDR) != 0, ("ip_output: no HDR"));
KASSERT(ro != NULL, ("ip_output: no route, proto %d",
mtod(m, struct ip *)->ip_p));
if (opt) {
m = ip_insertoptions(m, opt, &len);
hlen = len;
@ -1111,15 +1109,13 @@ ip_optcopy(ip, jp)
optlen = 1;
continue;
}
#ifdef INVARIANTS
if (cnt < IPOPT_OLEN + sizeof(*cp))
panic("malformed IPv4 option passed to ip_optcopy");
#endif
KASSERT(cnt >= IPOPT_OLEN + sizeof(*cp),
("ip_optcopy: malformed ipv4 option"));
optlen = cp[IPOPT_OLEN];
#ifdef INVARIANTS
if (optlen < IPOPT_OLEN + sizeof(*cp) || optlen > cnt)
panic("malformed IPv4 option passed to ip_optcopy");
#endif
KASSERT(optlen >= IPOPT_OLEN + sizeof(*cp) && optlen <= cnt,
("ip_optcopy: malformed ipv4 option"));
/* bogus lengths should have been caught by ip_dooptions */
if (optlen > cnt)
optlen = cnt;