diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-03-19 15:12:49 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-03-19 15:12:49 -0400 |
| commit | 6adc23cb19bfd331221df8dccb2dc88b8fc77821 (patch) | |
| tree | 727db4ddf90dd4088423d7ee5a8fa88de58fdcc4 /src/savage_dri.c | |
| parent | 371d8fbae6f077d5a6dd845fad129fa9c7b0a701 (diff) | |
Remove use of deprecated {DE,}ALLOCATE_LOCAL.
Diffstat (limited to 'src/savage_dri.c')
| -rw-r--r-- | src/savage_dri.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/savage_dri.c b/src/savage_dri.c index 468cf7d..0d40222 100644 --- a/src/savage_dri.c +++ b/src/savage_dri.c @@ -1429,11 +1429,11 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, if (nbox>1) { /* Keep ordering in each band, reverse order of bands */ - pboxNew1 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox); + pboxNew1 = xalloc(sizeof(BoxRec)*nbox); if (!pboxNew1) return; - pptNew1 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox); + pptNew1 = xalloc(sizeof(DDXPointRec)*nbox); if (!pptNew1) { - DEALLOCATE_LOCAL(pboxNew1); + xfree(pboxNew1); return; } pboxBase = pboxNext = pbox+nbox-1; @@ -1464,14 +1464,14 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, if (nbox > 1) { /*reverse orderof rects in each band */ - pboxNew2 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox); - pptNew2 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox); + pboxNew2 = xalloc(sizeof(BoxRec)*nbox); + pptNew2 = xalloc(sizeof(DDXPointRec)*nbox); if (!pboxNew2 || !pptNew2) { - if (pptNew2) DEALLOCATE_LOCAL(pptNew2); - if (pboxNew2) DEALLOCATE_LOCAL(pboxNew2); + if (pptNew2) xfree(pptNew2); + if (pboxNew2) xfree(pboxNew2); if (pboxNew1) { - DEALLOCATE_LOCAL(pptNew1); - DEALLOCATE_LOCAL(pboxNew1); + xfree(pptNew1); + xfree(pboxNew1); } return; } @@ -1526,12 +1526,12 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg, SAVAGESelectBuffer(pScrn, SAVAGE_FRONT); if (pboxNew2) { - DEALLOCATE_LOCAL(pptNew2); - DEALLOCATE_LOCAL(pboxNew2); + xfree(pptNew2); + xfree(pboxNew2); } if (pboxNew1) { - DEALLOCATE_LOCAL(pptNew1); - DEALLOCATE_LOCAL(pboxNew1); + xfree(pptNew1); + xfree(pboxNew1); } BCI_SEND(0xc0020000); /* wait for 2D idle */ |