summaryrefslogtreecommitdiffstats
path: root/pimd/pim_igmp.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2022-02-23 01:04:25 +0100
committerDonald Sharp <sharpd@nvidia.com>2022-02-24 01:56:04 +0100
commitcc9f21da2218d95567eff1501482ce58e6600f54 (patch)
treed579c9754161d874bad6eb09c67821b65fb559ca /pimd/pim_igmp.c
parentMerge pull request #10621 from donaldsharp/cov_fun (diff)
downloadfrr-cc9f21da2218d95567eff1501482ce58e6600f54.tar.xz
frr-cc9f21da2218d95567eff1501482ce58e6600f54.zip
*: Change thread->func to return void instead of int
The int return value is never used. Modify the code base to just return a void instead. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'pimd/pim_igmp.c')
-rw-r--r--pimd/pim_igmp.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 512384d64..34268ecf9 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -40,7 +40,7 @@
#include "pim_zebra.h"
static void group_timer_off(struct gm_group *group);
-static int pim_igmp_general_query(struct thread *t);
+static void pim_igmp_general_query(struct thread *t);
/* This socket is used for TXing IGMP packets only, IGMP RX happens
* in pim_mroute_msg()
@@ -141,7 +141,7 @@ struct gm_sock *pim_igmp_sock_lookup_ifaddr(struct list *igmp_sock_list,
return NULL;
}
-static int pim_igmp_other_querier_expire(struct thread *t)
+static void pim_igmp_other_querier_expire(struct thread *t)
{
struct gm_sock *igmp;
@@ -166,8 +166,6 @@ static int pim_igmp_other_querier_expire(struct thread *t)
Query, Set Gen. Query. timer)
*/
pim_igmp_general_query(t);
-
- return 0;
}
void pim_igmp_other_querier_timer_on(struct gm_sock *igmp)
@@ -705,7 +703,7 @@ void pim_igmp_general_query_off(struct gm_sock *igmp)
}
/* Issue IGMP general query */
-static int pim_igmp_general_query(struct thread *t)
+static void pim_igmp_general_query(struct thread *t)
{
struct gm_sock *igmp;
struct in_addr dst_addr;
@@ -759,8 +757,6 @@ static int pim_igmp_general_query(struct thread *t)
igmp->querier_query_interval);
pim_igmp_general_query_on(igmp);
-
- return 0;
}
static void sock_close(struct gm_sock *igmp)
@@ -1027,7 +1023,7 @@ static struct gm_sock *igmp_sock_new(int fd, struct in_addr ifaddr,
static void igmp_read_on(struct gm_sock *igmp);
-static int pim_igmp_read(struct thread *t)
+static void pim_igmp_read(struct thread *t)
{
uint8_t buf[10000];
struct gm_sock *igmp = (struct gm_sock *)THREAD_ARG(t);
@@ -1053,7 +1049,6 @@ static int pim_igmp_read(struct thread *t)
done:
igmp_read_on(igmp);
- return 0;
}
static void igmp_read_on(struct gm_sock *igmp)
@@ -1123,7 +1118,7 @@ struct gm_sock *pim_igmp_sock_add(struct list *igmp_sock_list,
source records. Source records whose timers are zero (from the
previous EXCLUDE mode) are deleted.
*/
-static int igmp_group_timer(struct thread *t)
+static void igmp_group_timer(struct thread *t)
{
struct gm_group *group;
@@ -1157,8 +1152,6 @@ static int igmp_group_timer(struct thread *t)
if (listcount(group->group_source_list) < 1) {
igmp_group_delete_empty_include(group);
}
-
- return 0;
}
static void group_timer_off(struct gm_group *group)