diff options
| author | Mark Stapp <mjs@voltanet.io> | 2021-05-03 11:17:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 11:17:36 -0400 |
| commit | f71e1ff6a98d0e244c7da11d870d14e31b517811 (patch) | |
| tree | 0657d1718fa1018c0e8aa3bea76266f9dd6677ad /pimd/pim_pim.c | |
| parent | 92046e65409fe0ba2935e886cfb778253d5d8d4e (diff) | |
| parent | 4f1a6d98da0703b066a1ae92dcac7c8f6ae3b1e6 (diff) | |
Merge pull request #8545 from opensourcerouting/assert-our-own
*: make our own assert() actually work
Diffstat (limited to 'pimd/pim_pim.c')
| -rw-r--r-- | pimd/pim_pim.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index 2ccff8b84a..4ba08a19d8 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -407,8 +407,8 @@ static void pim_sock_read_on(struct interface *ifp) { struct pim_interface *pim_ifp; - zassert(ifp); - zassert(ifp->info); + assert(ifp); + assert(ifp->info); pim_ifp = ifp->info; @@ -444,7 +444,7 @@ void pim_ifstat_reset(struct interface *ifp) { struct pim_interface *pim_ifp; - zassert(ifp); + assert(ifp); pim_ifp = ifp->info; if (!pim_ifp) { @@ -462,8 +462,8 @@ void pim_sock_reset(struct interface *ifp) { struct pim_interface *pim_ifp; - zassert(ifp); - zassert(ifp->info); + assert(ifp); + assert(ifp->info); pim_ifp = ifp->info; @@ -671,8 +671,8 @@ static int hello_send(struct interface *ifp, uint16_t holdtime) pim_msg_size = pim_tlv_size + PIM_PIM_MIN_LEN; - zassert(pim_msg_size >= PIM_PIM_MIN_LEN); - zassert(pim_msg_size <= PIM_PIM_BUFSIZE_WRITE); + assert(pim_msg_size >= PIM_PIM_MIN_LEN); + assert(pim_msg_size <= PIM_PIM_BUFSIZE_WRITE); pim_msg_build_header(pim_msg, pim_msg_size, PIM_MSG_TYPE_HELLO, false); @@ -846,7 +846,7 @@ int pim_sock_add(struct interface *ifp) uint32_t old_genid; pim_ifp = ifp->info; - zassert(pim_ifp); + assert(pim_ifp); if (pim_ifp->pim_sock_fd >= 0) { if (PIM_DEBUG_PIM_PACKETS) |