[dpdk-dev] [PATCH 1/2] lib: Fix pointer arithmetic for C++

[Joongi Kim]

 * C++ requires explicit conversion of void pointer types to other
   pointer types.

 * This issue was introduced by previous commits 6cf14ce4 and 7755baae8.
   Two subsequent commits 2f935c12 and 7621d6a also have the same issue,
   I did not fix them because they are NOT headers potentially included
   by C++ sources.

Signed-off-by: Joongi Kim <joongi at an.kaist.ac.kr>
---
 lib/librte_malloc/malloc_elem.h  | 4 ++--
 lib/librte_mbuf/rte_mbuf.h       | 2 +-
 lib/librte_mempool/rte_mempool.c | 2 +-
 lib/librte_mempool/rte_mempool.h | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/librte_malloc/malloc_elem.h b/lib/librte_malloc/malloc_elem.h
index 9790b1a..2b18d06 100644
--- a/lib/librte_malloc/malloc_elem.h
+++ b/lib/librte_malloc/malloc_elem.h
@@ -124,10 +124,10 @@ malloc_elem_from_data(const void *data)
        if (data == NULL)
                return NULL;

-       struct malloc_elem *elem = RTE_PTR_SUB(data, MALLOC_ELEM_HEADER_LEN);
+       struct malloc_elem *elem = (struct malloc_elem *) RTE_PTR_SUB(data, 
MALLOC_ELEM_HEADER_LEN);
        if (!malloc_elem_cookies_ok(elem))
                return NULL;
-       return elem->state != ELEM_PAD ? elem:  RTE_PTR_SUB(elem, elem->pad);
+       return elem->state != ELEM_PAD ? elem: (struct malloc_elem *) 
RTE_PTR_SUB(elem, elem->pad);
 }

 /*
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 8a2cae1..4fc770b 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -348,7 +348,7 @@ static inline uint16_t rte_pktmbuf_priv_size(struct 
rte_mempool *mp);
 static inline struct rte_mbuf *
 rte_mbuf_from_indirect(struct rte_mbuf *mi)
 {
-       return RTE_PTR_SUB(mi->buf_addr, sizeof(*mi) + mi->priv_size);
+       return (struct rte_mbuf *) RTE_PTR_SUB(mi->buf_addr, sizeof(*mi) + 
mi->priv_size);
 }

 /**
diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index 02699a1..e22ddb3 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -136,7 +136,7 @@ mempool_add_elem(struct rte_mempool *mp, void *obj, 
uint32_t obj_idx,
        obj = (char *)obj + mp->header_size;

        /* set mempool ptr in header */
-       hdr = RTE_PTR_SUB(obj, sizeof(*hdr));
+       hdr = (struct rte_mempool_objhdr *) RTE_PTR_SUB(obj, sizeof(*hdr));
        hdr->mp = mp;

 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 6d4ce9a..7c966a1 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -262,13 +262,13 @@ struct rte_mempool {
 /* return the header of a mempool object (internal) */
 static inline struct rte_mempool_objhdr *__mempool_get_header(void *obj)
 {
-       return RTE_PTR_SUB(obj, sizeof(struct rte_mempool_objhdr));
+       return (struct rte_mempool_objhdr *) RTE_PTR_SUB(obj, sizeof(struct 
rte_mempool_objhdr));
 }

 /* return the trailer of a mempool object (internal) */
 static inline struct rte_mempool_objtlr *__mempool_get_trailer(void *obj)
 {
-       return RTE_PTR_SUB(obj, sizeof(struct rte_mempool_objtlr));
+       return (struct rte_mempool_objtlr *) RTE_PTR_SUB(obj, sizeof(struct 
rte_mempool_objtlr));
 }

 /**
-- 
1.9.1