From fe45f8f5afbf34d68cf992cc32b12432a82cdb38 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 20 May 2022 16:01:22 +0200 Subject: api: replace print functions wth format Type: improvement Change-Id: I7f7050c19453a69a7fb6c5e62f8f57db847d9144 Signed-off-by: Damjan Marion --- src/plugins/acl/acl.c | 1 - src/plugins/acl/acl_test.c | 2 -- src/plugins/adl/adl_api.c | 1 - src/plugins/dhcp/dhcp_test.c | 12 +++++------- src/plugins/dns/dns.c | 12 +++++------- src/plugins/flowprobe/flowprobe.c | 12 +++++------- src/plugins/geneve/geneve_test.c | 12 +++++------- src/plugins/hs_apps/sapi/vpp_echo_bapi.c | 12 +++++------- src/plugins/http_static/http_static.c | 1 - src/plugins/l2tp/l2tp_test.c | 12 +++++------- src/plugins/lacp/lacp_api.c | 13 +++++-------- src/plugins/lb/api.c | 12 +++++------- src/plugins/lisp/lisp-cp/lisp_cp_test.c | 12 +++++------- src/plugins/lisp/lisp-cp/one_test.c | 12 +++++------- src/plugins/lisp/lisp-gpe/lisp_gpe_test.c | 12 +++++------- src/plugins/lldp/lldp_test.c | 12 +++++------- src/plugins/mactime/mactime.c | 1 - src/plugins/mactime/mactime_top.c | 8 +++----- src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_api.c | 1 - src/plugins/stn/stn_api.c | 12 +++++------- src/plugins/tlsopenssl/tls_openssl_api.c | 1 - src/plugins/tracedump/tracedump_test.c | 6 ++---- 22 files changed, 70 insertions(+), 109 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c index a7b81049761..eb3815082f3 100644 --- a/src/plugins/acl/acl.c +++ b/src/plugins/acl/acl.c @@ -36,7 +36,6 @@ #include #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #include "fa_node.h" #include "public_inlines.h" diff --git a/src/plugins/acl/acl_test.c b/src/plugins/acl/acl_test.c index 7514a8e2e85..0c218687bdf 100644 --- a/src/plugins/acl/acl_test.c +++ b/src/plugins/acl/acl_test.c @@ -36,8 +36,6 @@ uword unformat_sw_if_index (unformat_input_t * input, va_list * args); /* Declare message IDs */ #include #include -#define vl_print(handle, ...) -#undef vl_print #define vl_endianfun /* define message structures */ #include #undef vl_endianfun diff --git a/src/plugins/adl/adl_api.c b/src/plugins/adl/adl_api.c index dba3b0cc17d..8bd805d9e06 100644 --- a/src/plugins/adl/adl_api.c +++ b/src/plugins/adl/adl_api.c @@ -30,7 +30,6 @@ #include #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define REPLY_MSG_ID_BASE am->msg_id_base #include diff --git a/src/plugins/dhcp/dhcp_test.c b/src/plugins/dhcp/dhcp_test.c index c1894ec01ea..d8288e6e14b 100644 --- a/src/plugins/dhcp/dhcp_test.c +++ b/src/plugins/dhcp/dhcp_test.c @@ -39,13 +39,11 @@ dhcp_test_main_t dhcp_test_main; #define __plugin_msg_base dhcp_test_main.msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static int api_dhcp_proxy_config (vat_main_t * vam) diff --git a/src/plugins/dns/dns.c b/src/plugins/dns/dns.c index 1839379ece3..4a283bf298f 100644 --- a/src/plugins/dns/dns.c +++ b/src/plugins/dns/dns.c @@ -30,13 +30,11 @@ #define REPLY_MSG_ID_BASE dm->msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; dns_main_t dns_main; diff --git a/src/plugins/flowprobe/flowprobe.c b/src/plugins/flowprobe/flowprobe.c index df0e5ff0f2b..058a642bcd5 100644 --- a/src/plugins/flowprobe/flowprobe.c +++ b/src/plugins/flowprobe/flowprobe.c @@ -90,13 +90,11 @@ VNET_FEATURE_INIT (flowprobe_output_l2, static) = { }; /* *INDENT-ON* */ -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static inline ipfix_field_specifier_t * flowprobe_template_ip4_fields (ipfix_field_specifier_t * f) diff --git a/src/plugins/geneve/geneve_test.c b/src/plugins/geneve/geneve_test.c index 2eb3821173e..e777e9b998e 100644 --- a/src/plugins/geneve/geneve_test.c +++ b/src/plugins/geneve/geneve_test.c @@ -41,13 +41,11 @@ geneve_test_main_t geneve_test_main; #define __plugin_msg_base geneve_test_main.msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static void vl_api_geneve_add_del_tunnel_reply_t_handler (vl_api_geneve_add_del_tunnel_reply_t * mp) diff --git a/src/plugins/hs_apps/sapi/vpp_echo_bapi.c b/src/plugins/hs_apps/sapi/vpp_echo_bapi.c index e38559c255e..0652b864b1d 100644 --- a/src/plugins/hs_apps/sapi/vpp_echo_bapi.c +++ b/src/plugins/hs_apps/sapi/vpp_echo_bapi.c @@ -556,7 +556,6 @@ _(APPLICATION_DETACH_REPLY, application_detach_reply) \ _(APP_ADD_CERT_KEY_PAIR_REPLY, app_add_cert_key_pair_reply) \ _(APP_DEL_CERT_KEY_PAIR_REPLY, app_del_cert_key_pair_reply) -#define vl_print(handle, ...) fformat (handle, __VA_ARGS__) #define vl_endianfun #include #undef vl_endianfun @@ -586,12 +585,11 @@ echo_api_hookup (echo_main_t * em) return; #define _(N, n) \ - vl_msg_api_set_handlers ( \ - REPLY_MSG_ID_BASE + VL_API_##N, #n, vl_api_##n##_t_handler, \ - vl_noop_handler, vl_api_##n##_t_endian, vl_api_##n##_t_print, \ - sizeof (vl_api_##n##_t), 1, vl_api_##n##_t_print_json, \ - vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson, \ - vl_api_##n##_t_calc_size); + vl_msg_api_set_handlers (REPLY_MSG_ID_BASE + VL_API_##N, #n, \ + vl_api_##n##_t_handler, vl_api_##n##_t_endian, \ + vl_api_##n##_t_format, sizeof (vl_api_##n##_t), 1, \ + vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson, \ + vl_api_##n##_t_calc_size); foreach_quic_echo_msg; #undef _ } diff --git a/src/plugins/http_static/http_static.c b/src/plugins/http_static/http_static.c index 005eefc731c..8f8fe37b7c1 100644 --- a/src/plugins/http_static/http_static.c +++ b/src/plugins/http_static/http_static.c @@ -27,7 +27,6 @@ #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define REPLY_MSG_ID_BASE hsm->msg_id_base #include diff --git a/src/plugins/l2tp/l2tp_test.c b/src/plugins/l2tp/l2tp_test.c index fef6121943b..33691313cbe 100644 --- a/src/plugins/l2tp/l2tp_test.c +++ b/src/plugins/l2tp/l2tp_test.c @@ -41,13 +41,11 @@ l2tp_test_main_t l2tp_test_main; #define __plugin_msg_base l2tp_test_main.msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static void vl_api_l2tpv3_create_tunnel_reply_t_handler (vl_api_l2tpv3_create_tunnel_reply_t * mp) diff --git a/src/plugins/lacp/lacp_api.c b/src/plugins/lacp/lacp_api.c index fab28cb6a13..cdf05aa370c 100644 --- a/src/plugins/lacp/lacp_api.c +++ b/src/plugins/lacp/lacp_api.c @@ -31,14 +31,11 @@ #include #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) - -/* Macro to finish up custom dump fns */ -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; #define REPLY_MSG_ID_BASE lm->msg_id_base #include diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c index e44f815cb9c..3aa745c5559 100644 --- a/src/plugins/lb/api.c +++ b/src/plugins/lb/api.c @@ -30,17 +30,15 @@ #include #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define REPLY_MSG_ID_BASE lbm->msg_id_base #include -/* Macro to finish up custom dump fns */ -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static void vl_api_lb_conf_t_handler diff --git a/src/plugins/lisp/lisp-cp/lisp_cp_test.c b/src/plugins/lisp/lisp-cp/lisp_cp_test.c index 0ab41802207..8657aae0bb1 100644 --- a/src/plugins/lisp/lisp-cp/lisp_cp_test.c +++ b/src/plugins/lisp/lisp-cp/lisp_cp_test.c @@ -41,13 +41,11 @@ lisp_test_main_t lisp_test_main; #define __plugin_msg_base lisp_test_main.msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; typedef struct { diff --git a/src/plugins/lisp/lisp-cp/one_test.c b/src/plugins/lisp/lisp-cp/one_test.c index 7ca1f31e6dc..ad308b73c5e 100644 --- a/src/plugins/lisp/lisp-cp/one_test.c +++ b/src/plugins/lisp/lisp-cp/one_test.c @@ -41,13 +41,11 @@ one_test_main_t one_test_main; #define __plugin_msg_base one_test_main.msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; #define LISP_PING(_lm, mp_ping) \ if (!(_lm)->ping_id) \ diff --git a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c index 6f40e6458f0..2f1a4187551 100644 --- a/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c +++ b/src/plugins/lisp/lisp-gpe/lisp_gpe_test.c @@ -41,13 +41,11 @@ lisp_gpe_test_main_t lisp_gpe_test_main; #define __plugin_msg_base lisp_gpe_test_main.msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; #define LISP_PING(_lm, mp_ping) \ if (!(_lm)->ping_id) \ diff --git a/src/plugins/lldp/lldp_test.c b/src/plugins/lldp/lldp_test.c index 661487c7835..6eb3e0f0279 100644 --- a/src/plugins/lldp/lldp_test.c +++ b/src/plugins/lldp/lldp_test.c @@ -38,13 +38,11 @@ lldp_test_main_t lldp_test_main; #define __plugin_msg_base lldp_test_main.msg_id_base #include -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static int api_lldp_config (vat_main_t * vam) diff --git a/src/plugins/mactime/mactime.c b/src/plugins/mactime/mactime.c index f878ffe5efe..ffb41c2d8c7 100644 --- a/src/plugins/mactime/mactime.c +++ b/src/plugins/mactime/mactime.c @@ -28,7 +28,6 @@ #include #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define REPLY_MSG_ID_BASE mm->msg_id_base #include diff --git a/src/plugins/mactime/mactime_top.c b/src/plugins/mactime/mactime_top.c index d7223f45e56..60c3e5cca65 100644 --- a/src/plugins/mactime/mactime_top.c +++ b/src/plugins/mactime/mactime_top.c @@ -106,7 +106,6 @@ vl_api_mactime_details_t_handler (vl_api_mactime_details_t * mp) } } -#define vl_print(handle, ...) fformat(handle, __VA_ARGS__) #define vl_endianfun /* define message structures */ #include #undef vl_endianfun @@ -145,10 +144,9 @@ connect_to_vpp (char *name) #define _(N, n) \ vl_msg_api_set_handlers ((VL_API_##N + mm->msg_id_base), #n, \ - vl_api_##n##_t_handler, vl_noop_handler, \ - vl_api_##n##_t_endian, vl_api_##n##_t_print, \ - sizeof (vl_api_##n##_t), 1, vl_api_##n##_t_tojson, \ - vl_api_##n##_t_fromjson); + vl_api_##n##_t_handler, vl_api_##n##_t_endian, \ + vl_api_##n##_t_format, sizeof (vl_api_##n##_t), 1, \ + vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson); foreach_mactime_api_msg; #undef _ diff --git a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_api.c b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_api.c index 9ed835bd98f..36c221619e5 100644 --- a/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_api.c +++ b/src/plugins/nsh/nsh-md2-ioam/nsh_md2_ioam_api.c @@ -38,7 +38,6 @@ #undef vl_endianfun /* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define vl_printfun #include #undef vl_printfun diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c index e8685931db5..8d96014331a 100644 --- a/src/plugins/stn/stn_api.c +++ b/src/plugins/stn/stn_api.c @@ -29,13 +29,11 @@ #define REPLY_MSG_ID_BASE stn_main.msg_id_base #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -/* Macro to finish up custom dump fns */ -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; static void vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp) diff --git a/src/plugins/tlsopenssl/tls_openssl_api.c b/src/plugins/tlsopenssl/tls_openssl_api.c index c34829f0b29..0b17271313d 100644 --- a/src/plugins/tlsopenssl/tls_openssl_api.c +++ b/src/plugins/tlsopenssl/tls_openssl_api.c @@ -23,7 +23,6 @@ #include #include -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define REPLY_MSG_ID_BASE om->msg_id_base #include diff --git a/src/plugins/tracedump/tracedump_test.c b/src/plugins/tracedump/tracedump_test.c index abb81059199..f2bb63ec85d 100644 --- a/src/plugins/tracedump/tracedump_test.c +++ b/src/plugins/tracedump/tracedump_test.c @@ -235,7 +235,6 @@ api_trace_clear_capture (vat_main_t * vam) -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define vl_endianfun #include #undef vl_endianfun @@ -251,9 +250,8 @@ manual_setup_message_id_table (vat_main_t * vam) { vl_msg_api_set_handlers ( VL_API_TRACE_DETAILS + tracedump_test_main.msg_id_base, "trace_details", - vl_api_trace_details_t_handler, vl_noop_handler, - vl_api_trace_details_t_endian, vl_api_trace_details_t_print, - sizeof (vl_api_trace_details_t), 1, vl_api_trace_details_t_print_json, + vl_api_trace_details_t_handler, vl_api_trace_details_t_endian, + vl_api_trace_details_t_format, sizeof (vl_api_trace_details_t), 1, vl_api_trace_details_t_tojson, vl_api_trace_details_t_fromjson, vl_api_trace_details_t_calc_size); } -- cgit 1.2.3-korg