From e39a7b8347b1055cca6e9cfadcfeca23f8236eb9 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Tue, 26 Apr 2016 14:54:57 +0200 Subject: Fix compile errors reported by clang For using clang as a compiler it is enough to specify CC=clang in the make command line Change-Id: I06f1c1d418b68768f8119de5bdc8748c51f90c02 Signed-off-by: Damjan Marion --- vnet/vnet/ip/adj_alloc.c | 2 +- vnet/vnet/lisp-cp/packets.c | 2 +- vnet/vnet/lisp-gpe/decap.c | 2 +- vnet/vnet/lisp-gpe/lisp_gpe.c | 2 +- vnet/vnet/vcgn/cnat_global.c | 2 +- vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c | 4 ++-- vnet/vnet/vcgn/cnat_logging.c | 2 +- vnet/vnet/vcgn/cnat_ports.c | 2 +- vnet/vnet/vcgn/cnat_syslog.c | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) (limited to 'vnet') diff --git a/vnet/vnet/ip/adj_alloc.c b/vnet/vnet/ip/adj_alloc.c index 56104207363..3ae7a199f19 100644 --- a/vnet/vnet/ip/adj_alloc.c +++ b/vnet/vnet/ip/adj_alloc.c @@ -51,7 +51,7 @@ aa_alloc (ip_adjacency_t * adjs, ip_adjacency_t **blockp, u32 n) aa_header_t * ah = aa_header (adjs); ip_adjacency_t * adj_block; u32 freelist_length; - int need_barrier_sync; + int need_barrier_sync = 0; ASSERT(os_get_cpu_number() == 0); ASSERT (clib_mem_is_heap_object (_vec_find(ah))); diff --git a/vnet/vnet/lisp-cp/packets.c b/vnet/vnet/lisp-cp/packets.c index aa246a9dc3d..28471b9a82d 100644 --- a/vnet/vnet/lisp-cp/packets.c +++ b/vnet/vnet/lisp-cp/packets.c @@ -225,7 +225,7 @@ pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t *b, u16 sp, u16 dp, udpsum = udp_checksum (uh, clib_net_to_host_u16 (uh->length), ih, ip_addr_version(sip)); - if (udpsum == -1) + if (udpsum == (u16) ~0) { clib_warning("Failed UDP checksum! Discarding"); return 0; diff --git a/vnet/vnet/lisp-gpe/decap.c b/vnet/vnet/lisp-gpe/decap.c index 5d88462b416..d0848ab56f4 100644 --- a/vnet/vnet/lisp-gpe/decap.c +++ b/vnet/vnet/lisp-gpe/decap.c @@ -104,7 +104,7 @@ lisp_gpe_input (vlib_main_t * vm, vlib_node_runtime_t * node, u32 bi0, bi1; vlib_buffer_t * b0, * b1; ip4_udp_lisp_gpe_header_t * iul0, * iul1; - u32 next0, next1, error0, error1; + u32 next0, next1, error0 = 0, error1 = 0; uword * si0, * si1; next0 = next1 = LISP_GPE_INPUT_NEXT_IP4_INPUT; diff --git a/vnet/vnet/lisp-gpe/lisp_gpe.c b/vnet/vnet/lisp-gpe/lisp_gpe.c index fd1e1a4608e..a1d4b6fb2ee 100644 --- a/vnet/vnet/lisp-gpe/lisp_gpe.c +++ b/vnet/vnet/lisp-gpe/lisp_gpe.c @@ -721,7 +721,7 @@ add_del_negative_fwd_entry (lisp_gpe_main_t * lgm, /* TODO insert tunnel that always sends map-request */ case DROP: /* for drop fwd entries, just add route, no need to add encap tunnel */ - adj.lookup_next_index = LGPE_IP4_LOOKUP_NEXT_DROP; + adj.lookup_next_index = (u16) LGPE_IP4_LOOKUP_NEXT_DROP; /* add/delete route for prefix */ return ip4_sd_fib_add_del_route (lgm, dpref, spref, a->table_id, &adj, diff --git a/vnet/vnet/vcgn/cnat_global.c b/vnet/vnet/vcgn/cnat_global.c index 9ab89eeaf05..7177083466e 100644 --- a/vnet/vnet/vcgn/cnat_global.c +++ b/vnet/vnet/vcgn/cnat_global.c @@ -57,7 +57,7 @@ dslite_table_entry_t *dslite_table_db_ptr; */ /* TOBE_PORTED: Following is in cnat_util.c */ -always_inline +always_inline __attribute__((unused)) void ipv4_decr_ttl_n_calc_csum(ipv4_header *ipv4) { u32 checksum; diff --git a/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c b/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c index f6ffd4efa7e..5a24a111f75 100644 --- a/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c +++ b/vnet/vnet/vcgn/cnat_ipv4_udp_outside_input.c @@ -137,8 +137,8 @@ is_static_dest_nat_enabled(u16 vrf) return CNAT_NO_CONFIG; }*/ -static inline void swap_ip_dst(ipv4_header *ip, - cnat_main_db_entry_t *db, u16 vrf) +static inline void __attribute__((unused)) +swap_ip_dst(ipv4_header *ip, cnat_main_db_entry_t *db, u16 vrf) { CNAT_UPDATE_L3_CHECKSUM_DECLARE diff --git a/vnet/vnet/vcgn/cnat_logging.c b/vnet/vnet/vcgn/cnat_logging.c index d404c590c26..50805d118ae 100644 --- a/vnet/vnet/vcgn/cnat_logging.c +++ b/vnet/vnet/vcgn/cnat_logging.c @@ -2668,7 +2668,7 @@ void cnat_nfv9_ds_lite_log_session_delete( */ -static inline +static inline __attribute__((unused)) void handle_vrfid_name_mapping(void) { cnat_nfv9_logging_info_t *nfv9_logging_info = NULL; diff --git a/vnet/vnet/vcgn/cnat_ports.c b/vnet/vnet/vcgn/cnat_ports.c index 4437865aaee..943fb3ed38c 100644 --- a/vnet/vnet/vcgn/cnat_ports.c +++ b/vnet/vnet/vcgn/cnat_ports.c @@ -623,7 +623,7 @@ cnat_dynamic_port_alloc_v2 ( for (i = 0; i < max_trys_to_find_port; i++) { /* start_bit is only a u16.. so it can rollover and become zero */ - if (PREDICT_FALSE((start_bit >= BITS_PER_INST) || + if (PREDICT_FALSE( /* (start_bit >= BITS_PER_INST) || FIXME u16 cannot be >= 65536 */ (start_bit < static_port_range))) { start_bit = static_port_range; #ifndef NO_BULK_LOGGING diff --git a/vnet/vnet/vcgn/cnat_syslog.c b/vnet/vnet/vcgn/cnat_syslog.c index 65fde4caf30..91758f141a9 100644 --- a/vnet/vnet/vcgn/cnat_syslog.c +++ b/vnet/vnet/vcgn/cnat_syslog.c @@ -361,7 +361,7 @@ byte_to_ascii_decimal_unaligned( * in to the space provided and * returns the number of bytes copied */ -inline static int +inline static int __attribute__((unused)) copy_ipv4_addr(unsigned char *ptr, u32 ipv4) { unsigned char *temp = ptr; -- cgit 1.2.3-korg