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 /ospf6d/ospf6_spf.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 'ospf6d/ospf6_spf.c')
| -rw-r--r-- | ospf6d/ospf6_spf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index f9c47cbce5..2e8e9f2cdd 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -605,7 +605,7 @@ static void ospf6_spf_log_database(struct ospf6_area *oa) zlog_debug("%s", buffer); } -static int ospf6_spf_calculation_thread(struct thread *t) +static void ospf6_spf_calculation_thread(struct thread *t) { struct ospf6_area *oa; struct ospf6 *ospf6; @@ -681,7 +681,6 @@ static int ospf6_spf_calculation_thread(struct thread *t) ospf6->last_spf_reason = ospf6->spf_reason; ospf6_reset_spf_reason(ospf6); - return 0; } /* Add schedule for SPF calculation. To avoid frequenst SPF calc, we @@ -1245,7 +1244,7 @@ int ospf6_ase_calculate_route(struct ospf6 *ospf6, struct ospf6_lsa *lsa, return 0; } -static int ospf6_ase_calculate_timer(struct thread *t) +static void ospf6_ase_calculate_timer(struct thread *t) { struct ospf6 *ospf6; struct ospf6_lsa *lsa; @@ -1283,8 +1282,6 @@ static int ospf6_ase_calculate_timer(struct thread *t) ospf6_zebra_gr_disable(ospf6); ospf6->gr_info.finishing_restart = false; } - - return 0; } void ospf6_ase_calculate_timer_add(struct ospf6 *ospf6) |