pimd: Remove unnecessary asserts

When we handle the thread arguments,
there is no need to assert.  As that
if they are wrong, we are going down
shortly anyways.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 29a241b277d64766dbd1a13a04b86bf86bc0b684..505d1f1ec1959ed16126c2d2700600bbf0bcfb9d 100644 (file)
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -516,12 +516,9 @@ static int on_assert_timer(struct thread *t)
   struct pim_ifchannel *ch;
   struct interface *ifp;
 
-  zassert(t);
   ch = THREAD_ARG(t);
-  zassert(ch);
 
   ifp = ch->interface;
-  zassert(ifp);
 
   if (PIM_DEBUG_PIM_TRACE) {
     zlog_debug("%s: (S,G)=%s timer expired on interface %s",

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 3be88553d0e91a2814e3d51e739791e2a1813a0e..ca1f2f6b4215b92aa681caf92260868fa219d1e4 100644 (file)
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -489,9 +489,7 @@ static int on_ifjoin_expiry_timer(struct thread *t)
 {
   struct pim_ifchannel *ch;
 
-  zassert(t);
   ch = THREAD_ARG(t);
-  zassert(ch);
 
   ch->t_ifjoin_expiry_timer = NULL;
 
@@ -510,9 +508,7 @@ static int on_ifjoin_prune_pending_timer(struct thread *t)
   struct interface *ifp;
   struct pim_interface *pim_ifp;
 
-  zassert(t);
   ch = THREAD_ARG(t);
-  zassert(ch);
 
   ch->t_ifjoin_prune_pending_timer = NULL;
 

diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 0ce12f1ad7139ad070d274711e6612e534958ac2..f47028b2baf7999e407b9044cd347a515a8f0f96 100644 (file)
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -153,9 +153,7 @@ static int pim_igmp_other_querier_expire(struct thread *t)
 {
   struct igmp_sock *igmp;
 
-  zassert(t);
   igmp = THREAD_ARG(t);
-  zassert(igmp);
 
   zassert(igmp->t_other_querier_timer);
   zassert(!igmp->t_igmp_query_timer);
@@ -598,11 +596,8 @@ static int pim_igmp_general_query(struct thread *t)
   struct pim_interface *pim_ifp;
   int    query_buf_size;
 
-  zassert(t);
-
   igmp = THREAD_ARG(t);
 
-  zassert(igmp);
   zassert(igmp->interface);
   zassert(igmp->interface->info);
 
@@ -898,9 +893,7 @@ static int igmp_group_timer(struct thread *t)
 {
   struct igmp_group *group;
 
-  zassert(t);
   group = THREAD_ARG(t);
-  zassert(group);
 
   if (PIM_DEBUG_IGMP_TRACE) {
     char group_str[INET_ADDRSTRLEN];

diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 706f708dd190067e3b76b841f3030865c10a66b9..2e23cdb10f4f3d905dc4e0f8e9e00be040c793fc 100644 (file)
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -115,9 +115,7 @@ static int igmp_source_timer(struct thread *t)
   struct igmp_source *source;
   struct igmp_group *group;
 
-  zassert(t);
   source = THREAD_ARG(t);
-  zassert(source);
 
   group = source->source_group;
 
@@ -1245,9 +1243,7 @@ static int igmp_group_retransmit(struct thread *t)
   int num_retransmit_sources_left;
   int send_with_sflag_set; /* boolean */
 
-  zassert(t);
   group = THREAD_ARG(t);
-  zassert(group);
 
   if (PIM_DEBUG_IGMP_TRACE) {
     char group_str[INET_ADDRSTRLEN];

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 9cd323a2d0a893b3fdf1ab661b04ea62cbd211af..57dc5550db054d10530240da858838d618de3745 100644 (file)
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -528,11 +528,8 @@ static int mroute_read(struct thread *t)
   int fd;
   int result;
 
-  zassert(t);
-  zassert(!THREAD_ARG(t));
 
   fd = THREAD_FD(t);
-  zassert(fd == qpim_mroute_socket_fd);
 
   result = mroute_read_msg(fd);
 

diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 9ca9244823746935906f108b8de7dbeab326a6a2..d8237469c879db7e47dbe8ece92d6c1125505b26 100644 (file)
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -106,9 +106,7 @@ pim_msdp_sa_state_timer_cb(struct thread *t)
 {
   struct pim_msdp_sa *sa;
 
-  zassert(t);
   sa = THREAD_ARG(t);
-  zassert(sa);
 
   if (PIM_DEBUG_MSDP_EVENTS) {
     pim_msdp_sa_timer_expiry_log(sa, "state");
@@ -595,9 +593,7 @@ pim_msdp_peer_hold_timer_cb(struct thread *t)
 {
   struct pim_msdp_peer *mp;
 
-  zassert(t);
   mp = THREAD_ARG(t);
-  zassert(mp);
 
   if (PIM_DEBUG_MSDP_EVENTS) {
     pim_msdp_peer_timer_expiry_log(mp, "hold");
@@ -630,9 +626,7 @@ pim_msdp_peer_ka_timer_cb(struct thread *t)
 {
   struct pim_msdp_peer *mp;
 
-  zassert(t);
   mp = THREAD_ARG(t);
-  zassert(mp);
 
   if (PIM_DEBUG_MSDP_EVENTS) {
     pim_msdp_peer_timer_expiry_log(mp, "ka");
@@ -695,9 +689,7 @@ pim_msdp_peer_cr_timer_cb(struct thread *t)
 {
   struct pim_msdp_peer *mp;
 
-  zassert(t);
   mp = THREAD_ARG(t);
-  zassert(mp);
 
   if (PIM_DEBUG_MSDP_EVENTS) {
     pim_msdp_peer_timer_expiry_log(mp, "connect-retry");

diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index abca6094216e052fd26d3b81e1104924d1da42b4..1b58b9850279f3ab0cd001f250383933173fea67 100644 (file)
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -211,9 +211,7 @@ static int on_neighbor_timer(struct thread *t)
   struct interface *ifp;
   char msg[100];
 
-  zassert(t);
   neigh = THREAD_ARG(t);
-  zassert(neigh);
 
   ifp = neigh->interface;
 

diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 1e71b0ad781fea48e1bc4070a4a3508cce170458..80e69e276ba697ee9a1ea930f56847c56160f9e0 100644 (file)
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -295,11 +295,7 @@ static int pim_sock_read(struct thread *t)
   ifindex_t ifindex = -1;
   int result = -1; /* defaults to bad */
 
-  zassert(t);
-
   ifp = THREAD_ARG(t);
-  zassert(ifp);
-
   fd = THREAD_FD(t);
 
   pim_ifp = ifp->info;
@@ -695,9 +691,7 @@ static int on_pim_hello_send(struct thread *t)
   struct pim_interface *pim_ifp;
   struct interface *ifp;
 
-  zassert(t);
   ifp = THREAD_ARG(t);
-  zassert(ifp);
 
   pim_ifp = ifp->info;
 

diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index 3d08552de8d187cc5a6a72988536987d09adfd22..d308d80e3a64a060914b7edeb6bba07456da807d 100644 (file)
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -315,10 +315,7 @@ static int ssmpingd_sock_read(struct thread *t)
   int sock_fd;
   int result;
 
-  zassert(t);
-
   ss = THREAD_ARG(t);
-  zassert(ss);
 
   sock_fd = THREAD_FD(t);
   zassert(sock_fd == ss->sock_fd);

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 3cfe0887efa7c2a0bbc8cded354b666a5ebe795e..b3b6fdce21065e401f6e439b76a24759a3de6ac9 100644 (file)
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -243,9 +243,7 @@ static int on_join_timer(struct thread *t)
 {
   struct pim_upstream *up;
 
-  zassert(t);
   up = THREAD_ARG(t);
-  zassert(up);
 
   up->t_join_timer = NULL;
 

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index a92d55b2afb6ae420c15de678a4817c0a052416d..815fbbd2d3f779a026b10fd37ed20554bfe13ac7 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -531,7 +531,6 @@ void pim_scan_oil()
 
 static int on_rpf_cache_refresh(struct thread *t)
 {
-  zassert(t);
   zassert(qpim_rpf_cache_refresher);
 
   qpim_rpf_cache_refresher = 0;