summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--pimd/pim_assert.c3
-rw-r--r--pimd/pim_ifchannel.c4
-rw-r--r--pimd/pim_igmp.c7
-rw-r--r--pimd/pim_igmpv3.c4
-rw-r--r--pimd/pim_mroute.c3
-rw-r--r--pimd/pim_msdp.c8
-rw-r--r--pimd/pim_neighbor.c2
-rw-r--r--pimd/pim_pim.c6
-rw-r--r--pimd/pim_ssmpingd.c3
-rw-r--r--pimd/pim_upstream.c2
-rw-r--r--pimd/pim_zebra.c1
11 files changed, 0 insertions, 43 deletions
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 29a241b27..505d1f1ec 100644
--- 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 3be88553d..ca1f2f6b4 100644
--- 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 0ce12f1ad..f47028b2b 100644
--- 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 706f708dd..2e23cdb10 100644
--- 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 9cd323a2d..57dc5550d 100644
--- 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 9ca924482..d8237469c 100644
--- 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 abca60942..1b58b9850 100644
--- 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 1e71b0ad7..80e69e276 100644
--- 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 3d08552de..d308d80e3 100644
--- 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 3cfe0887e..b3b6fdce2 100644
--- 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 a92d55b2a..815fbbd2d 100644
--- 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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 07:04:11 +0100