diff options
| author | Christian Hopps <chopps@labn.net> | 2022-02-24 01:43:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 01:43:48 -0500 |
| commit | 7bf63db79b7848b73e1cef49f3496038644bea16 (patch) | |
| tree | 2c95921d910689673348e60f9614de7d9d00c4e7 /pimd/pim_pim.c | |
| parent | ca6c97340b013e140c0cb31737858f7c672b7dfb (diff) | |
| parent | cc9f21da2218d95567eff1501482ce58e6600f54 (diff) | |
Merge pull request #10632 from donaldsharp/thread_return_null
*: Change thread->func to return void instead of int
Diffstat (limited to 'pimd/pim_pim.c')
| -rw-r--r-- | pimd/pim_pim.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index 93ccfd78df..5cc0d63e31 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -42,7 +42,7 @@ #include "pim_errors.h" #include "pim_bsm.h" -static int on_pim_hello_send(struct thread *t); +static void on_pim_hello_send(struct thread *t); static const char *pim_pim_msgtype2str(enum pim_msg_type type) { @@ -326,7 +326,7 @@ int pim_pim_packet(struct interface *ifp, uint8_t *buf, size_t len) static void pim_sock_read_on(struct interface *ifp); -static int pim_sock_read(struct thread *t) +static void pim_sock_read(struct thread *t) { struct interface *ifp, *orig_ifp; struct pim_interface *pim_ifp; @@ -398,8 +398,6 @@ done: if (result) { ++pim_ifp->pim_ifstat_hello_recvfail; } - - return result; } static void pim_sock_read_on(struct interface *ifp) @@ -745,7 +743,7 @@ static void hello_resched(struct interface *ifp) /* Periodic hello timer */ -static int on_pim_hello_send(struct thread *t) +static void on_pim_hello_send(struct thread *t) { struct pim_interface *pim_ifp; struct interface *ifp; @@ -761,7 +759,7 @@ static int on_pim_hello_send(struct thread *t) /* * Send hello */ - return pim_hello_send(ifp, PIM_IF_DEFAULT_HOLDTIME(pim_ifp)); + pim_hello_send(ifp, PIM_IF_DEFAULT_HOLDTIME(pim_ifp)); } /* |