From c3148b1be8f519c80c4417c21b978dfef72b351b Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 12 Mar 2024 17:42:49 +0100 Subject: misc: remove GNU Indent directives Type: refactor Change-Id: I5235bf3e9aff58af6ba2c14e8c6529c4fc9ec86c Signed-off-by: Damjan Marion --- src/plugins/gre/gre.c | 4 ---- src/plugins/gre/gre.h | 4 ---- src/plugins/gre/gre_api.c | 6 ------ src/plugins/gre/interface.c | 6 ------ src/plugins/gre/node.c | 2 -- 5 files changed, 22 deletions(-) (limited to 'src/plugins/gre') diff --git a/src/plugins/gre/gre.c b/src/plugins/gre/gre.c index a15717475f8..ce11ee9ecb2 100644 --- a/src/plugins/gre/gre.c +++ b/src/plugins/gre/gre.c @@ -666,7 +666,6 @@ VLIB_NODE_FN (gre_erspan_encap_node) return (gre_encap_inline (vm, node, frame, GRE_TUNNEL_TYPE_ERSPAN)); } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (gre_teb_encap_node) = { .name = "gre-teb-encap", @@ -693,7 +692,6 @@ VLIB_REGISTER_NODE (gre_erspan_encap_node) = [GRE_ENCAP_NEXT_L2_MIDCHAIN] = "adj-l2-midchain", }, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT static u8 * @@ -743,7 +741,6 @@ gre_tunnel_desc (u32 sw_if_index, ip46_address_t *src, ip46_address_t *dst, return (0); } -/* *INDENT-OFF* */ VNET_DEVICE_CLASS (gre_device_class) = { .name = "GRE tunnel device", .format_device_name = format_gre_tunnel_name, @@ -774,7 +771,6 @@ VNET_HW_INTERFACE_CLASS (mgre_hw_interface_class) = { .update_adjacency = mgre_update_adj, .flags = VNET_HW_INTERFACE_CLASS_FLAG_NBMA, }; -/* *INDENT-ON* */ #endif /* CLIB_MARCH_VARIANT */ static void diff --git a/src/plugins/gre/gre.h b/src/plugins/gre/gre.h index 9e17efcf7ef..ce57454f9b7 100644 --- a/src/plugins/gre/gre.h +++ b/src/plugins/gre/gre.h @@ -293,22 +293,18 @@ typedef struct /** * @brief IPv4 and GRE header. */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip4_header_t ip4; gre_header_t gre; }) ip4_and_gre_header_t; -/* *INDENT-ON* */ /** * @brief IPv6 and GRE header. */ -/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { ip6_header_t ip6; gre_header_t gre; }) ip6_and_gre_header_t; -/* *INDENT-ON* */ always_inline gre_protocol_info_t * gre_get_protocol_info (gre_main_t * em, gre_protocol_t protocol) diff --git a/src/plugins/gre/gre_api.c b/src/plugins/gre/gre_api.c index f8e3ea654fc..5149f92fb80 100644 --- a/src/plugins/gre/gre_api.c +++ b/src/plugins/gre/gre_api.c @@ -118,10 +118,8 @@ vl_api_gre_tunnel_add_del_t_handler (vl_api_gre_tunnel_add_del_t *mp) rv = vnet_gre_tunnel_add_del (a, &sw_if_index); out: - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_GRE_TUNNEL_ADD_DEL_REPLY, ({ rmp->sw_if_index = ntohl (sw_if_index); })); - /* *INDENT-ON* */ } static void @@ -129,7 +127,6 @@ send_gre_tunnel_details (gre_tunnel_t *t, vl_api_gre_tunnel_dump_t *mp) { vl_api_gre_tunnel_details_t *rmp; - /* *INDENT-OFF* */ REPLY_MACRO_DETAILS2 ( VL_API_GRE_TUNNEL_DETAILS, ({ ip_address_encode (&t->tunnel_src, IP46_TYPE_ANY, &rmp->tunnel.src); @@ -146,7 +143,6 @@ send_gre_tunnel_details (gre_tunnel_t *t, vl_api_gre_tunnel_dump_t *mp) rmp->tunnel.sw_if_index = htonl (t->sw_if_index); rmp->tunnel.session_id = htons (t->session_id); })); - /* *INDENT-ON* */ } static void @@ -165,12 +161,10 @@ vl_api_gre_tunnel_dump_t_handler (vl_api_gre_tunnel_dump_t *mp) if (~0 == sw_if_index) { - /* *INDENT-OFF* */ pool_foreach (t, gm->tunnels) { send_gre_tunnel_details (t, mp); } - /* *INDENT-ON* */ } else diff --git a/src/plugins/gre/interface.c b/src/plugins/gre/interface.c index 8d93ebd0cf5..bd9a6078502 100644 --- a/src/plugins/gre/interface.c +++ b/src/plugins/gre/interface.c @@ -752,7 +752,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_gre_tunnel_command, static) = { .path = "create gre tunnel", .short_help = "create gre tunnel src dst [instance ] " @@ -760,7 +759,6 @@ VLIB_CLI_COMMAND (create_gre_tunnel_command, static) = { "[multipoint]", .function = create_gre_tunnel_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_gre_tunnel_command_fn (vlib_main_t *vm, unformat_input_t *input, @@ -783,12 +781,10 @@ show_gre_tunnel_command_fn (vlib_main_t *vm, unformat_input_t *input, if (~0 == ti) { - /* *INDENT-OFF* */ pool_foreach (t, gm->tunnels) { vlib_cli_output (vm, "%U", format_gre_tunnel, t); } - /* *INDENT-ON* */ } else { @@ -800,12 +796,10 @@ show_gre_tunnel_command_fn (vlib_main_t *vm, unformat_input_t *input, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_gre_tunnel_command, static) = { .path = "show gre tunnel", .function = show_gre_tunnel_command_fn, }; -/* *INDENT-ON* */ const static teib_vft_t gre_teib_vft = { .nv_added = gre_teib_entry_added, diff --git a/src/plugins/gre/node.c b/src/plugins/gre/node.c index 7ee22c3cb11..5235888cc6f 100644 --- a/src/plugins/gre/node.c +++ b/src/plugins/gre/node.c @@ -434,7 +434,6 @@ static char *gre_error_strings[] = { #undef gre_error }; -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (gre4_input_node) = { .name = "gre4-input", /* Takes a vector of packets. */ @@ -476,7 +475,6 @@ VLIB_REGISTER_NODE (gre6_input_node) = { .format_trace = format_gre_rx_trace, .unformat_buffer = unformat_gre_header, }; -/* *INDENT-ON* */ #ifndef CLIB_MARCH_VARIANT void -- cgit 1.2.3-korg