[PATCH 08/16] dmx: Xfree -> free

[Peter Hutterer]

On Tue, May 25, 2010 at 04:53:19PM -0700, Jamey Sharp wrote:
> Mikhail fixed the corresponding Xallocs, but missed these uses of Xfree
> in commit 3f3ff971ecff9936cebafc813af9193b97bba89c.
> 
> Signed-off-by: Jamey Sharp <jamey at minilop.net>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
  Peter

> ---
>  hw/dmx/glxProxy/glxcmds.c    |    2 +-
>  hw/dmx/glxProxy/glxscreens.c |    4 ++--
>  hw/dmx/glxProxy/glxsingle.c  |   12 ++++++------
>  hw/dmx/glxProxy/glxvendor.c  |    6 +++---
>  4 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
> index fbd1c03..de248ed 100644
> --- a/hw/dmx/glxProxy/glxcmds.c
> +++ b/hw/dmx/glxProxy/glxcmds.c
> @@ -3404,7 +3404,7 @@ int __glXGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
>        WriteToClient(client, attribs_size, (char *)attribs);
>     }
>  
> -   Xfree(attribs);
> +   free(attribs);
>  
>     return Success;
>  }
> diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c
> index 7be7ac4..dbd4a92 100644
> --- a/hw/dmx/glxProxy/glxscreens.c
> +++ b/hw/dmx/glxProxy/glxscreens.c
> @@ -204,9 +204,9 @@ static void CalcServerVersionAndExtensions( void )
>      * release temporary storage
>      */
>     for (s=0; s<__glXNumActiveScreens; s++) {
> -      if (be_extensions[s]) Xfree(be_extensions[s]); 
> +      free(be_extensions[s]);
>     }
> -   Xfree( be_extensions );
> +   free( be_extensions );
>  
>     if (dmxGLXSwapGroupSupport) {
>         if (!denied_extensions ||
> diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c
> index 8c7fdfc..a41257e 100644
> --- a/hw/dmx/glxProxy/glxsingle.c
> +++ b/hw/dmx/glxProxy/glxsingle.c
> @@ -288,7 +288,7 @@ int __glXForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
>  	  WriteToClient(client, be_buf_size, (char *)be_buf);
>      }
>  
> -    if (be_buf_size > 0) Xfree(be_buf);
> +    if (be_buf_size > 0) free(be_buf);
>  
>      return Success;
>  }
> @@ -364,7 +364,7 @@ int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
>         SyncHandle();
>  
>         if (s > from_screen && be_buf_size > 0) {
> -	  Xfree(be_buf);
> +	  free(be_buf);
>         }
>      }
>  
> @@ -388,7 +388,7 @@ int __glXForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
>  	  WriteToClient(client, be_buf_size, (char *)be_buf);
>      }
>  
> -    if (be_buf_size > 0) Xfree(be_buf);
> +    if (be_buf_size > 0) free(be_buf);
>  
>      return Success;
>  }
> @@ -939,12 +939,12 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
>  
>  		   }
>  
> -		   Xfree( be_buf );
> +		   free( be_buf );
>  		}
>  		else {
>  		   /* Throw data on the floor */
>  		   _XEatData(dpy, be_buf_size);
> -		   Xfree( buf );
> +		   free( buf );
>  		   return BadAlloc;
>  		}
>  	     }
> @@ -970,7 +970,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc)
>      WriteToClient(client, sizeof(xGLXReadPixelsReply),(char *)&reply);
>      if (buf_size > 0) {
>         WriteToClient(client, buf_size, (char *)buf);
> -       Xfree( buf );
> +       free( buf );
>      }
>  
>      return Success;
> diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c
> index 6af53e2..cf864c2 100644
> --- a/hw/dmx/glxProxy/glxvendor.c
> +++ b/hw/dmx/glxProxy/glxvendor.c
> @@ -272,7 +272,7 @@ int __glXVForwardPipe0WithReply( __GLXclientState *cl, GLbyte *pc )
>  	  WriteToClient(client, be_buf_size, (char *)be_buf);
>      }
>  
> -    if (be_buf_size > 0) Xfree(be_buf);
> +    if (be_buf_size > 0) free(be_buf);
>  
>      return Success;
>  }
> @@ -349,7 +349,7 @@ int __glXVForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
>         SyncHandle();
>  
>         if (s > from_screen && be_buf_size > 0) {
> -	  Xfree(be_buf);
> +	  free(be_buf);
>         }
>      }
>  
> @@ -369,7 +369,7 @@ int __glXVForwardAllWithReply( __GLXclientState *cl, GLbyte *pc )
>  	  WriteToClient(client, be_buf_size, (char *)be_buf);
>      }
>  
> -    if (be_buf_size > 0) Xfree(be_buf);
> +    if (be_buf_size > 0) free(be_buf);
>  
>      return Success;
>  }
> -- 
> 1.7.0