svn merge ^/branches/released .

1 files changed, 6 insertions, 8 deletions

diff --git a/xorg-server/mi/miarc.c b/xorg-server/mi/miarc.c
index d9a28d058..06fc4085b 100644
--- a/xorg-server/mi/miarc.c
+++ b/xorg-server/mi/miarc.c
@@ -1565,7 +1565,7 @@ miGetArcPts(
     cdt = 2 * miDcos(dt);

     if (!(poly = (SppPointPtr) realloc((pointer)*ppPts,

 					(cpt + count) * sizeof(SppPointRec))))

-	return(0);

+	return 0;

     *ppPts = poly;

 

     xc = parc->width/2.0;		/* store half width and half height */

@@ -1602,7 +1602,7 @@ miGetArcPts(
 	poly[cpt +i -1].y = (miDsin(st + et) * parc->height/2.0 + yc);

     }

 

-    return(count);

+    return count;

 }

 

 struct arcData {

@@ -3085,10 +3085,8 @@ fillSpans (
 	    (*pGC->ops->FillSpans) (pDrawable, pGC, i, xSpans, xWidths, TRUE);

 	}

 	disposeFinalSpans ();

-	if (xSpans)

-	    free(xSpans);

-	if (xWidths)

-	    free(xWidths);

+	free(xSpans);

+	free(xWidths);

 	finalMiny = 0;

 	finalMaxy = -1;

 	finalSize = 0;

@@ -3139,9 +3137,9 @@ realFindSpan (int y)
 			free(finalSpans);

 		}

 		if ((i = finalMiny - newMiny) > 0)

-			bzero ((char *)newSpans, i * sizeof (struct finalSpan *));

+			memset((char *)newSpans, 0, i * sizeof (struct finalSpan *));

 		if ((i = newMaxy - finalMaxy) > 0)

-			bzero ((char *)(newSpans + newSize - i),

+			memset((char *)(newSpans + newSize - i), 0,

 			       i * sizeof (struct finalSpan *));

 		finalSpans = newSpans;

 		finalMaxy = newMaxy;