Merge remote branch 'jamey/for-keith'

6 files changed, 7 insertions, 21 deletions

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 96eb8f9e1..d5965c2d0 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -476,7 +476,8 @@ void PanoramiXExtensionInit(int argc, char *argv[])
 	panoramiXdataPtr = (PanoramiXData *) 
 		xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData));
 
-        BREAK_IF(!panoramiXdataPtr);
+	if (!panoramiXdataPtr)
+	    break;
 
 	if (!dixRequestPrivate(PanoramiXGCKey, sizeof(PanoramiXGCRec))) {
 		noPanoramiXExtension = TRUE;
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index 463a99441..35de17951 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -80,19 +80,6 @@ typedef struct {
 #define FOR_NSCREENS_BACKWARD(j) for(j = PanoramiXNumScreens - 1; j >= 0; j--)
 #define FOR_NSCREENS(j) FOR_NSCREENS_FORWARD(j)
 
-#define BREAK_IF(a) if ((a)) break
-#define IF_RETURN(a,b) if ((a)) return (b)
-
-#define FORCE_ROOT(a) { \
-    int _j; \
-    for (_j = PanoramiXNumScreens - 1; _j; _j--) \
-        if ((a).root == WindowTable[_j]->drawable.id)   \
-            break;                                      \
-    (a).rootX += panoramiXdataPtr[_j].x;             \
-    (a).rootY += panoramiXdataPtr[_j].y;             \
-    (a).root = WindowTable[0]->drawable.id;          \
-}
-
 #define IS_SHARED_PIXMAP(r) (((r)->type == XRT_PIXMAP) && (r)->u.pix.shared)
 
 #endif /* _PANORAMIX_H_ */
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 6834efb71..6635db905 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -1728,7 +1728,7 @@ int PanoramiXPolyFillArc(ClientPtr client)
     isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
 
     narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);
-    IF_RETURN((narcs % sizeof(xArc)), BadLength);
+    if (narcs % sizeof(xArc)) return BadLength;
     narcs /= sizeof(xArc);
     if (narcs > 0) {
 	origArcs = xalloc(narcs * sizeof(xArc));
diff --git a/Xext/shape.c b/Xext/shape.c
index cb4126b44..58b5c23c0 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -365,7 +365,7 @@ ProcPanoramiXShapeRectangles(
     FOR_NSCREENS(j) {
 	stuff->dest = win->info[j].id;
 	result = ProcShapeRectangles (client);
-	BREAK_IF(result != Success);
+	if (result != Success) break;
     }
     return (result);
 }
@@ -474,7 +474,7 @@ ProcPanoramiXShapeMask(
 	if(pmap)
 	    stuff->src  = pmap->info[j].id;
 	result = ProcShapeMask (client);
-	BREAK_IF(result != Success);
+	if (result != Success) break;
     }
     return (result);
 }
@@ -600,7 +600,7 @@ ProcPanoramiXShapeCombine(
 	stuff->dest = win->info[j].id;
 	stuff->src =  win2->info[j].id;
 	result = ProcShapeCombine (client);
-	BREAK_IF(result != Success);
+	if (result != Success) break;
     }
     return (result);
 }
diff --git a/dix/events.c b/dix/events.c
index 6d0137da4..b26e28af7 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5355,7 +5355,6 @@ ProcGrabButton(ClientPtr client)
 	rc = dixLookupResourceByType((pointer *)&cursor, stuff->cursor, RT_CURSOR,
 			       client, DixUseAccess);
 	if (rc != Success)
-	if (!cursor)
 	{
 	    client->errorValue = stuff->cursor;
 	    return (rc == BadValue) ? BadCursor : rc;
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 844863a59..a7441c9a8 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -537,8 +537,7 @@ InitExtensions(int argc, char *argv[])
     for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
 	ext = &ExtensionModuleList[i];
 	if (ext->initFunc != NULL && 
-	    (ext->disablePtr == NULL || 
-	     (ext->disablePtr != NULL && !*ext->disablePtr))) {
+	    (ext->disablePtr == NULL || !*ext->disablePtr)) {
 	    (ext->initFunc)();
 	}
     }