diff options
| author | Brian Paul <[email protected]> | 2012-09-03 08:12:04 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2012-09-03 18:07:41 -0600 |
| commit | 2ffc7fd2d2cbb1e895ceb8afd12e7c4a2dc3050f (patch) | |
| tree | 6659861b546419a1d206e6d30c1d2e7f9f0ca5cb /src/mesa/main | |
| parent | 2276bb991ac091b2b42274c2a094ba6f1de08468 (diff) | |
mesa: remove more null pointer checks before free() calls
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jose Fonseca <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/texcompress_fxt1.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/texcompress_rgtc.c | 16 | ||||
| -rw-r--r-- | src/mesa/main/texcompress_s3tc.c | 12 |
3 files changed, 14 insertions, 20 deletions
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index eafa187940e..8948bd278ee 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/src/mesa/main/texcompress_fxt1.c @@ -99,8 +99,7 @@ _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS) fxt1_encode(srcWidth, srcHeight, 3, pixels, srcRowStride, dst, dstRowStride); - if (tempImage) - free((void*) tempImage); + free((void*) tempImage); return GL_TRUE; } @@ -149,8 +148,7 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS) fxt1_encode(srcWidth, srcHeight, 4, pixels, srcRowStride, dst, dstRowStride); - if (tempImage) - free((void*) tempImage); + free((void*) tempImage); return GL_TRUE; } diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c index 84d8fc7fc19..5773459d79f 100644 --- a/src/mesa/main/texcompress_rgtc.c +++ b/src/mesa/main/texcompress_rgtc.c @@ -129,8 +129,8 @@ _mesa_texstore_red_rgtc1(TEXSTORE_PARAMS) } blkaddr += dstRowDiff; } - if (tempImage) - free((void *) tempImage); + + free((void *) tempImage); return GL_TRUE; } @@ -176,8 +176,8 @@ _mesa_texstore_signed_red_rgtc1(TEXSTORE_PARAMS) } blkaddr += dstRowDiff; } - if (tempImage) - free((void *) tempImage); + + free((void *) tempImage); return GL_TRUE; } @@ -230,8 +230,8 @@ _mesa_texstore_rg_rgtc2(TEXSTORE_PARAMS) } blkaddr += dstRowDiff; } - if (tempImage) - free((void *) tempImage); + + free((void *) tempImage); return GL_TRUE; } @@ -285,8 +285,8 @@ _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS) } blkaddr += dstRowDiff; } - if (tempImage) - free((void *) tempImage); + + free((void *) tempImage); return GL_TRUE; } diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index 230242c56b2..8736e208fde 100644 --- a/src/mesa/main/texcompress_s3tc.c +++ b/src/mesa/main/texcompress_s3tc.c @@ -203,8 +203,7 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS) _mesa_warning(ctx, "external dxt library not available: texstore_rgb_dxt1"); } - if (tempImage) - free((void *) tempImage); + free((void *) tempImage); return GL_TRUE; } @@ -256,8 +255,7 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS) _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt1"); } - if (tempImage) - free((void*) tempImage); + free((void*) tempImage); return GL_TRUE; } @@ -308,8 +306,7 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS) _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt3"); } - if (tempImage) - free((void *) tempImage); + free((void *) tempImage); return GL_TRUE; } @@ -360,8 +357,7 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS) _mesa_warning(ctx, "external dxt library not available: texstore_rgba_dxt5"); } - if (tempImage) - free((void *) tempImage); + free((void *) tempImage); return GL_TRUE; } |