diff options
author | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-06 08:49:13 +0200 |
commit | ccc8a492607df715b08d27c6bb3b9d13b1ff48a2 (patch) | |
tree | 4311d252acd49786ceed60cb55343af0a9294a2f /mesalib/src/mesa/drivers/dri | |
parent | a4d007b9b60f2fc7c8de46533e2f47ecb24f3c9c (diff) | |
parent | aa10a08696cae93799fcddae3f0245ceee905e01 (diff) | |
download | vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.gz vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.tar.bz2 vcxsrv-ccc8a492607df715b08d27c6bb3b9d13b1ff48a2.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/drivers/dri')
-rw-r--r-- | mesalib/src/mesa/drivers/dri/common/xmlconfig.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c index 929748400..72483a42a 100644 --- a/mesalib/src/mesa/drivers/dri/common/xmlconfig.c +++ b/mesalib/src/mesa/drivers/dri/common/xmlconfig.c @@ -989,8 +989,7 @@ void driParseConfigFiles (driOptionCache *cache, const driOptionCache *info, XML_ParserFree (p); } - if (filenames[1]) - free(filenames[1]); + free(filenames[1]); } void driDestroyOptionInfo (driOptionCache *info) { @@ -1000,8 +999,7 @@ void driDestroyOptionInfo (driOptionCache *info) { for (i = 0; i < size; ++i) { if (info->info[i].name) { free(info->info[i].name); - if (info->info[i].ranges) - free(info->info[i].ranges); + free(info->info[i].ranges); } } free(info->info); @@ -1009,8 +1007,7 @@ void driDestroyOptionInfo (driOptionCache *info) { } void driDestroyOptionCache (driOptionCache *cache) { - if (cache->values) - free(cache->values); + free(cache->values); } GLboolean driCheckOption (const driOptionCache *cache, const char *name, |