summaryrefslogtreecommitdiff
path: root/zebra/zebra_rib.c
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2022-02-24 01:43:48 -0500
committerGitHub <noreply@github.com>2022-02-24 01:43:48 -0500
commit7bf63db79b7848b73e1cef49f3496038644bea16 (patch)
tree2c95921d910689673348e60f9614de7d9d00c4e7 /zebra/zebra_rib.c
parentca6c97340b013e140c0cb31737858f7c672b7dfb (diff)
parentcc9f21da2218d95567eff1501482ce58e6600f54 (diff)
Merge pull request #10632 from donaldsharp/thread_return_null
*: Change thread->func to return void instead of int
Diffstat (limited to 'zebra/zebra_rib.c')
-rw-r--r--zebra/zebra_rib.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index eb9b80fcef..c386fc4871 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -3948,7 +3948,7 @@ static void rib_update_ctx_fini(struct rib_update_ctx **ctx)
XFREE(MTYPE_RIB_UPDATE_CTX, *ctx);
}
-static int rib_update_handler(struct thread *thread)
+static void rib_update_handler(struct thread *thread)
{
struct rib_update_ctx *ctx;
@@ -3960,8 +3960,6 @@ static int rib_update_handler(struct thread *thread)
rib_update_handle_vrf(ctx->vrf_id, ctx->event, ZEBRA_ROUTE_ALL);
rib_update_ctx_fini(&ctx);
-
- return 0;
}
/*
@@ -4055,7 +4053,7 @@ void rib_sweep_table(struct route_table *table)
}
/* Sweep all RIB tables. */
-int rib_sweep_route(struct thread *t)
+void rib_sweep_route(struct thread *t)
{
struct vrf *vrf;
struct zebra_vrf *zvrf;
@@ -4070,8 +4068,6 @@ int rib_sweep_route(struct thread *t)
zebra_router_sweep_route();
zebra_router_sweep_nhgs();
-
- return 0;
}
/* Remove specific by protocol routes from 'table'. */
@@ -4181,7 +4177,7 @@ done:
* Handle results from the dataplane system. Dequeue update context
* structs, dispatch to appropriate internal handlers.
*/
-static int rib_process_dplane_results(struct thread *thread)
+static void rib_process_dplane_results(struct thread *thread)
{
struct zebra_dplane_ctx *ctx;
struct dplane_ctx_q ctxlist;
@@ -4349,8 +4345,6 @@ static int rib_process_dplane_results(struct thread *thread)
}
} while (1);
-
- return 0;
}
/*