From b2c31b685fd2cf28436ca32bc93e23eb24c74878 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Sun, 13 Dec 2020 21:47:40 +0100 Subject: misc: move to new pool_foreach macros Type: refactor Change-Id: Ie67dc579e88132ddb1ee4a34cb69f96920101772 Signed-off-by: Damjan Marion --- src/vcl/ldp.c | 4 ++-- src/vcl/vcl_locked.c | 8 ++++---- src/vcl/vppcom.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/vcl') diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index 73e44ba133f..0f2412bc70a 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -279,9 +279,9 @@ ldp_init (void) } /* *INDENT-OFF* */ - pool_foreach (ldpw, ldp->workers, ({ + pool_foreach (ldpw, ldp->workers) { clib_memset (&ldpw->clib_time, 0, sizeof (ldpw->clib_time)); - })); + } /* *INDENT-ON* */ LDBG (0, "LDP initialization: done!"); diff --git a/src/vcl/vcl_locked.c b/src/vcl/vcl_locked.c index d56a209d2cd..5beaecdfa4b 100644 --- a/src/vcl/vcl_locked.c +++ b/src/vcl/vcl_locked.c @@ -739,7 +739,7 @@ vls_share_sessions (vls_worker_t * vls_parent_wrk, vls_worker_t * vls_wrk) vcl_locked_session_t *vls, *parent_vls; /* *INDENT-OFF* */ - pool_foreach (vls, vls_wrk->vls_pool, ({ + pool_foreach (vls, vls_wrk->vls_pool) { /* Initialize sharing on parent session */ if (vls->shared_data_index == ~0) { @@ -748,7 +748,7 @@ vls_share_sessions (vls_worker_t * vls_parent_wrk, vls_worker_t * vls_wrk) vls->shared_data_index = parent_vls->shared_data_index; } vls_share_session (vls_wrk, vls); - })); + } /* *INDENT-ON* */ } @@ -1380,11 +1380,11 @@ vls_unshare_vcl_worker_sessions (vcl_worker_t * wrk) is_current = current_wrk == wrk->wrk_index; /* *INDENT-OFF* */ - pool_foreach (s, wrk->sessions, ({ + pool_foreach (s, wrk->sessions) { vls = vls_get (vls_si_wi_to_vlsh (s->session_index, wrk->wrk_index)); if (vls && (is_current || vls_is_shared_by_wrk (vls, current_wrk))) vls_unshare_session (vls, wrk); - })); + } /* *INDENT-ON* */ } diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index 9c99f66cf28..abad979f566 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -1284,10 +1284,10 @@ vppcom_app_destroy (void) current_wrk = vcl_worker_get_current (); /* *INDENT-OFF* */ - pool_foreach (wrk, vcm->workers, ({ + pool_foreach (wrk, vcm->workers) { if (current_wrk != wrk) vcl_worker_cleanup (wrk, 0 /* notify vpp */ ); - })); + } /* *INDENT-ON* */ vcl_api_detach (current_wrk); -- cgit 1.2.3-korg