[PATCH] Delete redundant GC initializations.

[Alex Deucher]

On Tue, Jul 13, 2010 at 6:35 PM, Jamey Sharp <jamey at minilop.net> wrote:
> When a GC is allocated, it is zeroed, including all storage requested
> with dixRegisterPrivateKey. So CreateGC hooks don't need to initialize
> anything to zero.
>
> Signed-off-by: Jamey Sharp <jamey at minilop.net>

Reviewed-by: Alex Deucher <alexdeucher at gmail.com>

> ---
>  fb/fbgc.c              |    8 +-------
>  hw/xfree86/xaa/xaaGC.c |    5 -----
>  hw/xnest/GC.c          |    3 ---
>  hw/xwin/wingc.c        |    5 -----
>  miext/cw/cw.c          |    1 -
>  miext/damage/damage.c  |    1 -
>  6 files changed, 1 insertions(+), 22 deletions(-)
>
> diff --git a/fb/fbgc.c b/fb/fbgc.c
> index 45e981b..b27a030 100644
> --- a/fb/fbgc.c
> +++ b/fb/fbgc.c
> @@ -64,19 +64,13 @@ const GCOps fbGCOps = {
>  Bool
>  fbCreateGC(GCPtr pGC)
>  {
> -    pGC->clientClip = NULL;
> -    pGC->clientClipType = CT_NONE;
> -
>     pGC->ops = (GCOps *) &fbGCOps;
>     pGC->funcs = (GCFuncs *) &fbGCFuncs;
>
>     /* fb wants to translate before scan conversion */
>     pGC->miTranslate = 1;
> +    pGC->fExpose = 1;
>
> -    fbGetRotatedPixmap(pGC) = 0;
> -    fbGetExpose(pGC) = 1;
> -    fbGetFreeCompClip(pGC) = 0;
> -    fbGetCompositeClip(pGC) = 0;
>     fbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);
>     return TRUE;
>  }
> diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
> index fb24387..44d50e6 100644
> --- a/hw/xfree86/xaa/xaaGC.c
> +++ b/hw/xfree86/xaa/xaaGC.c
> @@ -48,11 +48,6 @@ XAACreateGC(GCPtr pGC)
>        pGCPriv->wrapOps = NULL;
>        pGCPriv->wrapFuncs = pGC->funcs;
>        pGCPriv->XAAOps = &XAAFallbackOps;
> -       pGCPriv->flags = 0;
> -       pGCPriv->DashLength = 0;
> -       pGCPriv->DashPattern = NULL;
> -       pGCPriv->changes = 0;
> -       /* initialize any other private fields here */
>        pGC->funcs = &XAAGCFuncs;
>     }
>
> diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
> index 407cc77..7968b4f 100644
> --- a/hw/xnest/GC.c
> +++ b/hw/xnest/GC.c
> @@ -73,9 +73,6 @@ static GCOps xnestOps = {
>  Bool
>  xnestCreateGC(GCPtr pGC)
>  {
> -  pGC->clientClipType = CT_NONE;
> -  pGC->clientClip = NULL;
> -
>   pGC->funcs = &xnestFuncs;
>   pGC->ops = &xnestOps;
>
> diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c
> index 196b5b5..e351c50 100644
> --- a/hw/xwin/wingc.c
> +++ b/hw/xwin/wingc.c
> @@ -137,11 +137,6 @@ winCreateGCNativeGDI (GCPtr pGC)
>          pGC->depth);
>  #endif
>
> -  pGC->clientClip = NULL;
> -  pGC->clientClipType = CT_NONE;
> -  pGC->freeCompClip = FALSE;
> -  pGC->pCompositeClip = 0;
> -
>   pGC->ops = (GCOps *) &winGCOps;
>   pGC->funcs = (GCFuncs *) &winGCFuncs;
>
> diff --git a/miext/cw/cw.c b/miext/cw/cw.c
> index 58816c9..3da3bc3 100644
> --- a/miext/cw/cw.c
> +++ b/miext/cw/cw.c
> @@ -325,7 +325,6 @@ cwCreateGC(GCPtr pGC)
>     ScreenPtr  pScreen = pGC->pScreen;
>     Bool       ret;
>
> -    memset(pPriv, 0, sizeof(cwGCRec));
>     SCREEN_PROLOGUE(pScreen, CreateGC);
>
>     if ( (ret = (*pScreen->CreateGC)(pGC)) )
> diff --git a/miext/damage/damage.c b/miext/damage/damage.c
> index f5917ea..2ea5e63 100644
> --- a/miext/damage/damage.c
> +++ b/miext/damage/damage.c
> @@ -450,7 +450,6 @@ damageCreateGC(GCPtr pGC)
>     damageGCPriv(pGC);
>     Bool ret;
>
> -    pGC->pCompositeClip = 0;
>     unwrap (pScrPriv, pScreen, CreateGC);
>     if((ret = (*pScreen->CreateGC) (pGC))) {
>        pGCPriv->ops = NULL;
> --
> 1.7.0
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>