pimd: zassert => assert

No point in having pimd use zassert() while everything else uses plain
assert().

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 16 insertions, 16 deletions

diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 167aa3c604..1c97a2c9c9 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -49,7 +49,7 @@ static void dr_election_by_addr(struct interface *ifp)
 	struct pim_neighbor *neigh;
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	pim_ifp->pim_dr_addr = pim_ifp->primary_address;
 
@@ -73,7 +73,7 @@ static void dr_election_by_pri(struct interface *ifp)
 	uint32_t dr_pri;
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	pim_ifp->pim_dr_addr = pim_ifp->primary_address;
 	dr_pri = pim_ifp->pim_dr_priority;
@@ -310,9 +310,9 @@ pim_neighbor_new(struct interface *ifp, struct in_addr source_addr,
 	struct pim_neighbor *neigh;
 	char src_str[INET_ADDRSTRLEN];
 
-	zassert(ifp);
+	assert(ifp);
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	neigh = XCALLOC(MTYPE_PIM_NEIGHBOR, sizeof(*neigh));
 
@@ -412,7 +412,7 @@ static void delete_prefix_list(struct pim_neighbor *neigh)
 
 void pim_neighbor_free(struct pim_neighbor *neigh)
 {
-	zassert(!neigh->t_expire_timer);
+	assert(!neigh->t_expire_timer);
 
 	delete_prefix_list(neigh);
 
@@ -504,7 +504,7 @@ pim_neighbor_add(struct interface *ifp, struct in_addr source_addr,
 	}
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	listnode_add(pim_ifp->pim_neighbor_list, neigh);
 
@@ -567,7 +567,7 @@ static uint16_t find_neighbors_next_highest_propagation_delay_msec(
 	uint16_t next_highest_delay_msec;
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	next_highest_delay_msec = pim_ifp->pim_propagation_delay_msec;
 
@@ -591,7 +591,7 @@ static uint16_t find_neighbors_next_highest_override_interval_msec(
 	uint16_t next_highest_interval_msec;
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	next_highest_interval_msec = pim_ifp->pim_override_interval_msec;
 
@@ -614,7 +614,7 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh,
 	char src_str[INET_ADDRSTRLEN];
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	pim_inet4_dump("<src?>", neigh->source_addr, src_str, sizeof(src_str));
 	zlog_info("PIM NEIGHBOR DOWN: neighbor %s on interface %s: %s", src_str,
@@ -638,10 +638,10 @@ void pim_neighbor_delete(struct interface *ifp, struct pim_neighbor *neigh,
 		--pim_ifp->pim_dr_num_nondrpri_neighbors;
 	}
 
-	zassert(neigh->propagation_delay_msec
-		<= pim_ifp->pim_neighbors_highest_propagation_delay_msec);
-	zassert(neigh->override_interval_msec
-		<= pim_ifp->pim_neighbors_highest_override_interval_msec);
+	assert(neigh->propagation_delay_msec
+	       <= pim_ifp->pim_neighbors_highest_propagation_delay_msec);
+	assert(neigh->override_interval_msec
+	       <= pim_ifp->pim_neighbors_highest_override_interval_msec);
 
 	if (pim_if_lan_delay_enabled(ifp)) {
 
@@ -687,7 +687,7 @@ void pim_neighbor_delete_all(struct interface *ifp, const char *delete_message)
 	struct pim_neighbor *neigh;
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
 	for (ALL_LIST_ELEMENTS(pim_ifp->pim_neighbor_list, neigh_node,
 			       neigh_nextnode, neigh)) {
@@ -732,9 +732,9 @@ static void delete_from_neigh_addr(struct interface *ifp,
 	struct pim_interface *pim_ifp;
 
 	pim_ifp = ifp->info;
-	zassert(pim_ifp);
+	assert(pim_ifp);
 
-	zassert(addr_list);
+	assert(addr_list);
 
 	/*
 	  Scan secondary address list