[PATCH] xquartz: Delete compile-time-constant DRIGCRec.driOps field.
Jeremy Huddleston
jeremyhu at apple.com
Tue Jul 13 16:10:52 PDT 2010
Looks sane to me...
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
On Jul 13, 2010, at 15:35, Jamey Sharp wrote:
> The driOps field of this structure is never set to anything but
> &driGCOps, and this structure is not visible outside this source file.
> Just use the constant in the one place the field was used.
>
> Signed-off-by: Jamey Sharp <jamey at minilop.net>
> Cc: Jeremy Huddleston <jeremyhu at apple.com>
> ---
> hw/xquartz/xpr/driWrap.c | 6 +-----
> 1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/hw/xquartz/xpr/driWrap.c b/hw/xquartz/xpr/driWrap.c
> index 65843b8..de5c4a2 100644
> --- a/hw/xquartz/xpr/driWrap.c
> +++ b/hw/xquartz/xpr/driWrap.c
> @@ -41,7 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
>
> typedef struct {
> GCOps *originalOps;
> - GCOps *driOps;
> } DRIGCRec;
>
> typedef struct {
> @@ -86,9 +85,7 @@ DRIUnwrapGC(GCPtr pGC) {
>
> static void
> DRIWrapGC(GCPtr pGC) {
> - DRIGCRec *pGCPriv = DRIGetGCPriv(pGC);
> -
> - pGC->ops = pGCPriv->driOps;
> + pGC->ops = &driGCOps;
> }
>
> static void
> @@ -513,7 +510,6 @@ DRICreateGC(GCPtr pGC) {
> if(ret) {
> pGCPriv->originalOps = pGC->ops;
> pGC->ops = &driGCOps;
> - pGCPriv->driOps = &driGCOps;
> }
>
> wrap(pScreenPriv, pScreen, CreateGC, DRICreateGC);
> --
> 1.7.0
>
More information about the xorg-devel
mailing list