From 49ee68443d41ffe1ab72c964104da980a2eb4367 Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Tue, 30 Apr 2019 11:50:46 +0200 Subject: build: add -Wall and -fno-common, fix reported issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Type: refactor Change-Id: I8489ccd54411c2aa9355439c5641dc31012c64a2 Signed-off-by: Benoît Ganne Signed-off-by: Damjan Marion --- src/vat/api_format.c | 40 +++++++++++++++------------------------- src/vat/main.c | 1 - src/vat/vat.h | 4 ++-- 3 files changed, 17 insertions(+), 28 deletions(-) (limited to 'src/vat') diff --git a/src/vat/api_format.c b/src/vat/api_format.c index 5836e3c307d..be074bec615 100644 --- a/src/vat/api_format.c +++ b/src/vat/api_format.c @@ -398,7 +398,7 @@ format_ipsec_integ_alg (u8 * s, va_list * args) static uword api_unformat_sw_if_index (unformat_input_t * input, va_list * args) { - vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *); + vat_main_t *vam __clib_unused = va_arg (*args, vat_main_t *); vnet_main_t *vnm = vnet_get_main (); u32 *result = va_arg (*args, u32 *); @@ -408,7 +408,7 @@ api_unformat_sw_if_index (unformat_input_t * input, va_list * args) static uword api_unformat_hw_if_index (unformat_input_t * input, va_list * args) { - vat_main_t *vam __attribute__ ((unused)) = va_arg (*args, vat_main_t *); + vat_main_t *vam __clib_unused = va_arg (*args, vat_main_t *); vnet_main_t *vnm = vnet_get_main (); u32 *result = va_arg (*args, u32 *); @@ -562,12 +562,13 @@ unformat_flow_classify_table_type (unformat_input_t * input, va_list * va) return 1; } +#if (VPP_API_TEST_BUILTIN==0) + static const char *mfib_flag_names[] = MFIB_ENTRY_NAMES_SHORT; static const char *mfib_flag_long_names[] = MFIB_ENTRY_NAMES_LONG; static const char *mfib_itf_flag_long_names[] = MFIB_ITF_NAMES_LONG; static const char *mfib_itf_flag_names[] = MFIB_ITF_NAMES_SHORT; -#if (VPP_API_TEST_BUILTIN==0) uword unformat_mfib_itf_flags (unformat_input_t * input, va_list * args) { @@ -1045,8 +1046,8 @@ static void vl_api_sw_interface_event_t_handler } #endif -static void vl_api_sw_interface_event_t_handler_json - (vl_api_sw_interface_event_t * mp) +__clib_unused static void +vl_api_sw_interface_event_t_handler_json (vl_api_sw_interface_event_t * mp) { /* JSON output not supported */ } @@ -7264,14 +7265,11 @@ api_bd_ip_mac_add_del (vat_main_t * vam) vl_api_mac_address_t mac = { 0 }; unformat_input_t *i = vam->input; vl_api_bd_ip_mac_add_del_t *mp; - ip46_type_t type; u32 bd_id; - u8 is_ipv6 = 0; u8 is_add = 1; u8 bd_id_set = 0; u8 ip_set = 0; u8 mac_set = 0; - u8 macaddr[6]; int ret; @@ -7714,6 +7712,7 @@ api_virtio_pci_create (vat_main_t * vam) mp->pci_addr = htonl (pci_addr); mp->features = clib_host_to_net_u64 (features); + mp->gso_enabled = gso_enabled; if (random_mac == 0) clib_memcpy (mp->mac_address, mac_address, 6); @@ -10117,7 +10116,6 @@ api_sw_interface_ip6nd_ra_prefix (vat_main_t * vam) vl_api_sw_interface_ip6nd_ra_prefix_t *mp; u32 sw_if_index; u8 sw_if_index_set = 0; - u32 address_length = 0; u8 v6_address_set = 0; vl_api_prefix_t pfx; u8 use_default = 0; @@ -13228,8 +13226,6 @@ api_gre_tunnel_add_del (vat_main_t * vam) vl_api_gre_tunnel_add_del_t *mp; vl_api_gre_tunnel_type_t t_type; u8 is_add = 1; - u8 ipv4_set = 0; - u8 ipv6_set = 0; u8 src_set = 0; u8 dst_set = 0; u32 outer_fib_id = 0; @@ -13332,8 +13328,6 @@ static void vl_api_gre_tunnel_details_t_handler_json { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; - struct in_addr ip4; - struct in6_addr ip6; if (VAT_JSON_ARRAY != vam->json_tree.type) { @@ -14167,7 +14161,7 @@ api_ip_probe_neighbor (vat_main_t * vam) { unformat_input_t *i = vam->input; vl_api_ip_probe_neighbor_t *mp; - vl_api_address_t dst_adr; + vl_api_address_t dst_adr = { }; u8 int_set = 0; u8 adr_set = 0; u32 sw_if_index; @@ -14179,7 +14173,7 @@ api_ip_probe_neighbor (vat_main_t * vam) int_set = 1; else if (unformat (i, "sw_if_index %d", &sw_if_index)) int_set = 1; - else if (unformat (i, "address %U", unformat_vl_api_address, dst_adr)) + else if (unformat (i, "address %U", unformat_vl_api_address, &dst_adr)) adr_set = 1; else break; @@ -14706,7 +14700,7 @@ api_ipsec_spd_entry_add_del (vat_main_t * vam) { unformat_input_t *i = vam->input; vl_api_ipsec_spd_entry_add_del_t *mp; - u8 is_add = 1, is_outbound = 0, is_ipv6 = 0, is_ip_any = 1; + u8 is_add = 1, is_outbound = 0; u32 spd_id = 0, sa_id = 0, protocol = 0, policy = 0; i32 priority = 0; u32 rport_start = 0, rport_stop = (u32) ~ 0; @@ -14746,16 +14740,16 @@ api_ipsec_spd_entry_add_del (vat_main_t * vam) ; else if (unformat (i, "laddr_start %U", unformat_vl_api_address, &laddr_start)) - is_ip_any = 0; + ; else if (unformat (i, "laddr_stop %U", unformat_vl_api_address, &laddr_stop)) - is_ip_any = 0; + ; else if (unformat (i, "raddr_start %U", unformat_vl_api_address, &raddr_start)) - is_ip_any = 0; + ; else if (unformat (i, "raddr_stop %U", unformat_vl_api_address, &raddr_stop)) - is_ip_any = 0; + ; else if (unformat (i, "action %U", unformat_ipsec_policy_action, &policy)) { @@ -14918,7 +14912,7 @@ api_ipsec_tunnel_if_add_del (vat_main_t * vam) u8 renumber = 0; u32 instance = ~0; u32 count = 1, jj; - int ret; + int ret = -1; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { @@ -20026,7 +20020,6 @@ api_ip_source_and_port_range_check_add_del (vat_main_t * vam) u8 prefix_set = 0; u32 vrf_id = ~0; u8 is_add = 1; - u8 is_ipv6 = 0; int ret; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -20242,11 +20235,9 @@ api_set_punt (vat_main_t * vam) unformat_input_t *i = vam->input; vl_api_address_family_t af; vl_api_set_punt_t *mp; - u32 ipv = ~0; u32 protocol = ~0; u32 port = ~0; int is_add = 1; - u8 is_ip4 = 1; int ret; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) @@ -20307,7 +20298,6 @@ static void vl_api_ipsec_gre_tunnel_details_t_handler_json { vat_main_t *vam = &vat_main; vat_json_node_t *node = NULL; - struct in_addr ip4; if (VAT_JSON_ARRAY != vam->json_tree.type) { diff --git a/src/vat/main.c b/src/vat/main.c index 92edec117b2..893a1022ab7 100644 --- a/src/vat/main.c +++ b/src/vat/main.c @@ -288,7 +288,6 @@ setup_signal_handlers (void) static void vat_find_plugin_path () { - extern char *vat_plugin_path; char *p, path[PATH_MAX]; int rv; u8 *s; diff --git a/src/vat/vat.h b/src/vat/vat.h index c9384a1ce57..c71446519a3 100644 --- a/src/vat/vat.h +++ b/src/vat/vat.h @@ -230,8 +230,8 @@ void do_one_file (vat_main_t * vam); int exec (vat_main_t * vam); /* Plugin API library functions */ -char *vat_plugin_path; -char *vat_plugin_name_filter; +extern char *vat_plugin_path; +extern char *vat_plugin_name_filter; void vat_plugin_api_reference (void); uword unformat_sw_if_index (unformat_input_t * input, va_list * args); uword unformat_ip4_address (unformat_input_t * input, va_list * args); -- cgit 1.2.3-korg