frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove more superfluous if(p!=NULL) checks around free(p). 

This patch has been generated by the following Coccinelle semantic patch:

@@
expression E;
@@
- if (E != NULL) {
-   free(E);
- }
+ free(E);

Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Cyril Brulebois 2010-11-10 15:28:29 +01:00 committed by Peter Hutterer
parent b142b0d274
commit 68e4a628d6
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glx/glxdri.c
View File

@ -1160,9 +1160,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
*/ */
buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL); buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
if (buffer_size > 0) { if (buffer_size > 0) {
if (screen->base.GLXextensions != NULL) { free(screen->base.GLXextensions);
free(screen->base.GLXextensions);
}
screen->base.GLXextensions = xnfalloc(buffer_size); screen->base.GLXextensions = xnfalloc(buffer_size);
(void) __glXGetExtensionString(screen->glx_enable_bits, (void) __glXGetExtensionString(screen->glx_enable_bits,

4
glx/glxdri2.c
View File

@ -792,9 +792,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
*/ */
buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL); buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
if (buffer_size > 0) { if (buffer_size > 0) {
if (screen->base.GLXextensions != NULL) { free(screen->base.GLXextensions);
free(screen->base.GLXextensions);
}
screen->base.GLXextensions = xnfalloc(buffer_size); screen->base.GLXextensions = xnfalloc(buffer_size);
(void) __glXGetExtensionString(screen->glx_enable_bits, (void) __glXGetExtensionString(screen->glx_enable_bits,

4
glx/single2.c
View File

@ -346,9 +346,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
cl->GLClientextensions); cl->GLClientextensions);
buf = __glXcombine_strings(buf1, buf = __glXcombine_strings(buf1,
cx->pGlxScreen->GLextensions); cx->pGlxScreen->GLextensions);
if (buf1 != NULL) { free(buf1);
free(buf1);
}
string = buf; string = buf;
} }
else if ( name == GL_VERSION ) { else if ( name == GL_VERSION ) {

5
hw/xwin/glx/indirect.c
View File

@ -682,10 +682,7 @@ glxWinScreenProbe(ScreenPtr pScreen)
unsigned int buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL); unsigned int buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
if (buffer_size > 0) if (buffer_size > 0)
{ {
if (screen->base.GLXextensions != NULL) free(screen->base.GLXextensions);
{
free(screen->base.GLXextensions);
}
screen->base.GLXextensions = xnfalloc(buffer_size); screen->base.GLXextensions = xnfalloc(buffer_size);
__glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions); __glXGetExtensionString(screen->glx_enable_bits, screen->base.GLXextensions);