diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-07 15:37:23 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-07 15:37:23 +1030 |
| commit | 0b729051c04da7068f1e6dd319190bd0a362b2c0 (patch) | |
| tree | 6e15c5de67a40d04167fcf0a2e0e26af8eca11c2 /XTrap | |
| parent | b7ee005d327372c1e414ee6c526f9f7aee14bc86 (diff) | |
| parent | d7c5e8bfc1aecbd23a4cbb2eab08656587aac2e8 (diff) | |
Merge branch 'master' into mpx
Conflicts:
Xi/extinit.c
Xi/grabdev.c
Xi/setmode.c
Xi/ungrdev.c
dix/devices.c
dix/events.c
dix/getevents.c
include/dix.h
mi/midispcur.c
mi/misprite.c
xkb/xkbActions.c
xkb/xkbEvents.c
xkb/xkbPrKeyEv.c
Diffstat (limited to 'XTrap')
| -rw-r--r-- | XTrap/xtrapdi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 0b70d7b1d..91874f0ca 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -2033,7 +2033,7 @@ static void GetSendColorCellsRep(ClientPtr client, xResourceReq *req) } nmasks = creq->planes; length = ((long)npixels + (long)nmasks) * sizeof(Pixel); - data = (XETrapDatum *)ALLOCATE_LOCAL(sizeof(XETrapDatum)+length); + data = (XETrapDatum *)xalloc(sizeof(XETrapDatum)+length); if (!data) { SendErrorToClient(penv->client, XETrap_avail.data.major_opcode, @@ -2051,7 +2051,7 @@ static void GetSendColorCellsRep(ClientPtr client, xResourceReq *req) { SendErrorToClient(penv->client, XETrap_avail.data.major_opcode, req->reqType, 0L, retval); - DEALLOCATE_LOCAL(data); + xfree(data); return; } crep = (xAllocColorCellsReply *)&(data->u.reply); @@ -2076,7 +2076,7 @@ static void GetSendColorCellsRep(ClientPtr client, xResourceReq *req) SendErrorToClient(penv->client, XETrap_avail.data.major_opcode, req->reqType, 0L, XETrapErrorBase + BadIO); } - DEALLOCATE_LOCAL(data); + xfree(data); } static void GetSendColorPlanesRep(ClientPtr client, xResourceReq *req) { /* adapted from ProcAllocColorPlanes() in dispatch.c */ @@ -2104,7 +2104,7 @@ static void GetSendColorPlanesRep(ClientPtr client, xResourceReq *req) return; } length = (long)npixels * sizeof(Pixel); - data = (XETrapDatum *)ALLOCATE_LOCAL(sizeof(XETrapDatum)+length); + data = (XETrapDatum *)xalloc(sizeof(XETrapDatum)+length); if (!data) { SendErrorToClient(penv->client, XETrap_avail.data.major_opcode, @@ -2124,7 +2124,7 @@ static void GetSendColorPlanesRep(ClientPtr client, xResourceReq *req) { SendErrorToClient(penv->client, XETrap_avail.data.major_opcode, req->reqType, 0L, retval); - DEALLOCATE_LOCAL(data); + xfree(data); return; } crep->nPixels = npixels; @@ -2149,6 +2149,6 @@ static void GetSendColorPlanesRep(ClientPtr client, xResourceReq *req) SendErrorToClient(penv->client, XETrap_avail.data.major_opcode, req->reqType, 0L, XETrapErrorBase + BadIO); } - DEALLOCATE_LOCAL(data); + xfree(data); } #endif /* COLOR_REPLIES */ |