From d6287b213bab87d80aca20b688b0a0ace7be5521 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 15 Jun 2014 03:48:22 +1000 Subject: BLI_gsqueue: use size_t for elem_size (was casting all over) --- source/blender/blenlib/BLI_gsqueue.h | 2 +- source/blender/blenlib/intern/gsqueue.c | 18 +++++++++--------- source/blender/bmesh/tools/bmesh_bevel.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/blender/blenlib/BLI_gsqueue.h b/source/blender/blenlib/BLI_gsqueue.h index e002545d189..f7c669891ad 100644 --- a/source/blender/blenlib/BLI_gsqueue.h +++ b/source/blender/blenlib/BLI_gsqueue.h @@ -36,7 +36,7 @@ typedef struct _GSQueue GSQueue; -GSQueue *BLI_gsqueue_new(int elem_size); +GSQueue *BLI_gsqueue_new(size_t elem_size); bool BLI_gsqueue_is_empty(GSQueue *gq); int BLI_gsqueue_size(GSQueue *gq); void BLI_gsqueue_peek(GSQueue *gq, void *item_r); diff --git a/source/blender/blenlib/intern/gsqueue.c b/source/blender/blenlib/intern/gsqueue.c index 6967742f89b..72f30086e9b 100644 --- a/source/blender/blenlib/intern/gsqueue.c +++ b/source/blender/blenlib/intern/gsqueue.c @@ -45,7 +45,7 @@ struct _GSQueueElem { struct _GSQueue { GSQueueElem *head; GSQueueElem *tail; - int elem_size; + size_t elem_size; }; /** @@ -54,7 +54,7 @@ struct _GSQueue { * \param elem_size The size of the structures in the queue. * \retval The new queue */ -GSQueue *BLI_gsqueue_new(int elem_size) +GSQueue *BLI_gsqueue_new(size_t elem_size) { GSQueue *gq = MEM_mallocN(sizeof(*gq), "gqueue_new"); gq->head = gq->tail = NULL; @@ -94,7 +94,7 @@ int BLI_gsqueue_size(GSQueue *gq) */ void BLI_gsqueue_peek(GSQueue *gq, void *item_r) { - memcpy(item_r, &gq->head[1], (size_t)gq->elem_size); + memcpy(item_r, &gq->head[1], gq->elem_size); } /** @@ -115,7 +115,7 @@ void BLI_gsqueue_pop(GSQueue *gq, void *item_r) gq->head = gq->head->next; } - if (item_r) memcpy(item_r, &elem[1], (size_t)gq->elem_size); + if (item_r) memcpy(item_r, &elem[1], gq->elem_size); MEM_freeN(elem); } @@ -131,11 +131,11 @@ void BLI_gsqueue_push(GSQueue *gq, void *item) /* compare: prevent events added double in row */ if (!BLI_gsqueue_is_empty(gq)) { - if (0 == memcmp(item, &gq->head[1], (size_t)gq->elem_size)) + if (0 == memcmp(item, &gq->head[1], gq->elem_size)) return; } - elem = MEM_mallocN(sizeof(*elem) + (size_t)gq->elem_size, "gqueue_push"); - memcpy(&elem[1], item, (size_t)gq->elem_size); + elem = MEM_mallocN(sizeof(*elem) + gq->elem_size, "gqueue_push"); + memcpy(&elem[1], item, gq->elem_size); elem->next = NULL; if (BLI_gsqueue_is_empty(gq)) { @@ -155,8 +155,8 @@ void BLI_gsqueue_push(GSQueue *gq, void *item) */ void BLI_gsqueue_pushback(GSQueue *gq, void *item) { - GSQueueElem *elem = MEM_mallocN(sizeof(*elem) + (size_t)gq->elem_size, "gqueue_push"); - memcpy(&elem[1], item, (size_t)gq->elem_size); + GSQueueElem *elem = MEM_mallocN(sizeof(*elem) + gq->elem_size, "gqueue_push"); + memcpy(&elem[1], item, gq->elem_size); elem->next = gq->head; if (BLI_gsqueue_is_empty(gq)) { diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 4c1ff95a075..76d1d3d9bc0 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -1639,7 +1639,7 @@ static void adjust_offsets(BevelParams *bp) bv->visited = false; } - q = BLI_gsqueue_new((int)sizeof(BevVert *)); + q = BLI_gsqueue_new(sizeof(BevVert *)); /* the following loop terminates because at least one node is visited each time */ for (;;) { /* look for root of a connected component in search graph */ -- cgit v1.2.3