diff options
| author | Keith Packard <keithp@keithp.com> | 2010-11-10 16:58:21 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-11-10 16:58:21 -0800 |
| commit | 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9 (patch) | |
| tree | e4ea374adb5e3bf00eeddcd8c35a6e4063a34c03 /glx | |
| parent | 291c39dfef84d1b204d7f5e63e925dee2dbdaca7 (diff) | |
| parent | ec1bfbc66926130e1153facc3b92ee175f1cb6b6 (diff) | |
Merge remote branch 'whot/for-keith'
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glxdri.c | 4 | ||||
| -rw-r--r-- | glx/glxdri2.c | 4 | ||||
| -rw-r--r-- | glx/single2.c | 7 |
3 files changed, 4 insertions, 11 deletions
diff --git a/glx/glxdri.c b/glx/glxdri.c index 6458ef928..db3fcd5cb 100644 --- a/glx/glxdri.c +++ b/glx/glxdri.c @@ -1158,9 +1158,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 56ad86dc6..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 ) { @@ -377,8 +375,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap) __GLX_SEND_HEADER(); WriteToClient(client, length, (char *) string); - if (buf != NULL) - free(buf); + free(buf); return Success; } |