diff options
Diffstat (limited to 'src/vcl')
| -rw-r--r-- | src/vcl/ldp.c | 11 | ||||
| -rw-r--r-- | src/vcl/vcl_locked.c | 4 | ||||
| -rw-r--r-- | src/vcl/vppcom.c | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index 0f2412bc70a..98ed4a9b1ab 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -632,7 +632,7 @@ ldp_select_init_maps (fd_set * __restrict original, memset (original, 0, n_bytes); /* *INDENT-OFF* */ - clib_bitmap_foreach (fd, *resultb, ({ + clib_bitmap_foreach (fd, *resultb) { if (fd > nfds) break; vlsh = ldp_fd_to_vlsh (fd); @@ -640,7 +640,7 @@ ldp_select_init_maps (fd_set * __restrict original, clib_bitmap_set_no_check (*libcb, fd, 1); else *vclb = clib_bitmap_set (*vclb, vlsh_to_session_index (vlsh), 1); - })); + } /* *INDENT-ON* */ si_bits_set = clib_bitmap_last_set (*vclb) + 1; @@ -662,7 +662,7 @@ ldp_select_vcl_map_to_libc (clib_bitmap_t * vclb, fd_set * __restrict libcb) return 0; /* *INDENT-OFF* */ - clib_bitmap_foreach (si, vclb, ({ + clib_bitmap_foreach (si, vclb) { vlsh = vls_session_index_to_vlsh (si); ASSERT (vlsh != VLS_INVALID_HANDLE); fd = ldp_vlsh_to_fd (vlsh); @@ -672,7 +672,7 @@ ldp_select_vcl_map_to_libc (clib_bitmap_t * vclb, fd_set * __restrict libcb) return -1; } FD_SET (fd, libcb); - })); + } /* *INDENT-ON* */ return 0; @@ -687,9 +687,8 @@ ldp_select_libc_map_merge (clib_bitmap_t * result, fd_set * __restrict libcb) return; /* *INDENT-OFF* */ - clib_bitmap_foreach (fd, result, ({ + clib_bitmap_foreach (fd, result) FD_SET ((int)fd, libcb); - })); /* *INDENT-ON* */ } diff --git a/src/vcl/vcl_locked.c b/src/vcl/vcl_locked.c index 5beaecdfa4b..f3136f9d2ae 100644 --- a/src/vcl/vcl_locked.c +++ b/src/vcl/vcl_locked.c @@ -1340,14 +1340,14 @@ vls_select_mp_checks (vcl_si_set * read_map) wrk = vcl_worker_get_current (); /* *INDENT-OFF* */ - clib_bitmap_foreach (si, read_map, ({ + clib_bitmap_foreach (si, read_map) { s = vcl_session_get (wrk, si); if (s->session_state == VCL_STATE_LISTEN) { vls = vls_get (vls_session_index_to_vlsh (si)); vls_mp_checks (vls, 1 /* is_add */); } - })); + } /* *INDENT-ON* */ } diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c index abad979f566..58c13c28763 100644 --- a/src/vcl/vppcom.c +++ b/src/vcl/vppcom.c @@ -2454,7 +2454,7 @@ vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, goto check_rd; /* *INDENT-OFF* */ - clib_bitmap_foreach (sid, wrk->wr_bitmap, ({ + clib_bitmap_foreach (sid, wrk->wr_bitmap) { if (!(session = vcl_session_get (wrk, sid))) { clib_bitmap_set_no_check ((uword*)write_map, sid, 1); @@ -2469,13 +2469,13 @@ vppcom_select (int n_bits, vcl_si_set * read_map, vcl_si_set * write_map, } else svm_fifo_add_want_deq_ntf (session->tx_fifo, SVM_FIFO_WANT_DEQ_NOTIF); - })); + } check_rd: if (!read_map) goto check_mq; - clib_bitmap_foreach (sid, wrk->rd_bitmap, ({ + clib_bitmap_foreach (sid, wrk->rd_bitmap) { if (!(session = vcl_session_get (wrk, sid))) { clib_bitmap_set_no_check ((uword*)read_map, sid, 1); @@ -2488,7 +2488,7 @@ check_rd: clib_bitmap_set_no_check ((uword*)read_map, sid, 1); bits_set++; } - })); + } /* *INDENT-ON* */ check_mq: |