From 9a05f8f7858641b780046ad69d61f21ccbb93db8 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 19 Oct 2003 20:46:23 +0000
Subject: [PATCH] Minor cleanups -- remove a couple of bogus KdCheckSync calls,
 restructure     KdOffscreenSwapOut to avoid unneeded 'continue'

---
 hw/kdrive/src/kaa.c        |  1 -
 hw/kdrive/src/koffscreen.c | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index 139c9fcf1..9b1457d77 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -262,7 +262,6 @@ kaaDestroyPixmap (PixmapPtr pPixmap)
 			 pPixmap->drawable.width,
 			 pPixmap->drawable.height));
 	    /* Free the offscreen area */
-	    KdCheckSync (pScreen);
 	    KdOffscreenFree (pKaaPixmap->area);
 	    pPixmap->devPrivate = pKaaPixmap->devPrivate;
 	    pPixmap->devKind = pKaaPixmap->devKind;
diff --git a/hw/kdrive/src/koffscreen.c b/hw/kdrive/src/koffscreen.c
index 65c15a284..a8476ab6f 100644
--- a/hw/kdrive/src/koffscreen.c
+++ b/hw/kdrive/src/koffscreen.c
@@ -71,7 +71,6 @@ static void
 KdOffscreenKickOut (KdOffscreenArea *area)
 {
     RealOffscreenArea *real_area = (RealOffscreenArea *) area;
-    KdCheckSync (area->screen);
     if (real_area->save)
 	(*real_area->save) (area);
     KdOffscreenFree (area);
@@ -209,14 +208,12 @@ KdOffscreenSwapOut (ScreenPtr pScreen)
 	
 	if (!area)
 	    break;
-	if (area->area.screen)
+	if (!area->area.screen)
 	{
-	    KdOffscreenKickOut (&area->area);
-	    continue;
+	    area = area->next;
+	    if (!area)
+		break;
 	}
-	area = area->next;
-	if (!area)
-	    break;
 	assert (area->area.screen);
 	KdOffscreenKickOut (&area->area);
 	KdOffscreenValidate (pScreen);