aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi/miexpose.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-03 21:46:33 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-03 21:46:33 +0100
commit96e2556031c8aff62a4650b9cfb814991f5240e1 (patch)
tree78bbb0c52085036b2a3ff82b29f242173bf39eda /nx-X11/programs/Xserver/mi/miexpose.c
parent89ccf26d65a3f205e54d9f6240b672f970e7b9c1 (diff)
parent09ef99919c010801bd4220d482a867035b6f4f25 (diff)
downloadnx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.gz
nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.bz2
nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.zip
Merge branch 'uli42-pr/remove_allocate_local' into 3.6.x
Attribute GH PR #369: https://github.com/ArcticaProject/nx-libs/pull/369
Diffstat (limited to 'nx-X11/programs/Xserver/mi/miexpose.c')
-rw-r--r--nx-X11/programs/Xserver/mi/miexpose.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c
index e16ebf4f8..c39221000 100644
--- a/nx-X11/programs/Xserver/mi/miexpose.c
+++ b/nx-X11/programs/Xserver/mi/miexpose.c
@@ -395,7 +395,7 @@ miSendGraphicsExpose (client, pRgn, drawable, major, minor)
numRects = RegionNumRects(pRgn);
pBox = RegionRects(pRgn);
- if(!(pEvent = (xEvent *)ALLOCATE_LOCAL(numRects * sizeof(xEvent))))
+ if(!(pEvent = (xEvent *)malloc(numRects * sizeof(xEvent))))
return;
pe = pEvent;
@@ -413,7 +413,7 @@ miSendGraphicsExpose (client, pRgn, drawable, major, minor)
}
TryClientEvents(client, pEvent, numRects,
(Mask)0, NoEventMask, NullGrab);
- DEALLOCATE_LOCAL(pEvent);
+ free(pEvent);
}
else
{
@@ -442,7 +442,7 @@ miSendExposures(pWin, pRgn, dx, dy)
pBox = RegionRects(pRgn);
numRects = RegionNumRects(pRgn);
- if(!(pEvent = (xEvent *) ALLOCATE_LOCAL(numRects * sizeof(xEvent))))
+ if(!(pEvent = (xEvent *) malloc(numRects * sizeof(xEvent))))
return;
memset(pEvent, 0, numRects * sizeof(xEvent));
@@ -473,7 +473,7 @@ miSendExposures(pWin, pRgn, dx, dy)
win = PanoramiXFindIDByScrnum(XRT_WINDOW,
pWin->drawable.id, scrnum);
if(!win) {
- DEALLOCATE_LOCAL(pEvent);
+ free(pEvent);
return;
}
realWin = win->info[0].id;
@@ -490,7 +490,7 @@ miSendExposures(pWin, pRgn, dx, dy)
DeliverEvents(pWin, pEvent, numRects, NullWindow);
- DEALLOCATE_LOCAL(pEvent);
+ free(pEvent);
}
#ifndef NXAGENT_SERVER
@@ -705,7 +705,7 @@ int what;
}
}
- prect = (xRectangle *)ALLOCATE_LOCAL(RegionNumRects(prgn) *
+ prect = (xRectangle *)malloc(RegionNumRects(prgn) *
sizeof(xRectangle));
if (!prect)
return;
@@ -730,7 +730,7 @@ int what;
pGC = GetScratchGC(pWin->drawable.depth, pWin->drawable.pScreen);
if (!pGC)
{
- DEALLOCATE_LOCAL(prect);
+ free(prect);
return;
}
/*
@@ -862,7 +862,7 @@ int what;
}
prect -= numRects;
(*pGC->ops->PolyFillRect)((DrawablePtr)pWin, pGC, numRects, prect);
- DEALLOCATE_LOCAL(prect);
+ free(prect);
if (pWin->backStorage)
(*pWin->drawable.pScreen->DrawGuarantee) (pWin, pGC, GuaranteeNothing);