diff options
| author | Christian Hopps <chopps@labn.net> | 2022-02-24 07:43:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 07:43:48 +0100 |
| commit | 7bf63db79b7848b73e1cef49f3496038644bea16 (patch) | |
| tree | 2c95921d910689673348e60f9614de7d9d00c4e7 /pimd/pim_ifchannel.c | |
| parent | Merge pull request #10628 from anlancs/pimd-minors (diff) | |
| parent | *: Change thread->func to return void instead of int (diff) | |
| download | frr-7bf63db79b7848b73e1cef49f3496038644bea16.tar.xz frr-7bf63db79b7848b73e1cef49f3496038644bea16.zip | |
Merge pull request #10632 from donaldsharp/thread_return_null
*: Change thread->func to return void instead of int
Diffstat (limited to 'pimd/pim_ifchannel.c')
| -rw-r--r-- | pimd/pim_ifchannel.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index b3573e29e..3079c25a1 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -644,7 +644,7 @@ static void ifjoin_to_noinfo(struct pim_ifchannel *ch) delete_on_noinfo(ch); } -static int on_ifjoin_expiry_timer(struct thread *t) +static void on_ifjoin_expiry_timer(struct thread *t) { struct pim_ifchannel *ch; @@ -656,11 +656,9 @@ static int on_ifjoin_expiry_timer(struct thread *t) ifjoin_to_noinfo(ch); /* ch may have been deleted */ - - return 0; } -static int on_ifjoin_prune_pending_timer(struct thread *t) +static void on_ifjoin_prune_pending_timer(struct thread *t) { struct pim_ifchannel *ch; int send_prune_echo; /* boolean */ @@ -726,8 +724,6 @@ static int on_ifjoin_prune_pending_timer(struct thread *t) } /* from here ch may have been deleted */ } - - return 0; } static void check_recv_upstream(int is_join, struct interface *recv_ifp, |