diff options
| author | Cyril Brulebois <kibi@debian.org> | 2010-11-10 15:28:29 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 08:30:26 +1000 |
| commit | 68e4a628d65312df93cc71f3e76241584c4bbd23 (patch) | |
| tree | ac82aeaa7de26f796f4af428ccd95287cce74221 /glx | |
| parent | b142b0d27442191d628762604f4eb1f65263d717 (diff) | |
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>
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glxdri.c | 4 | ||||
| -rw-r--r-- | glx/glxdri2.c | 4 | ||||
| -rw-r--r-- | glx/single2.c | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/glx/glxdri.c b/glx/glxdri.c index 41482c913..ec9343463 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -1160,9 +1160,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) */ buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL); if (buffer_size > 0) { - if (screen->base.GLXextensions != NULL) { - free(screen->base.GLXextensions); - } + free(screen->base.GLXextensions); screen->base.GLXextensions = xnfalloc(buffer_size); (void) __glXGetExtensionString(screen->glx_enable_bits, diff --git a/glx/glxdri2.c b/glx/glxdri2.c index c2305ad90..0b6920151 100644 --- a/glx/glxdri2.c +++ b/glx/glxdri2.c @@ -792,9 +792,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) */ buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL); if (buffer_size > 0) { - if (screen->base.GLXextensions != NULL) { - free(screen->base.GLXextensions); - } + free(screen->base.GLXextensions); screen->base.GLXextensions = xnfalloc(buffer_size); (void) __glXGetExtensionString(screen->glx_enable_bits, diff --git a/glx/single2.c b/glx/single2.c index f93ce6e4a..07b89a823 100644 --- a/glx/single2.c +++ b/glx/single2.c @@ -346,9 +346,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap) cl->GLClientextensions); buf = __glXcombine_strings(buf1, cx->pGlxScreen->GLextensions); - if (buf1 != NULL) { - free(buf1); - } + free(buf1); string = buf; } else if ( name == GL_VERSION ) { |