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 /ospfd/ospf_zebra.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 'ospfd/ospf_zebra.c')
| -rw-r--r-- | ospfd/ospf_zebra.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index 66b7425a81..389d3647d0 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -524,7 +524,7 @@ bool ospf_external_default_routemap_apply_walk(struct ospf *ospf, * Function to originate or flush default after applying * route-map on all ei. */ -static int ospf_external_lsa_default_routemap_timer(struct thread *thread) +static void ospf_external_lsa_default_routemap_timer(struct thread *thread) { struct list *ext_list; struct ospf *ospf = THREAD_ARG(thread); @@ -545,7 +545,7 @@ static int ospf_external_lsa_default_routemap_timer(struct thread *thread) /* Nothing to be done here. */ if (IS_DEBUG_OSPF_DEFAULT_INFO) zlog_debug("Default originate info not present"); - return 0; + return; } /* For all the ei apply route-map */ @@ -570,8 +570,6 @@ static int ospf_external_lsa_default_routemap_timer(struct thread *thread) ospf_external_lsa_refresh(ospf, lsa, default_ei, true, false); else if (!ret && lsa) ospf_external_lsa_flush(ospf, DEFAULT_ROUTE, &default_ei->p, 0); - - return 1; } @@ -1522,7 +1520,7 @@ int ospf_distribute_list_out_unset(struct ospf *ospf, int type, } /* distribute-list update timer. */ -static int ospf_distribute_list_update_timer(struct thread *thread) +static void ospf_distribute_list_update_timer(struct thread *thread) { struct route_node *rn; struct external_info *ei; @@ -1532,7 +1530,7 @@ static int ospf_distribute_list_update_timer(struct thread *thread) struct ospf *ospf = THREAD_ARG(thread); if (ospf == NULL) - return 0; + return; ospf->t_distribute_update = NULL; @@ -1639,8 +1637,6 @@ static int ospf_distribute_list_update_timer(struct thread *thread) } if (default_refresh) ospf_external_lsa_refresh_default(ospf); - - return 0; } /* Update distribute-list and set timer to apply access-list. */ |