From ffe9d21b07ce4b607fd9a774df04f9f1f38eb197 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 30 May 2018 09:26:11 +0200 Subject: vppinfra: explicitely state for signed types that they are signed This fixes some compilation warnings with clang on AArch64. Change-Id: Idb941944e3f199f483c80e143a9e5163a031c4aa Signed-off-by: Damjan Marion --- src/plugins/dpdk/buffer.c | 4 ++-- src/plugins/dpdk/device/init.c | 4 ++-- src/plugins/dpdk/ipsec/cli.c | 4 ++-- src/plugins/dpdk/ipsec/crypto_node.c | 2 +- src/plugins/dpdk/ipsec/ipsec.c | 2 +- src/plugins/dpdk/ipsec/ipsec.h | 4 ++-- src/vat/main.c | 2 +- src/vppinfra/macros.c | 4 ++-- src/vppinfra/types.h | 14 +++++++------- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c index 148f7891788..3b3aaf2379f 100644 --- a/src/plugins/dpdk/buffer.c +++ b/src/plugins/dpdk/buffer.c @@ -497,7 +497,7 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, size = rte_mempool_xmem_size (num_elts, obj_size, 21, 0); error = - vlib_physmem_region_alloc (vm, (i8 *) pool_name, size, numa, + vlib_physmem_region_alloc (vm, (char *) pool_name, size, numa, VLIB_PHYSMEM_F_HUGETLB | VLIB_PHYSMEM_F_SHARED, pri); if (error) @@ -506,7 +506,7 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size, pr = vlib_physmem_get_region (vm, pri[0]); mp = - rte_mempool_create_empty ((i8 *) pool_name, num_elts, elt_size, + rte_mempool_create_empty ((char *) pool_name, num_elts, elt_size, 512, pool_priv_size, numa, 0); if (!mp) return clib_error_return (0, "failed to create %s", pool_name); diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index 7156e69b4dc..d7c369a9c80 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -134,7 +134,7 @@ dpdk_device_lock_init (dpdk_device_t * xd) } static struct rte_mempool_ops * -get_ops_by_name (i8 * ops_name) +get_ops_by_name (char *ops_name) { u32 i; @@ -152,7 +152,7 @@ dpdk_ring_alloc (struct rte_mempool *mp) { u32 rg_flags = 0, count; i32 ret; - i8 rg_name[RTE_RING_NAMESIZE]; + char rg_name[RTE_RING_NAMESIZE]; struct rte_ring *r; ret = snprintf (rg_name, sizeof (rg_name), RTE_MEMPOOL_MZ_FORMAT, mp->name); diff --git a/src/plugins/dpdk/ipsec/cli.c b/src/plugins/dpdk/ipsec/cli.c index b5ac105a4b1..b879deaa96b 100644 --- a/src/plugins/dpdk/ipsec/cli.c +++ b/src/plugins/dpdk/ipsec/cli.c @@ -25,7 +25,7 @@ format_crypto (u8 * s, va_list * args) crypto_drv_t *drv = vec_elt_at_index (dcm->drv, dev->drv_id); u64 feat, mask; u32 i; - i8 *pre = " "; + char *pre = " "; s = format (s, "%-25s%-20s%-10s\n", dev->name, drv->name, rte_cryptodevs[dev->id].data->dev_started ? "up" : "down"); @@ -128,7 +128,7 @@ format_crypto_worker (u8 * s, va_list * args) crypto_worker_main_t *cwm; crypto_resource_t *res; u16 *res_idx; - i8 *pre, *ind; + char *pre, *ind; u32 i; cwm = vec_elt_at_index (dcm->workers_main, thread_idx); diff --git a/src/plugins/dpdk/ipsec/crypto_node.c b/src/plugins/dpdk/ipsec/crypto_node.c index 6b9ff58efcf..6c92e8fc5ba 100644 --- a/src/plugins/dpdk/ipsec/crypto_node.c +++ b/src/plugins/dpdk/ipsec/crypto_node.c @@ -63,7 +63,7 @@ static u8 * format_cryptodev_status (u8 * s, va_list * args) { u32 status = va_arg (*args, u32); - i8 *str = 0; + char *str = 0; switch (status) { diff --git a/src/plugins/dpdk/ipsec/ipsec.c b/src/plugins/dpdk/ipsec/ipsec.c index b8cfc7e6b78..268f27be42f 100644 --- a/src/plugins/dpdk/ipsec/ipsec.c +++ b/src/plugins/dpdk/ipsec/ipsec.c @@ -633,7 +633,7 @@ crypto_dev_conf (u8 dev, u16 n_qp, u8 numa) struct rte_cryptodev_qp_conf qp_conf; i32 ret; u16 qp; - i8 *error_str; + char *error_str; dev_conf.socket_id = numa; dev_conf.nb_queue_pairs = n_qp; diff --git a/src/plugins/dpdk/ipsec/ipsec.h b/src/plugins/dpdk/ipsec/ipsec.h index 775e7521ffe..dc11dfc2c14 100644 --- a/src/plugins/dpdk/ipsec/ipsec.h +++ b/src/plugins/dpdk/ipsec/ipsec.h @@ -93,14 +93,14 @@ typedef struct u8 drv_id; u8 numa; u16 id; - const i8 *name; + const char *name; u32 max_qp; u64 features; } crypto_dev_t; typedef struct { - const i8 *name; + const char *name; u16 *devs; } crypto_drv_t; diff --git a/src/vat/main.c b/src/vat/main.c index 723c5e8cc3a..4357114376d 100644 --- a/src/vat/main.c +++ b/src/vat/main.c @@ -117,7 +117,7 @@ do_one_file (vat_main_t * vam) vec_free (this_cmd); this_cmd = - (u8 *) clib_macro_eval (&vam->macro_main, (char *) vam->inbuf, + (u8 *) clib_macro_eval (&vam->macro_main, (i8 *) vam->inbuf, 1 /* complain */ ); if (vam->exec_mode == 0) diff --git a/src/vppinfra/macros.c b/src/vppinfra/macros.c index ce4cc9bc81b..6649277d897 100644 --- a/src/vppinfra/macros.c +++ b/src/vppinfra/macros.c @@ -144,7 +144,7 @@ clib_macro_eval (macro_main_t * mm, i8 * s, i32 complain) /* Look in value table */ if (!varvalue) { - char *tmp = clib_macro_get_value (mm, varname); + i8 *tmp = clib_macro_get_value (mm, (char *) varname); if (tmp) varvalue = (i8 *) format (0, "%s%c", tmp, 0); } @@ -152,7 +152,7 @@ clib_macro_eval (macro_main_t * mm, i8 * s, i32 complain) /* Look in environment. */ if (!varvalue) { - char *tmp = getenv (varname); + char *tmp = getenv ((char *) varname); if (tmp) varvalue = (i8 *) format (0, "%s%c", tmp, 0); } diff --git a/src/vppinfra/types.h b/src/vppinfra/types.h index f87bb48c910..5fd378314f3 100644 --- a/src/vppinfra/types.h +++ b/src/vppinfra/types.h @@ -42,8 +42,8 @@ /* Define signed and unsigned 8, 16, 32, and 64 bit types and machine signed/unsigned word for all architectures. */ -typedef char i8; -typedef short i16; +typedef signed char i8; +typedef signed short i16; /* Avoid conflicts with Linux asm/types.h when __KERNEL__ */ #if defined(CLIB_LINUX_KERNEL) @@ -59,14 +59,14 @@ typedef unsigned short u16; #if defined (__x86_64__) #ifndef __COVERITY__ -typedef int i128 __attribute__ ((mode (TI))); +typedef signed int i128 __attribute__ ((mode (TI))); typedef unsigned int u128 __attribute__ ((mode (TI))); #endif #endif #if (defined(i386) || defined(_mips) || defined(powerpc) || defined (__SPU__) || defined(__sparc__) || defined(__arm__) || defined (__xtensa__) || defined(__TMS320C6X__)) -typedef int i32; -typedef long long i64; +typedef signed int i32; +typedef signed long long i64; #ifndef CLIB_AVOID_CLASH_WITH_LINUX_TYPES typedef unsigned int u32; @@ -78,8 +78,8 @@ typedef unsigned long long u64; #define clib_address_bits _MIPS_SZPTR #elif defined(alpha) || defined(__x86_64__) || defined (__powerpc64__) || defined (__aarch64__) -typedef int i32; -typedef long i64; +typedef signed int i32; +typedef signed long i64; #define log2_uword_bits 6 #define clib_address_bits 64 -- cgit 1.2.3-korg