xserver: Branch 'master'

[Adam Jackson]

 exa/exa_render.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c7cefe24001279a558dd875949d40ede49ef702
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Oct 20 11:44:28 2011 +0100

    exa: initialise mask_off_x and mask_off_y
    
    These get used at the end of the function in a calculation,
    even though the result isn't used its not pretty.
    
    Pointed out by coverity.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/exa/exa_render.c b/exa/exa_render.c
index e3e5526..fc3ddea 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -636,7 +636,7 @@ exaTryDriverComposite(CARD8 op,
     RegionRec region;
     BoxPtr pbox;
     int nbox;
-    int src_off_x, src_off_y, mask_off_x, mask_off_y, dst_off_x, dst_off_y;
+    int src_off_x, src_off_y, mask_off_x = 0, mask_off_y = 0, dst_off_x, dst_off_y;
     PixmapPtr pSrcPix = NULL, pMaskPix = NULL, pDstPix;
     ExaPixmapPrivPtr pSrcExaPix = NULL, pMaskExaPix = NULL, pDstExaPix;