Attachment 14767 Details for Bug 14780 – 0001-Replace-ALLOCATE_LOCAL-DEALLOCATE_LOCAL-with-xalloc.patch

[patch] 0001-Replace-ALLOCATE_LOCAL-DEALLOCATE_LOCAL-with-xalloc.patch

0001-Replace-ALLOCATE_LOCAL-DEALLOCATE_LOCAL-with-xalloc.patch (text/plain), 2.40 KB, created by Paulo César Pereira de Andrade on 2008-03-02 09:18:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-02 09:18:57 UTC

Size: 2.40 KB

patch

obsolete

>From 2669694d56f96be0ca65cb5ae3a014be4520706d Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Sun, 2 Mar 2008 13:48:09 -0300
>Subject: [PATCH] Replace ALLOCATE_LOCAL/DEALLOCATE_LOCAL with xalloc/xfree.
>
>---
> src/leo_fspans.c   |   12 ++++++------
> src/leo_fspanssp.c |   12 ++++++------
> 2 files changed, 12 insertions(+), 12 deletions(-)
>
>diff --git a/src/leo_fspans.c b/src/leo_fspans.c
>index ccc9132..23dcaac 100644
>--- a/src/leo_fspans.c
>+++ b/src/leo_fspans.c
>@@ -68,11 +68,11 @@ LeoFillSpansSolid (DrawablePtr pDrawable, GCPtr pGC,
> 	} else {
> 		int nTmp = n * miFindMaxBand(clip);
> 
>-		pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
>-		pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
>+		pwidthFree = (int *)xalloc(nTmp * sizeof(int));
>+		pptFree = (DDXPointRec *)xalloc(nTmp * sizeof(DDXPointRec));
> 		if (!pptFree || !pwidthFree) {
>-			if (pptFree) DEALLOCATE_LOCAL(pptFree);
>-			if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
>+			if (pptFree) xfree(pptFree);
>+			if (pwidthFree) xfree(pwidthFree);
> 			return;
> 		}
> 		n = miClipSpans(clip,
>@@ -123,8 +123,8 @@ LeoFillSpansSolid (DrawablePtr pDrawable, GCPtr pGC,
> 	}
> 	
> 	if (numRects != 1) {
>-		DEALLOCATE_LOCAL(pptFree);
>-		DEALLOCATE_LOCAL(pwidthFree);
>+		xfree(pptFree);
>+		xfree(pwidthFree);
> 	}
> 	if (pGC->alu != GXcopy)
> 		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
>diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
>index 4124337..779edd9 100644
>--- a/src/leo_fspanssp.c
>+++ b/src/leo_fspanssp.c
>@@ -69,11 +69,11 @@ LeoFillSpansStippled (DrawablePtr pDrawable, GCPtr pGC,
> 	} else {
> 		int nTmp = n * miFindMaxBand(clip);
> 
>-		pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
>-		pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
>+		pwidthFree = (int *)xalloc(nTmp * sizeof(int));
>+		pptFree = (DDXPointRec *)xalloc(nTmp * sizeof(DDXPointRec));
> 		if (!pptFree || !pwidthFree) {
>-			if (pptFree) DEALLOCATE_LOCAL(pptFree);
>-			if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
>+			if (pptFree) xfree(pptFree);
>+			if (pwidthFree) xfree(pwidthFree);
> 			return;
> 		}
> 		n = miClipSpans(clip,
>@@ -161,8 +161,8 @@ LeoFillSpansStippled (DrawablePtr pDrawable, GCPtr pGC,
> 	}
> 	
> 	if (numRects != 1) {
>-		DEALLOCATE_LOCAL(pptFree);
>-		DEALLOCATE_LOCAL(pwidthFree);
>+		xfree(pptFree);
>+		xfree(pwidthFree);
> 	}
> 	if (pGC->alu != GXcopy)
> 		ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 14780: 14767 | 15153

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.