From 2b7a972e3f36bfcdc6fbe2b59d7ffdcde49c9405 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 3 Sep 2012 19:44:00 -0700 Subject: 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) ) --- src/mesa/drivers/dri/radeon/radeon_context.c | 2 +- src/mesa/drivers/dri/radeon/radeon_queryobj.h | 2 +- src/mesa/drivers/dri/radeon/radeon_sanity.c | 3 +-- src/mesa/drivers/dri/radeon/radeon_screen.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/mesa/drivers/dri/radeon') diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 2b99e36b2a3..f151747abcd 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -201,7 +201,7 @@ r100CreateContext( gl_api api, assert(screen); /* Allocate the Radeon context */ - rmesa = (r100ContextPtr) calloc(1, sizeof(*rmesa)); + rmesa = calloc(1, sizeof(*rmesa)); if ( !rmesa ) { *error = __DRI_CTX_ERROR_NO_MEMORY; return GL_FALSE; diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.h b/src/mesa/drivers/dri/radeon/radeon_queryobj.h index 9ed61e237ed..0ad177a2c43 100644 --- a/src/mesa/drivers/dri/radeon/radeon_queryobj.h +++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.h @@ -42,7 +42,7 @@ void radeon_emit_queryobj(struct gl_context *ctx, struct radeon_state_atom *atom static inline void radeon_init_query_stateobj(radeonContextPtr radeon, int SZ) { radeon->query.queryobj.cmd_size = (SZ); - radeon->query.queryobj.cmd = (uint32_t*) calloc(SZ, sizeof(uint32_t)); + radeon->query.queryobj.cmd = calloc(SZ, sizeof(uint32_t)); radeon->query.queryobj.name = "queryobj"; radeon->query.queryobj.idx = 0; radeon->query.queryobj.check = radeon_check_query_active; diff --git a/src/mesa/drivers/dri/radeon/radeon_sanity.c b/src/mesa/drivers/dri/radeon/radeon_sanity.c index 3e64be83edd..02f2e2b13b6 100644 --- a/src/mesa/drivers/dri/radeon/radeon_sanity.c +++ b/src/mesa/drivers/dri/radeon/radeon_sanity.c @@ -380,8 +380,7 @@ static int find_or_add_value( struct reg *reg, int val ) if (j == reg->nalloc) { reg->nalloc += 5; reg->nalloc *= 2; - reg->values = (union fi *) realloc( reg->values, - reg->nalloc * sizeof(union fi) ); + reg->values = realloc( reg->values, reg->nalloc * sizeof(union fi) ); } reg->values[reg->nvalues++].i = val; diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index acd4cc1e2c5..237503d7708 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -488,7 +488,7 @@ radeonCreateScreen2(__DRIscreen *sPriv) uint32_t device_id = 0; /* Allocate the private area */ - screen = (radeonScreenPtr) calloc(1, sizeof(*screen)); + screen = calloc(1, sizeof(*screen)); if ( !screen ) { fprintf(stderr, "%s: Could not allocate memory for screen structure", __FUNCTION__); fprintf(stderr, "leaving here\n"); -- cgit v1.2.3