summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-09-03 19:44:00 -0700
committerMatt Turner <[email protected]>2012-09-05 22:28:50 -0700
commit2b7a972e3f36bfcdc6fbe2b59d7ffdcde49c9405 (patch)
tree4b9504b4799e9d29363690fb9083ac4bbcf78d51 /src/gallium/drivers/r300
parent812931f602ff913a51a608a9b1b6826b7f2bfae0 (diff)
Don't cast the return value of malloc/realloc
This patch has been generated by the following Coccinelle semantic patch: // Don't cast the return value of malloc/realloc. // // Casting the return value of malloc/realloc only stands to hide // errors. @@ type T; expression E1, E2; @@ - (T) ( _mesa_align_calloc(E1, E2) | _mesa_align_malloc(E1, E2) | calloc(E1, E2) | malloc(E1) | realloc(E1, E2) )
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r--src/gallium/drivers/r300/compiler/memory_pool.c4
-rw-r--r--src/gallium/drivers/r300/r300_cb.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/compiler/memory_pool.c b/src/gallium/drivers/r300/compiler/memory_pool.c
index ddcdddf9e3c..a98dd709f2a 100644
--- a/src/gallium/drivers/r300/compiler/memory_pool.c
+++ b/src/gallium/drivers/r300/compiler/memory_pool.c
@@ -58,7 +58,7 @@ static void refill_pool(struct memory_pool * pool)
if (!blocksize)
blocksize = 2*POOL_LARGE_ALLOC;
- newblock = (struct memory_block*)malloc(blocksize);
+ newblock = malloc(blocksize);
newblock->next = pool->blocks;
pool->blocks = newblock;
@@ -85,7 +85,7 @@ void * memory_pool_malloc(struct memory_pool * pool, unsigned int bytes)
return ptr;
} else {
- struct memory_block * block = (struct memory_block*)malloc(bytes + sizeof(struct memory_block));
+ struct memory_block * block = malloc(bytes + sizeof(struct memory_block));
block->next = pool->blocks;
pool->blocks = block;
diff --git a/src/gallium/drivers/r300/r300_cb.h b/src/gallium/drivers/r300/r300_cb.h
index b373937a1f9..e031e990bd7 100644
--- a/src/gallium/drivers/r300/r300_cb.h
+++ b/src/gallium/drivers/r300/r300_cb.h
@@ -82,7 +82,7 @@
do { \
assert(sizeof(*(ptr)) == sizeof(uint32_t)); \
cs_count = (size); \
- cs_ptr = (ptr) = (uint32_t*)malloc((size) * sizeof(uint32_t)); \
+ cs_ptr = (ptr) = malloc((size) * sizeof(uint32_t)); \
} while (0)
#define END_CB do { \
@@ -99,7 +99,7 @@
uint32_t *cs_ptr = NULL; (void) cs_ptr
#define NEW_CB(ptr, size) \
- cs_ptr = (ptr) = (uint32_t*)malloc((size) * sizeof(uint32_t))
+ cs_ptr = (ptr) = malloc((size) * sizeof(uint32_t))
#define BEGIN_CB(ptr, size) cs_ptr = (ptr)
#define END_CB