From da60cb8cac23460c0ca4a8fa8014a3461fb5bdfa Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 6 Sep 2019 03:38:37 +0200 Subject: GC.c: code simplifications / scope improvements --- nx-X11/programs/Xserver/hw/nxagent/GC.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c index 9d3ce2741..e7be173b3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GC.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c @@ -1112,10 +1112,9 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects) case CT_REGION: if (nxagentGCPriv(pGC)->pPixmap == NULL) { - XRectangle *pRects; nRects = RegionNumRects((RegionPtr)pValue); - int size = nRects * sizeof(*pRects); - pRects = (XRectangle *) malloc(size); + int size = nRects * sizeof(XRectangle *); + XRectangle *pRects = (XRectangle *) malloc(size); BoxPtr pBox = RegionRects((RegionPtr)pValue); for (int i = nRects; i-- > 0;) { pRects[i].x = pBox[i].x1; @@ -1409,12 +1408,12 @@ GCPtr nxagentCreateGraphicContext(int depth) return NULL; } - XID attributes[2]; - /* * Color used in nxagentFillRemoteRegion(). */ + XID attributes[2]; + attributes[0] = 0xc1c1c1; if (depth == 15 || depth == 16) -- cgit v1.2.3