The malloc family returns void * and therefore cast is unnecessary.
Use calloc rather than zmalloc with multiply for array.
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
app/test/test_hash_perf.c | 8 ++++----
app/test/test_mempool.c | 2 +-
app/test/test_ring.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
index be34957..6f719fc 100644
--- a/app/test/test_hash_perf.c
+++ b/app/test/test_hash_perf.c
@@ -459,13 +459,13 @@ run_single_tbl_perf_test(const struct rte_hash *h,
hash_operation func,
/* Initialise */
num_buckets = params->entries / params->bucket_entries;
- key = (uint8_t *) rte_zmalloc("hash key",
- params->key_len * sizeof(uint8_t), 16);
+ key = rte_zmalloc("hash key",
+ params->key_len * sizeof(uint8_t), 16);
if (key == NULL)
return -1;
- bucket_occupancies = (uint32_t *) rte_zmalloc("bucket occupancies",
- num_buckets * sizeof(uint32_t), 16);
+ bucket_occupancies = rte_calloc("bucket occupancies",
+ num_buckets, sizeof(uint32_t), 16);
if (bucket_occupancies == NULL) {
rte_free(key);
return -1;
diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index 303d2b3..de85c9c 100644
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -360,7 +360,7 @@ test_mempool_basic_ex(struct rte_mempool * mp)
if (mp == NULL)
return ret;
- obj = (void **)rte_zmalloc("test_mempool_basic_ex", (MEMPOOL_SIZE *
sizeof(void *)), 0);
+ obj = rte_calloc("test_mempool_basic_ex", MEMPOOL_SIZE , sizeof(void
*), 0);
if (obj == NULL) {
printf("test_mempool_basic_ex fail to rte_malloc\n");
return ret;
diff --git a/app/test/test_ring.c b/app/test/test_ring.c
index 2cd8e77..ce25329 100644
--- a/app/test/test_ring.c
+++ b/app/test/test_ring.c
@@ -1259,7 +1259,7 @@ test_ring_basic_ex(void)
struct rte_ring * rp;
void **obj = NULL;
- obj = (void **)rte_zmalloc("test_ring_basic_ex_malloc", (RING_SIZE *
sizeof(void *)), 0);
+ obj = rte_calloc("test_ring_basic_ex_malloc", RING_SIZE, sizeof(void
*), 0);
if (obj == NULL) {
printf("test_ring_basic_ex fail to rte_malloc\n");
goto fail_test;
--
2.1.4
