summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/objectlabel.c
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2014-09-21 21:13:33 -0700
committerMatt Turner <mattst88@gmail.com>2014-12-08 17:02:19 -0800
commit9019e5e19532fe214fc6e45b9ee1f60bbe332456 (patch)
treec382866b78653aea157f085c9cdb8bd3695798e8 /src/mesa/main/objectlabel.c
parentcae7a2a0319e31eef0975edafc730efd3bd2c8d4 (diff)
downloadexternal_mesa3d-9019e5e19532fe214fc6e45b9ee1f60bbe332456.zip
external_mesa3d-9019e5e19532fe214fc6e45b9ee1f60bbe332456.tar.gz
external_mesa3d-9019e5e19532fe214fc6e45b9ee1f60bbe332456.tar.bz2
Remove useless checks for NULL before freeing
See commits 5067506e and b6109de3 for the Coccinelle script. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/objectlabel.c')
-rw-r--r--src/mesa/main/objectlabel.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/main/objectlabel.c b/src/mesa/main/objectlabel.c
index 8efc33e..efa7ba8 100644
--- a/src/mesa/main/objectlabel.c
+++ b/src/mesa/main/objectlabel.c
@@ -45,11 +45,8 @@ static void
set_label(struct gl_context *ctx, char **labelPtr, const char *label,
int length, const char *caller)
{
- if (*labelPtr) {
- /* free old label string */
- free(*labelPtr);
- *labelPtr = NULL;
- }
+ free(*labelPtr);
+ *labelPtr = NULL;
/* set new label string */
if (label) {