diff options
Diffstat (limited to 'src/vnet')
53 files changed, 92 insertions, 92 deletions
diff --git a/src/vnet/adj/rewrite.c b/src/vnet/adj/rewrite.c index 47fb74df01b..9150f2c6c37 100644 --- a/src/vnet/adj/rewrite.c +++ b/src/vnet/adj/rewrite.c @@ -69,7 +69,7 @@ format_vnet_rewrite (u8 * s, va_list * args) { vnet_rewrite_header_t *rw = va_arg (*args, vnet_rewrite_header_t *); u32 max_data_bytes = va_arg (*args, u32); - CLIB_UNUSED (uword indent) = va_arg (*args, u32); + CLIB_UNUSED (u32 indent) = va_arg (*args, u32); vnet_main_t *vnm = vnet_get_main (); if (rw->sw_if_index != ~0) diff --git a/src/vnet/bfd/bfd_main.c b/src/vnet/bfd/bfd_main.c index b58a5132711..5d1c5404333 100644 --- a/src/vnet/bfd/bfd_main.c +++ b/src/vnet/bfd/bfd_main.c @@ -1768,7 +1768,7 @@ u8 * format_bfd_session (u8 * s, va_list * args) { const bfd_session_t *bs = va_arg (*args, bfd_session_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "bs_idx=%u local-state=%s remote-state=%s\n" "%Ulocal-discriminator=%u remote-discriminator=%u\n" "%Ulocal-diag=%s echo-active=%s\n" diff --git a/src/vnet/devices/af_packet/node.c b/src/vnet/devices/af_packet/node.c index 5301ad299f2..ec7c273b0e5 100644 --- a/src/vnet/devices/af_packet/node.c +++ b/src/vnet/devices/af_packet/node.c @@ -58,7 +58,7 @@ format_af_packet_input_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); af_packet_input_trace_t *t = va_arg (*args, af_packet_input_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "af_packet: hw_if_index %d next-index %d", t->hw_if_index, t->next_index); diff --git a/src/vnet/devices/netmap/device.c b/src/vnet/devices/netmap/device.c index aea9ddf4eb1..e39888f4bf7 100644 --- a/src/vnet/devices/netmap/device.c +++ b/src/vnet/devices/netmap/device.c @@ -63,7 +63,7 @@ format_netmap_device (u8 * s, va_list * args) int verbose = va_arg (*args, int); netmap_main_t *nm = &netmap_main; netmap_if_t *nif = vec_elt_at_index (nm->interfaces, dev_instance); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "NETMAP interface"); if (verbose) diff --git a/src/vnet/devices/netmap/node.c b/src/vnet/devices/netmap/node.c index e120eeaeabd..67ddce58440 100644 --- a/src/vnet/devices/netmap/node.c +++ b/src/vnet/devices/netmap/node.c @@ -57,7 +57,7 @@ format_netmap_input_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); netmap_input_trace_t *t = va_arg (*args, netmap_input_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "netmap: hw_if_index %d next-index %d", t->hw_if_index, t->next_index); diff --git a/src/vnet/devices/virtio/vhost-user.c b/src/vnet/devices/virtio/vhost-user.c index 4200ed8d8f3..ca54f110948 100644 --- a/src/vnet/devices/virtio/vhost-user.c +++ b/src/vnet/devices/virtio/vhost-user.c @@ -1257,7 +1257,7 @@ format_vhost_trace (u8 * s, va_list * va) vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, vui->sw_if_index); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U %U queue %d\n", format_white_space, indent, format_vnet_sw_interface_name, vnm, sw, t->qid); diff --git a/src/vnet/dpo/interface_rx_dpo.c b/src/vnet/dpo/interface_rx_dpo.c index a624f514564..caaee65a897 100644 --- a/src/vnet/dpo/interface_rx_dpo.c +++ b/src/vnet/dpo/interface_rx_dpo.c @@ -365,7 +365,7 @@ format_interface_rx_dpo_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); interface_rx_dpo_trace_t * t = va_arg (*args, interface_rx_dpo_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U sw_if_index:%d", format_white_space, indent, t->sw_if_index); diff --git a/src/vnet/dpo/load_balance_map.c b/src/vnet/dpo/load_balance_map.c index 4e27e5db3d8..588c1a75a4f 100644 --- a/src/vnet/dpo/load_balance_map.c +++ b/src/vnet/dpo/load_balance_map.c @@ -88,10 +88,10 @@ load_balance_map_get_index (load_balance_map_t *lbm) } u8* -format_load_balance_map (u8 *s, va_list ap) +format_load_balance_map (u8 *s, va_list * ap) { - index_t lbmi = va_arg(ap, index_t); - u32 indent = va_arg(ap, u32); + index_t lbmi = va_arg(*ap, index_t); + u32 indent = va_arg(*ap, u32); load_balance_map_t *lbm; u32 n_buckets, ii; diff --git a/src/vnet/dpo/load_balance_map.h b/src/vnet/dpo/load_balance_map.h index 237f24b0138..f9344c01c1e 100644 --- a/src/vnet/dpo/load_balance_map.h +++ b/src/vnet/dpo/load_balance_map.h @@ -59,7 +59,7 @@ extern void load_balance_map_unlock(index_t lbmi); extern void load_balance_map_path_state_change(fib_node_index_t path_index); -extern u8* format_load_balance_map(u8 *s, va_list ap); +extern u8* format_load_balance_map(u8 *s, va_list *ap); extern void load_balance_map_show_mem(void); /** diff --git a/src/vnet/dpo/lookup_dpo.c b/src/vnet/dpo/lookup_dpo.c index af189eda44f..9426d1ceb54 100644 --- a/src/vnet/dpo/lookup_dpo.c +++ b/src/vnet/dpo/lookup_dpo.c @@ -595,7 +595,7 @@ format_lookup_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); lookup_trace_t * t = va_arg (*args, lookup_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U fib-index:%d addr:%U load-balance:%d", format_white_space, indent, t->fib_index, @@ -1113,7 +1113,7 @@ format_lookup_mpls_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); lookup_trace_t * t = va_arg (*args, lookup_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); mpls_unicast_header_t hdr; hdr.label_exp_s_ttl = clib_net_to_host_u32(t->hdr.label_exp_s_ttl); diff --git a/src/vnet/dpo/mpls_label_dpo.c b/src/vnet/dpo/mpls_label_dpo.c index 2a6e7dd5e48..c6e8dcc475c 100644 --- a/src/vnet/dpo/mpls_label_dpo.c +++ b/src/vnet/dpo/mpls_label_dpo.c @@ -550,7 +550,7 @@ format_mpls_label_imposition_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); mpls_label_imposition_trace_t * t; mpls_unicast_header_t hdr; - uword indent; + u32 indent; t = va_arg (*args, mpls_label_imposition_trace_t *); indent = format_get_indent (s); diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c index 52b13e0401b..f46e6f5a5bc 100644 --- a/src/vnet/ethernet/arp.c +++ b/src/vnet/ethernet/arp.c @@ -203,7 +203,7 @@ format_ethernet_arp_header (u8 * s, va_list * va) { ethernet_arp_header_t *a = va_arg (*va, ethernet_arp_header_t *); u32 max_header_bytes = va_arg (*va, u32); - uword indent; + u32 indent; u16 l2_type, l3_type; if (max_header_bytes != 0 && sizeof (a[0]) > max_header_bytes) diff --git a/src/vnet/ethernet/format.c b/src/vnet/ethernet/format.c index 5b58999861a..13a209fb684 100644 --- a/src/vnet/ethernet/format.c +++ b/src/vnet/ethernet/format.c @@ -100,7 +100,7 @@ format_ethernet_header_with_length (u8 * s, va_list * args) ethernet_type_t type = clib_net_to_host_u16 (e->type); ethernet_type_t vlan_type[ARRAY_LEN (m->vlan)]; u32 n_vlan = 0, i, header_bytes; - uword indent; + u32 indent; while ((type == ETHERNET_TYPE_VLAN || type == ETHERNET_TYPE_DOT1AD || type == ETHERNET_TYPE_DOT1AH) && n_vlan < ARRAY_LEN (m->vlan)) diff --git a/src/vnet/ethernet/sfp.c b/src/vnet/ethernet/sfp.c index 624740e3d52..0ebdb99339b 100644 --- a/src/vnet/ethernet/sfp.c +++ b/src/vnet/ethernet/sfp.c @@ -81,7 +81,7 @@ u8 * format_sfp_eeprom (u8 * s, va_list * args) { sfp_eeprom_t *e = va_arg (*args, sfp_eeprom_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); int i; if (e->id != SFP_ID_sfp) diff --git a/src/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c index 627e5cba9e1..6daa61c2612 100644 --- a/src/vnet/fib/fib_table.c +++ b/src/vnet/fib/fib_table.c @@ -1228,10 +1228,10 @@ fib_table_get_num_entries (u32 fib_index, } u8* -format_fib_table_name (u8* s, va_list ap) +format_fib_table_name (u8* s, va_list* ap) { - fib_node_index_t fib_index = va_arg(ap, fib_node_index_t); - fib_protocol_t proto = va_arg(ap, int); // int promotion + fib_node_index_t fib_index = va_arg(*ap, fib_node_index_t); + fib_protocol_t proto = va_arg(*ap, int); // int promotion fib_table_t *fib_table; fib_table = fib_table_get(fib_index, proto); diff --git a/src/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h index 923d7afff9a..6c2640458b9 100644 --- a/src/vnet/fib/fib_table.h +++ b/src/vnet/fib/fib_table.h @@ -79,7 +79,7 @@ typedef struct fib_table_t_ * @brief * Format the description/name of the table */ -extern u8* format_fib_table_name(u8* s, va_list ap); +extern u8* format_fib_table_name(u8* s, va_list *ap); /** * @brief diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c index 540289ce989..64d9047163b 100644 --- a/src/vnet/fib/fib_test.c +++ b/src/vnet/fib/fib_test.c @@ -353,7 +353,7 @@ typedef struct fib_test_rep_bucket_t_ { int fib_test_validate_rep_v (const replicate_t *rep, u16 n_buckets, - va_list ap) + va_list *ap) { const fib_test_rep_bucket_t *exp; const dpo_id_t *dpo; @@ -364,7 +364,7 @@ fib_test_validate_rep_v (const replicate_t *rep, for (bucket = 0; bucket < n_buckets; bucket++) { - exp = va_arg(ap, fib_test_rep_bucket_t*); + exp = va_arg(*ap, fib_test_rep_bucket_t*); dpo = replicate_get_bucket_i(rep, bucket); @@ -429,7 +429,7 @@ fib_test_validate_rep_v (const replicate_t *rep, int fib_test_validate_lb_v (const load_balance_t *lb, u16 n_buckets, - va_list ap) + va_list *ap) { const dpo_id_t *dpo; int bucket; @@ -440,7 +440,7 @@ fib_test_validate_lb_v (const load_balance_t *lb, { const fib_test_lb_bucket_t *exp; - exp = va_arg(ap, fib_test_lb_bucket_t*); + exp = va_arg(*ap, fib_test_lb_bucket_t*); dpo = load_balance_get_bucket_i(lb, bucket); switch (exp->type) @@ -648,7 +648,7 @@ fib_test_validate_entry (fib_node_index_t fei, const replicate_t *rep; rep = replicate_get(dpo.dpoi_index); - res = fib_test_validate_rep_v(rep, n_buckets, ap); + res = fib_test_validate_rep_v(rep, n_buckets, &ap); } else { @@ -659,7 +659,7 @@ fib_test_validate_entry (fib_node_index_t fei, format_dpo_type, dpo.dpoi_type); lb = load_balance_get(dpo.dpoi_index); - res = fib_test_validate_lb_v(lb, n_buckets, ap); + res = fib_test_validate_lb_v(lb, n_buckets, &ap); /* * ensure that the LB contributed by the entry is the diff --git a/src/vnet/fib/fib_test.h b/src/vnet/fib/fib_test.h index b98680bf683..3692f57386d 100644 --- a/src/vnet/fib/fib_test.h +++ b/src/vnet/fib/fib_test.h @@ -97,11 +97,11 @@ typedef struct fib_test_rep_bucket_t_ { extern int fib_test_validate_rep_v(const replicate_t *rep, u16 n_buckets, - va_list ap); + va_list *ap); extern int fib_test_validate_lb_v(const load_balance_t *lb, u16 n_buckets, - va_list ap); + va_list *ap); extern int fib_test_validate_entry(fib_node_index_t fei, fib_forward_chain_type_t fct, diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c index 8165f3eb313..d84642d29da 100644 --- a/src/vnet/fib/fib_types.c +++ b/src/vnet/fib/fib_types.c @@ -27,17 +27,17 @@ static const char* vnet_link_names[] = VNET_LINKS; static const char* fib_forw_chain_names[] = FIB_FORW_CHAINS; u8 * -format_fib_protocol (u8 * s, va_list ap) +format_fib_protocol (u8 * s, va_list * ap) { - fib_protocol_t proto = va_arg(ap, int); // fib_protocol_t promotion + fib_protocol_t proto = va_arg(*ap, int); // fib_protocol_t promotion return (format (s, "%s", fib_protocol_names[proto])); } u8 * -format_vnet_link (u8 * s, va_list ap) +format_vnet_link (u8 * s, va_list * ap) { - vnet_link_t link = va_arg(ap, int); // vnet_link_t promotion + vnet_link_t link = va_arg(*ap, int); // vnet_link_t promotion return (format (s, "%s", vnet_link_names[link])); } diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h index f11a55da63f..b5d4ec95911 100644 --- a/src/vnet/fib/fib_types.h +++ b/src/vnet/fib/fib_types.h @@ -261,8 +261,8 @@ typedef enum fib_special_type_t_ { for (_item = FIB_TYPE_SPEICAL_FIRST; \ _item <= FIB_SPEICAL_TYPE_LAST; _item++) -extern u8 * format_fib_protocol(u8 * s, va_list ap); -extern u8 * format_vnet_link(u8 *s, va_list ap); +extern u8 * format_fib_protocol(u8 * s, va_list *ap); +extern u8 * format_vnet_link(u8 *s, va_list *ap); /** * Path flags from the control plane diff --git a/src/vnet/fib/fib_urpf_list.c b/src/vnet/fib/fib_urpf_list.c index b484442026a..d5a406e6191 100644 --- a/src/vnet/fib/fib_urpf_list.c +++ b/src/vnet/fib/fib_urpf_list.c @@ -22,13 +22,13 @@ fib_urpf_list_t *fib_urpf_list_pool; u8 * -format_fib_urpf_list (u8 *s, va_list args) +format_fib_urpf_list (u8 *s, va_list *args) { fib_urpf_list_t *urpf; index_t ui; u32 *swi; - ui = va_arg(args, index_t); + ui = va_arg(*args, index_t); if (INDEX_INVALID != ui) { diff --git a/src/vnet/fib/fib_urpf_list.h b/src/vnet/fib/fib_urpf_list.h index 09f475747cf..a3116bb93ec 100644 --- a/src/vnet/fib/fib_urpf_list.h +++ b/src/vnet/fib/fib_urpf_list.h @@ -83,7 +83,7 @@ extern void fib_urpf_list_combine(index_t urpf1, index_t urpf2); extern void fib_urpf_list_bake(index_t urpf); -extern u8 *format_fib_urpf_list(u8 *s, va_list ap); +extern u8 *format_fib_urpf_list(u8 *s, va_list *ap); extern void fib_urpf_list_show_mem(void); diff --git a/src/vnet/fib/fib_walk.c b/src/vnet/fib/fib_walk.c index 94297442ca6..d0942401153 100644 --- a/src/vnet/fib/fib_walk.c +++ b/src/vnet/fib/fib_walk.c @@ -185,18 +185,18 @@ typedef struct fib_walk_history_t_ { static fib_walk_history_t fib_walk_history[HISTORY_N_WALKS]; u8* -format_fib_walk_priority (u8 *s, va_list ap) +format_fib_walk_priority (u8 *s, va_list *ap) { - fib_walk_priority_t prio = va_arg(ap, fib_walk_priority_t); + fib_walk_priority_t prio = va_arg(*ap, fib_walk_priority_t); ASSERT(prio < FIB_WALK_PRIORITY_NUM); return (format(s, "%s", fib_walk_priority_names[prio])); } static u8* -format_fib_walk_queue_stats (u8 *s, va_list ap) +format_fib_walk_queue_stats (u8 *s, va_list *ap) { - fib_walk_queue_stats_t wqs = va_arg(ap, fib_walk_queue_stats_t); + fib_walk_queue_stats_t wqs = va_arg(*ap, fib_walk_queue_stats_t); ASSERT(wqs < FIB_WALK_QUEUE_STATS_NUM); @@ -927,9 +927,9 @@ fib_walk_module_init (void) } static u8* -format_fib_walk (u8* s, va_list ap) +format_fib_walk (u8* s, va_list *ap) { - fib_node_index_t fwi = va_arg(ap, fib_node_index_t); + fib_node_index_t fwi = va_arg(*ap, fib_node_index_t); fib_walk_t *fwalk; fwalk = fib_walk_get(fwi); diff --git a/src/vnet/fib/fib_walk.h b/src/vnet/fib/fib_walk.h index fdf2f10c196..503e705d065 100644 --- a/src/vnet/fib/fib_walk.h +++ b/src/vnet/fib/fib_walk.h @@ -52,7 +52,7 @@ extern void fib_walk_sync(fib_node_type_t parent_type, fib_node_index_t parent_index, fib_node_back_walk_ctx_t *ctx); -extern u8* format_fib_walk_priority(u8 *s, va_list ap); +extern u8* format_fib_walk_priority(u8 *s, va_list *ap); extern void fib_walk_process_enable(void); extern void fib_walk_process_disable(void); diff --git a/src/vnet/gre/gre.c b/src/vnet/gre/gre.c index a153c3c5b81..99421855bed 100644 --- a/src/vnet/gre/gre.c +++ b/src/vnet/gre/gre.c @@ -82,7 +82,7 @@ u8 * format_gre_header_with_length (u8 * s, va_list * args) gre_header_t * h = va_arg (*args, gre_header_t *); u32 max_header_bytes = va_arg (*args, u32); gre_protocol_t p = clib_net_to_host_u16 (h->protocol); - uword indent, header_bytes; + u32 indent, header_bytes; header_bytes = sizeof (h[0]); if (max_header_bytes != 0 && header_bytes > max_header_bytes) diff --git a/src/vnet/hdlc/hdlc.c b/src/vnet/hdlc/hdlc.c index 174085ac519..abb0dc3d221 100644 --- a/src/vnet/hdlc/hdlc.c +++ b/src/vnet/hdlc/hdlc.c @@ -63,7 +63,7 @@ u8 * format_hdlc_header_with_length (u8 * s, va_list * args) hdlc_header_t * h = va_arg (*args, hdlc_header_t *); u32 max_header_bytes = va_arg (*args, u32); hdlc_protocol_t p = clib_net_to_host_u16 (h->protocol); - uword indent, header_bytes; + u32 indent, header_bytes; header_bytes = sizeof (h[0]); if (max_header_bytes != 0 && header_bytes > max_header_bytes) diff --git a/src/vnet/interface_format.c b/src/vnet/interface_format.c index 5694bb2f7b4..e58369a1126 100644 --- a/src/vnet/interface_format.c +++ b/src/vnet/interface_format.c @@ -85,7 +85,7 @@ format_vnet_hw_interface (u8 * s, va_list * args) vnet_hw_interface_class_t *hw_class; vnet_device_class_t *dev_class; int verbose = va_arg (*args, int); - uword indent; + u32 indent; if (!hi) return format (s, "%=32s%=6s%=8s%s", "Name", "Idx", "Link", "Hardware"); @@ -180,7 +180,7 @@ u8 * format_vnet_sw_interface_cntrs (u8 * s, vnet_interface_main_t * im, vnet_sw_interface_t * si) { - uword indent, n_printed; + u32 indent, n_printed; int i, j, n_counters; static vnet_main_t **my_vnet_mains; diff --git a/src/vnet/interface_output.c b/src/vnet/interface_output.c index 06f1c7dd08b..e40f75bc833 100644 --- a/src/vnet/interface_output.c +++ b/src/vnet/interface_output.c @@ -59,7 +59,7 @@ format_vnet_interface_output_trace (u8 * s, va_list * va) interface_output_trace_t *t = va_arg (*va, interface_output_trace_t *); vnet_main_t *vnm = vnet_get_main (); vnet_sw_interface_t *si; - uword indent; + u32 indent; if (t->sw_if_index != (u32) ~ 0) { diff --git a/src/vnet/ip/ip4_format.c b/src/vnet/ip/ip4_format.c index c803e0656db..3f2221022c7 100644 --- a/src/vnet/ip/ip4_format.c +++ b/src/vnet/ip/ip4_format.c @@ -84,7 +84,7 @@ format_ip4_header (u8 * s, va_list * args) ip4_header_t *ip = va_arg (*args, ip4_header_t *); u32 max_header_bytes = va_arg (*args, u32); u32 ip_version, header_bytes; - uword indent; + u32 indent; /* Nothing to do. */ if (max_header_bytes < sizeof (ip[0])) diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c index 58cfd1816d8..64e5e8e829c 100755 --- a/src/vnet/ip/ip4_forward.c +++ b/src/vnet/ip/ip4_forward.c @@ -1258,7 +1258,7 @@ format_ip4_forward_next_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U%U", format_white_space, indent, format_ip4_header, t->packet_data, sizeof (t->packet_data)); @@ -1271,7 +1271,7 @@ format_ip4_lookup_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x", t->fib_index, t->dpo_index, t->flow_hash); @@ -1287,7 +1287,7 @@ format_ip4_rewrite_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); ip4_forward_next_trace_t *t = va_arg (*args, ip4_forward_next_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "tx_sw_if_index %d dpo-idx %d : %U flow hash: 0x%08x", t->fib_index, t->dpo_index, format_ip_adjacency, diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c index cc82384d537..4dbf8c966a8 100644 --- a/src/vnet/ip/ip4_mtrie.c +++ b/src/vnet/ip/ip4_mtrie.c @@ -740,7 +740,7 @@ format_ip4_fib_mtrie_ply (u8 * s, va_list * va) u32 base_address = va_arg (*va, u32); u32 ply_index = va_arg (*va, u32); ip4_fib_mtrie_8_ply_t *p; - uword indent; + u32 indent; int i; p = pool_elt_at_index (ip4_ply_pool, ply_index); diff --git a/src/vnet/ip/ip6_format.c b/src/vnet/ip/ip6_format.c index 56899b73d8b..b7ae2ffae29 100644 --- a/src/vnet/ip/ip6_format.c +++ b/src/vnet/ip/ip6_format.c @@ -219,7 +219,7 @@ format_ip6_header (u8 * s, va_list * args) ip6_header_t *ip = va_arg (*args, ip6_header_t *); u32 max_header_bytes = va_arg (*args, u32); u32 i, ip_version, traffic_class, flow_label; - uword indent; + u32 indent; /* Nothing to do. */ if (max_header_bytes < sizeof (ip[0])) diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c index 54582d38364..4f9ad85432f 100644 --- a/src/vnet/ip/ip6_forward.c +++ b/src/vnet/ip/ip6_forward.c @@ -998,7 +998,7 @@ format_ip6_forward_next_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U%U", format_white_space, indent, @@ -1012,7 +1012,7 @@ format_ip6_lookup_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "fib %d dpo-idx %d flow hash: 0x%08x", t->fib_index, t->adj_index, t->flow_hash); @@ -1029,7 +1029,7 @@ format_ip6_rewrite_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "tx_sw_if_index %d adj-idx %d : %U flow hash: 0x%08x", t->fib_index, t->adj_index, format_ip_adjacency, diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c index dbbea418fa6..7ed2e12cb1f 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c +++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c @@ -1371,9 +1371,9 @@ vnet_lisp_gpe_fwd_entry_flush (void) } static u8 * -format_lisp_fwd_path (u8 * s, va_list ap) +format_lisp_fwd_path (u8 * s, va_list * ap) { - lisp_fwd_path_t *lfp = va_arg (ap, lisp_fwd_path_t *); + lisp_fwd_path_t *lfp = va_arg (*ap, lisp_fwd_path_t *); s = format (s, "weight:%d ", lfp->weight); s = format (s, "adj:[%U]\n", @@ -1392,12 +1392,12 @@ typedef enum lisp_gpe_fwd_entry_format_flag_t_ static u8 * -format_lisp_gpe_fwd_entry (u8 * s, va_list ap) +format_lisp_gpe_fwd_entry (u8 * s, va_list * ap) { lisp_gpe_main_t *lgm = &lisp_gpe_main; - lisp_gpe_fwd_entry_t *lfe = va_arg (ap, lisp_gpe_fwd_entry_t *); + lisp_gpe_fwd_entry_t *lfe = va_arg (*ap, lisp_gpe_fwd_entry_t *); lisp_gpe_fwd_entry_format_flag_t flags = - va_arg (ap, lisp_gpe_fwd_entry_format_flag_t); + va_arg (*ap, lisp_gpe_fwd_entry_format_flag_t); s = format (s, "VNI:%d VRF:%d EID: %U -> %U [index:%d]", lfe->key->vni, lfe->eid_table_id, diff --git a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c index 26664f53104..6e145f527fb 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c +++ b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.c @@ -217,9 +217,9 @@ lisp_gpe_sub_interface_get (index_t l3si) } u8 * -format_lisp_gpe_sub_interface (u8 * s, va_list ap) +format_lisp_gpe_sub_interface (u8 * s, va_list * ap) { - lisp_gpe_sub_interface_t *l3s = va_arg (ap, lisp_gpe_sub_interface_t *); + lisp_gpe_sub_interface_t *l3s = va_arg (*ap, lisp_gpe_sub_interface_t *); vnet_main_t *vnm = vnet_get_main (); s = format (s, "%-16U", diff --git a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h index ad942f415d1..1abb314fbb3 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h +++ b/src/vnet/lisp-gpe/lisp_gpe_sub_interface.h @@ -87,7 +87,7 @@ extern index_t lisp_gpe_sub_interface_find_or_create_and_lock (const eid_table_id, u32 vni); -extern u8 *format_lisp_gpe_sub_interface (u8 * s, va_list ap); +extern u8 *format_lisp_gpe_sub_interface (u8 * s, va_list * ap); extern void lisp_gpe_sub_interface_unlock (index_t itf); diff --git a/src/vnet/lisp-gpe/lisp_gpe_tenant.c b/src/vnet/lisp-gpe/lisp_gpe_tenant.c index 40cf7edba13..2c77739edc8 100644 --- a/src/vnet/lisp-gpe/lisp_gpe_tenant.c +++ b/src/vnet/lisp-gpe/lisp_gpe_tenant.c @@ -272,9 +272,9 @@ lisp_gpe_tenant_flush (void) * @brif Show/display one tenant */ static u8 * -format_lisp_gpe_tenant (u8 * s, va_list ap) +format_lisp_gpe_tenant (u8 * s, va_list * ap) { - const lisp_gpe_tenant_t *lt = va_arg (ap, lisp_gpe_tenant_t *); + const lisp_gpe_tenant_t *lt = va_arg (*ap, lisp_gpe_tenant_t *); s = format (s, "VNI:%d ", lt->lt_vni); diff --git a/src/vnet/llc/llc.c b/src/vnet/llc/llc.c index 975207b651d..706d478853e 100644 --- a/src/vnet/llc/llc.c +++ b/src/vnet/llc/llc.c @@ -65,7 +65,7 @@ format_llc_header_with_length (u8 * s, va_list * args) llc_header_t *h = va_arg (*args, llc_header_t *); u32 max_header_bytes = va_arg (*args, u32); llc_protocol_t p = h->dst_sap; - uword indent, header_bytes; + u32 indent, header_bytes; header_bytes = llc_header_length (h); if (max_header_bytes != 0 && header_bytes > max_header_bytes) diff --git a/src/vnet/map/map.c b/src/vnet/map/map.c index 0c8cd6cd490..862f7cf5612 100644 --- a/src/vnet/map/map.c +++ b/src/vnet/map/map.c @@ -317,9 +317,9 @@ map_pre_resolve_init (map_main_pre_resolved_t * pr) } static u8 * -format_map_pre_resolve (u8 * s, va_list ap) +format_map_pre_resolve (u8 * s, va_list * ap) { - map_main_pre_resolved_t *pr = va_arg (ap, map_main_pre_resolved_t *); + map_main_pre_resolved_t *pr = va_arg (*ap, map_main_pre_resolved_t *); if (FIB_NODE_INDEX_INVALID != pr->fei) { diff --git a/src/vnet/mfib/mfib_table.c b/src/vnet/mfib/mfib_table.c index 838864ff7c0..efeadefb2d6 100644 --- a/src/vnet/mfib/mfib_table.c +++ b/src/vnet/mfib/mfib_table.c @@ -615,10 +615,10 @@ mfib_table_walk (u32 fib_index, } u8* -format_mfib_table_name (u8* s, va_list ap) +format_mfib_table_name (u8* s, va_list *ap) { - fib_node_index_t fib_index = va_arg(ap, fib_node_index_t); - fib_protocol_t proto = va_arg(ap, int); // int promotion + fib_node_index_t fib_index = va_arg(*ap, fib_node_index_t); + fib_protocol_t proto = va_arg(*ap, int); // int promotion mfib_table_t *mfib_table; mfib_table = mfib_table_get(fib_index, proto); diff --git a/src/vnet/mfib/mfib_table.h b/src/vnet/mfib/mfib_table.h index 93f90dd5d1d..6a5810291fc 100644 --- a/src/vnet/mfib/mfib_table.h +++ b/src/vnet/mfib/mfib_table.h @@ -80,7 +80,7 @@ typedef struct mfib_table_t_ * @brief * Format the description/name of the table */ -extern u8* format_mfib_table_name(u8* s, va_list ap); +extern u8* format_mfib_table_name(u8* s, va_list *ap); /** * @brief diff --git a/src/vnet/mfib/mfib_test.c b/src/vnet/mfib/mfib_test.c index 2562bc14b6a..3ec00a74aa8 100644 --- a/src/vnet/mfib/mfib_test.c +++ b/src/vnet/mfib/mfib_test.c @@ -180,7 +180,7 @@ mfib_test_mk_intf (u32 ninterfaces) static int mfib_test_validate_rep_v (const replicate_t *rep, u16 n_buckets, - va_list ap) + va_list *ap) { const dpo_id_t *dpo; adj_index_t ai; @@ -192,8 +192,8 @@ mfib_test_validate_rep_v (const replicate_t *rep, for (bucket = 0; bucket < n_buckets; bucket++) { - dt = va_arg(ap, int); // type promotion - ai = va_arg(ap, adj_index_t); + dt = va_arg(*ap, int); // type promotion + ai = va_arg(*ap, adj_index_t); dpo = replicate_get_bucket_i(rep, bucket); MFIB_TEST_REP((dt == dpo->dpoi_type), @@ -275,7 +275,7 @@ mfib_test_entry (fib_node_index_t fei, format_mfib_prefix, &pfx, format_dpo_type, tmp.dpoi_type); - res = mfib_test_validate_rep_v(rep, n_buckets, ap); + res = mfib_test_validate_rep_v(rep, n_buckets, &ap); dpo_reset(&tmp); } diff --git a/src/vnet/mpls/mpls_output.c b/src/vnet/mpls/mpls_output.c index 241a7835f2d..e0874cd1aa1 100644 --- a/src/vnet/mpls/mpls_output.c +++ b/src/vnet/mpls/mpls_output.c @@ -45,7 +45,7 @@ format_mpls_output_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); mpls_output_trace_t * t = va_arg (*args, mpls_output_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "adj-idx %d : %U flow hash: 0x%08x", t->adj_index, @@ -466,7 +466,7 @@ format_mpls_adj_incomplete_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); mpls_adj_incomplete_trace_t * t; - uword indent; + u32 indent; t = va_arg (*args, mpls_adj_incomplete_trace_t *); indent = format_get_indent (s); diff --git a/src/vnet/osi/osi.c b/src/vnet/osi/osi.c index 34c867f1bf5..0134eb0f5ea 100644 --- a/src/vnet/osi/osi.c +++ b/src/vnet/osi/osi.c @@ -65,7 +65,7 @@ format_osi_header_with_length (u8 * s, va_list * args) osi_header_t *h = va_arg (*args, osi_header_t *); u32 max_header_bytes = va_arg (*args, u32); osi_protocol_t p = h->protocol; - uword indent, header_bytes; + u32 indent, header_bytes; header_bytes = sizeof (h[0]); if (max_header_bytes != 0 && header_bytes > max_header_bytes) diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c index c3738a6a2aa..b70f3ce4fc0 100644 --- a/src/vnet/pg/input.c +++ b/src/vnet/pg/input.c @@ -1388,7 +1388,7 @@ format_pg_input_trace (u8 * s, va_list * va) pg_main_t *pg = &pg_main; pg_stream_t *stream; vlib_node_t *n; - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); stream = 0; if (!pool_is_free_index (pg->streams, t->stream_index)) diff --git a/src/vnet/pg/stream.c b/src/vnet/pg/stream.c index a540b32bba4..2dfbf5adcbd 100644 --- a/src/vnet/pg/stream.c +++ b/src/vnet/pg/stream.c @@ -100,7 +100,7 @@ format_pg_output_trace (u8 * s, va_list * va) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*va, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*va, vlib_node_t *); pg_output_trace_t *t = va_arg (*va, pg_output_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%Ubuffer 0x%x: %U", format_white_space, indent, diff --git a/src/vnet/ppp/ppp.c b/src/vnet/ppp/ppp.c index a0eefbadc3b..e1b5fc742b4 100644 --- a/src/vnet/ppp/ppp.c +++ b/src/vnet/ppp/ppp.c @@ -65,7 +65,7 @@ format_ppp_header_with_length (u8 * s, va_list * args) ppp_header_t *h = va_arg (*args, ppp_header_t *); u32 max_header_bytes = va_arg (*args, u32); ppp_protocol_t p = clib_net_to_host_u16 (h->protocol); - uword indent, header_bytes; + u32 indent, header_bytes; header_bytes = sizeof (h[0]); if (max_header_bytes != 0 && header_bytes > max_header_bytes) diff --git a/src/vnet/snap/snap.c b/src/vnet/snap/snap.c index 64482bfcfbb..8609c656572 100644 --- a/src/vnet/snap/snap.c +++ b/src/vnet/snap/snap.c @@ -91,7 +91,7 @@ format_snap_header_with_length (u8 * s, va_list * args) snap_header_t *h = va_arg (*args, snap_header_t *); snap_protocol_info_t *pi = snap_get_protocol_info (sm, h); u32 max_header_bytes = va_arg (*args, u32); - uword indent, header_bytes; + u32 indent, header_bytes; header_bytes = sizeof (h[0]); if (max_header_bytes != 0 && header_bytes > max_header_bytes) diff --git a/src/vnet/srp/format.c b/src/vnet/srp/format.c index a0250cc976f..408723a3606 100644 --- a/src/vnet/srp/format.c +++ b/src/vnet/srp/format.c @@ -65,7 +65,7 @@ u8 * format_srp_header_with_length (u8 * s, va_list * args) srp_and_ethernet_header_t * h = va_arg (*args, srp_and_ethernet_header_t *); u32 max_header_bytes = va_arg (*args, u32); ethernet_main_t * em = ðernet_main; - uword indent, header_bytes; + u32 indent, header_bytes; header_bytes = sizeof (h[0]); if (max_header_bytes != 0 && header_bytes > max_header_bytes) diff --git a/src/vnet/tcp/tcp_format.c b/src/vnet/tcp/tcp_format.c index 1ca2f58ea5d..6cc9ae541c6 100644 --- a/src/vnet/tcp/tcp_format.c +++ b/src/vnet/tcp/tcp_format.c @@ -59,7 +59,7 @@ format_tcp_header (u8 * s, va_list * args) tcp_header_t *tcp = va_arg (*args, tcp_header_t *); u32 max_header_bytes = va_arg (*args, u32); u32 header_bytes; - uword indent; + u32 indent; /* Nothing to do. */ if (max_header_bytes < sizeof (tcp[0])) diff --git a/src/vnet/tcp/tcp_input.c b/src/vnet/tcp/tcp_input.c index 252b0014c8c..1679f818947 100644 --- a/src/vnet/tcp/tcp_input.c +++ b/src/vnet/tcp/tcp_input.c @@ -1628,7 +1628,7 @@ format_tcp_rx_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); tcp_rx_trace_t *t = va_arg (*args, tcp_rx_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U\n%U%U", format_tcp_header, &t->tcp_header, 128, diff --git a/src/vnet/tcp/tcp_output.c b/src/vnet/tcp/tcp_output.c index 6482e894348..e921a4a13ea 100644 --- a/src/vnet/tcp/tcp_output.c +++ b/src/vnet/tcp/tcp_output.c @@ -55,7 +55,7 @@ format_tcp_tx_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); tcp_tx_trace_t *t = va_arg (*args, tcp_tx_trace_t *); - uword indent = format_get_indent (s); + u32 indent = format_get_indent (s); s = format (s, "%U\n%U%U", format_tcp_header, &t->tcp_header, 128, diff --git a/src/vnet/udp/udp_format.c b/src/vnet/udp/udp_format.c index abdf561e8c9..0e9fb17e0f0 100644 --- a/src/vnet/udp/udp_format.c +++ b/src/vnet/udp/udp_format.c @@ -45,7 +45,7 @@ format_udp_header (u8 * s, va_list * args) { udp_header_t *udp = va_arg (*args, udp_header_t *); u32 max_header_bytes = va_arg (*args, u32); - uword indent; + u32 indent; u32 header_bytes = sizeof (udp[0]); /* Nothing to do. */ |