Eliminate boilerplate around client->noClientException.

Just let Dispatch() check for a noClientException, rather than making
every single dispatch procedure take care of it.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

17 files changed, 75 insertions, 82 deletions

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index f9f15edc5..ce3734e8d 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -76,5 +76,5 @@ ProcBigReqDispatch (ClientPtr client)
 	swapl(&rep.max_request_size, n);
     }
     WriteToClient(client, sizeof(xBigReqEnableReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
diff --git a/Xext/dpms.c b/Xext/dpms.c
index df63a8bf1..33a6e267c 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -61,7 +61,7 @@ ProcDPMSGetVersion(ClientPtr client)
 	swaps(&rep.minorVersion, n);
     }
     WriteToClient(client, sizeof(xDPMSGetVersionReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -82,7 +82,7 @@ ProcDPMSCapable(ClientPtr client)
 	swaps(&rep.sequenceNumber, n);
     }
     WriteToClient(client, sizeof(xDPMSCapableReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -108,7 +108,7 @@ ProcDPMSGetTimeouts(ClientPtr client)
 	swaps(&rep.off, n);
     }
     WriteToClient(client, sizeof(xDPMSGetTimeoutsReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -134,7 +134,7 @@ ProcDPMSSetTimeouts(ClientPtr client)
     DPMSOffTime = stuff->off * MILLI_PER_SECOND;
     SetScreenSaverTimer();
 
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -150,7 +150,7 @@ ProcDPMSEnable(ClientPtr client)
 	    SetScreenSaverTimer();
     }
 
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -164,7 +164,7 @@ ProcDPMSDisable(ClientPtr client)
 
     DPMSEnabled = FALSE;
 
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -187,7 +187,7 @@ ProcDPMSForceLevel(ClientPtr client)
 
     DPMSSet(client, stuff->level);
 
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -210,7 +210,7 @@ ProcDPMSInfo(ClientPtr client)
 	swaps(&rep.power_level, n);
     }
     WriteToClient(client, sizeof(xDPMSInfoReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
diff --git a/Xext/geext.c b/Xext/geext.c
index f0a3d8778..b7f32c079 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -91,7 +91,7 @@ ProcGEQueryVersion(ClientPtr client)
     }
 
     WriteToClient(client, sizeof(xGEQueryVersionReply), (char*)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 int (*ProcGEVector[GENumberRequests])(ClientPtr) = {
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 38b2f48d6..31286d41f 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -917,7 +917,7 @@ ProcPanoramiXQueryVersion (ClientPtr client)
         swaps(&rep.minorVersion, n);
     }
     WriteToClient(client, sizeof (xPanoramiXQueryVersionReply), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 int
@@ -944,7 +944,7 @@ ProcPanoramiXGetState(ClientPtr client)
 	    swapl (&rep.window, n);
 	}	
 	WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
-	return client->noClientException;
+	return Success;
 
 }
 
@@ -972,7 +972,7 @@ ProcPanoramiXGetScreenCount(ClientPtr client)
 	    swapl (&rep.window, n);
 	}	
 	WriteToClient (client, sizeof (xPanoramiXGetScreenCountReply), (char *) &rep);
-	return client->noClientException;
+	return Success;
 }
 
 int 
@@ -1008,7 +1008,7 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
 	    swapl (&rep.screen, n);
 	}	
 	WriteToClient (client, sizeof (xPanoramiXGetScreenSizeReply), (char *) &rep);
-	return client->noClientException;
+	return Success;
 }
 
 
@@ -1039,7 +1039,7 @@ ProcXineramaIsActive(ClientPtr client)
 	swapl (&rep.state, n);
     }	
     WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
-    return client->noClientException;
+    return Success;
 }
 
 
@@ -1084,7 +1084,7 @@ ProcXineramaQueryScreens(ClientPtr client)
 	}
     }
 
-    return client->noClientException;
+    return Success;
 }
 
 
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 47362df4d..a1816958f 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -572,7 +572,7 @@ int PanoramiXGetGeometry(ClientPtr client)
     }
 
     WriteReplyToClient(client, sizeof(xGetGeometryReply), &rep);
-    return (client->noClientException);
+    return Success;
 }
 
 int PanoramiXTranslateCoords(ClientPtr client)
@@ -642,7 +642,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
     }
 
     WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep);
-    return(client->noClientException);
+    return Success;
 }
 
 int PanoramiXCreatePixmap(ClientPtr client)
@@ -1081,8 +1081,6 @@ int PanoramiXCopyArea(ClientPtr client)
 	}
 
 	free(data);
-
-	result = Success;
     } else {
 	DrawablePtr pDst = NULL, pSrc = NULL;
 	GCPtr pGC = NULL;
@@ -1150,11 +1148,9 @@ int PanoramiXCopyArea(ClientPtr client)
 		client, &totalReg, stuff->dstDrawable, X_CopyArea, 0);
 	    REGION_UNINIT(pScreen, &totalReg);
 	}
-	
-	result = client->noClientException;
     }
 
-    return (result);
+    return Success;
 }
 
 
@@ -1264,7 +1260,7 @@ int PanoramiXCopyPlane(ClientPtr client)
 	REGION_UNINIT(pScreen, &totalReg);
     }
 
-    return (client->noClientException);
+    return Success;
 }
 
 
@@ -1324,7 +1320,7 @@ int PanoramiXPolyPoint(ClientPtr client)
         free(origPts);
         return (result);
     } else
-	return (client->noClientException);
+	return Success;
 }
 
 
@@ -1384,7 +1380,7 @@ int PanoramiXPolyLine(ClientPtr client)
         free(origPts);
         return (result);
    } else
-	return (client->noClientException);
+	return Success;
 }
 
 
@@ -1447,7 +1443,7 @@ int PanoramiXPolySegment(ClientPtr client)
 	free(origSegs);
 	return (result);
     } else
-	  return (client->noClientException);
+	  return Success;
 }
 
 
@@ -1509,7 +1505,7 @@ int PanoramiXPolyRectangle(ClientPtr client)
 	free(origRecs);
 	return (result);
     } else
-       return (client->noClientException);
+       return Success;
 }
 
 
@@ -1569,7 +1565,7 @@ int PanoramiXPolyArc(ClientPtr client)
 	free(origArcs);
 	return (result);
     } else
-       return (client->noClientException);
+       return Success;
 }
 
 
@@ -1630,7 +1626,7 @@ int PanoramiXFillPoly(ClientPtr client)
 	free(locPts);
 	return (result);
     } else
-       return (client->noClientException);
+       return Success;
 }
 
 
@@ -1691,7 +1687,7 @@ int PanoramiXPolyFillRectangle(ClientPtr client)
 	free(origRects);
 	return (result);
     } else
-       return (client->noClientException);
+       return Success;
 }
 
 
@@ -1752,7 +1748,7 @@ int PanoramiXPolyFillArc(ClientPtr client)
 	free(origArcs);
 	return (result);
     } else
-       return (client->noClientException);
+       return Success;
 }
 
 
@@ -1947,7 +1943,7 @@ int PanoramiXGetImage(ClientPtr client)
 	}
     }
     free(pBuf);
-    return (client->noClientException);
+    return Success;
 }
 
 
diff --git a/Xext/saver.c b/Xext/saver.c
index f89ee1886..4b43a305a 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -737,7 +737,7 @@ ProcScreenSaverQueryVersion (ClientPtr client)
     	swapl(&rep.length, n);
     }
     WriteToClient(client, sizeof (xScreenSaverQueryVersionReply), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 static int
@@ -813,7 +813,7 @@ ProcScreenSaverQueryInfo (ClientPtr client)
 	swapl (&rep.eventMask, n);
     }
     WriteToClient(client, sizeof (xScreenSaverQueryInfoReply), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 static int
@@ -1415,7 +1415,7 @@ ProcScreenSaverSuspend (ClientPtr client)
 	FreeScreenSaverTimer();
     }
 
-    return (client->noClientException);
+    return Success;
 }
 
 static DISPATCH_PROC((*NormalVector[])) = {
diff --git a/Xext/security.c b/Xext/security.c
index 268581579..7995ff2f3 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -383,7 +383,7 @@ ProcSecurityQueryVersion(
     }
     (void)WriteToClient(client, SIZEOF(xSecurityQueryVersionReply),
 			(char *)&rep);
-    return (client->noClientException);
+    return Success;
 } /* ProcSecurityQueryVersion */
 
 
@@ -604,10 +604,7 @@ ProcSecurityGenerateAuthorization(
 		  pAuth->group, eventMask);
 
     /* the request succeeded; don't call RemoveAuthorization or free pAuth */
-
-    removeAuth = FALSE;
-    pAuth = NULL;
-    err = client->noClientException;
+    return Success;
 
 bailout:
     if (removeAuth)
diff --git a/Xext/shape.c b/Xext/shape.c
index f21d633c9..cd756583c 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -269,7 +269,7 @@ ProcShapeQueryVersion (ClientPtr client)
 	swaps(&rep.minorVersion, n);
     }
     WriteToClient(client, sizeof (xShapeQueryVersionReply), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 /*****************
@@ -736,7 +736,7 @@ ProcShapeQueryExtents (ClientPtr client)
 	swaps(&rep.heightClipShape, n);
     }
     WriteToClient(client, sizeof (xShapeQueryExtentsReply), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 /*ARGSUSED*/
@@ -996,7 +996,7 @@ ProcShapeInputSelected (ClientPtr client)
 	swapl (&rep.length, n);
     }
     WriteToClient (client, sizeof (xShapeInputSelectedReply), (char *) &rep);
-    return (client->noClientException);
+    return Success;
 }
 
 static int
@@ -1081,7 +1081,7 @@ ProcShapeGetRectangles (ClientPtr client)
     WriteToClient (client, sizeof (rep), (char *) &rep);
     WriteToClient (client, nrects * sizeof (xRectangle), (char *) rects);
     free(rects);
-    return client->noClientException;
+    return Success;
 }
 
 static int
diff --git a/Xext/shm.c b/Xext/shm.c
index 39b392943..25043fadc 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -359,7 +359,7 @@ ProcShmQueryVersion(ClientPtr client)
 	swaps(&rep.gid, n);
     }
     WriteToClient(client, sizeof(xShmQueryVersionReply), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 /*
@@ -485,7 +485,7 @@ ProcShmAttach(ClientPtr client)
     }
     if (!AddResource(stuff->shmseg, ShmSegType, (pointer)shmdesc))
 	return BadAlloc;
-    return(client->noClientException);
+    return Success;
 }
 
 /*ARGSUSED*/
@@ -515,7 +515,7 @@ ProcShmDetach(ClientPtr client)
     REQUEST_SIZE_MATCH(xShmDetachReq);
     VERIFY_SHMSEG(stuff->shmseg, shmdesc, client);
     FreeResource(stuff->shmseg, RT_NONE);
-    return(client->noClientException);
+    return Success;
 }
 
 /*
@@ -601,7 +601,7 @@ ProcPanoramiXShmPutImage(ClientPtr client)
 	    stuff->dstY = orig_y - panoramiXdataPtr[j].y;
 	}
 	result = ProcShmPutImage(client);
-	if(result != client->noClientException) break;
+	if(result != Success) break;
     }
     return(result);
 }
@@ -733,7 +733,7 @@ ProcPanoramiXShmGetImage(ClientPtr client)
     }
     WriteToClient(client, sizeof(xShmGetImageReply), (char *)&xgi);
 
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -804,7 +804,7 @@ CreatePmap:
     for(j = 1; j < PanoramiXNumScreens; j++)
 	newPix->info[j].id = FakeClientID(client->index);
 
-    result = (client->noClientException);
+    result = Success;
 
     FOR_NSCREENS(j) {
 	ShmScrPrivateRec *screen_priv;
@@ -951,7 +951,7 @@ ProcShmPutImage(ClientPtr client)
 	WriteEventsToClient(client, 1, (xEvent *) &ev);
     }
 
-    return (client->noClientException);
+    return Success;
 }
 
 
@@ -1065,7 +1065,7 @@ ProcShmGetImage(ClientPtr client)
     }
     WriteToClient(client, sizeof(xShmGetImageReply), (char *)&xgi);
 
-    return(client->noClientException);
+    return Success;
 }
 
 static PixmapPtr
@@ -1162,7 +1162,7 @@ CreatePmap:
 	pMap->drawable.id = stuff->pid;
 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
 	{
-	    return(client->noClientException);
+	    return Success;
 	}
 	pDraw->pScreen->DestroyPixmap(pMap);
     }
diff --git a/Xext/sync.c b/Xext/sync.c
index 94ac5dfb1..0534728a7 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -1146,7 +1146,7 @@ ProcSyncInitialize(ClientPtr client)
 	swaps(&rep.sequenceNumber, n);
     }
     WriteToClient(client, sizeof(rep), (char *) &rep);
-    return client->noClientException;
+    return Success;
 }
 
 /*
@@ -1223,7 +1223,7 @@ ProcSyncListSystemCounters(ClientPtr client)
 	free(list);
     }
 
-    return client->noClientException;
+    return Success;
 }
 
 /*
@@ -1297,7 +1297,7 @@ ProcSyncGetPriority(ClientPtr client)
 
     WriteToClient(client, sizeof(xSyncGetPriorityReply), (char *) &rep);
 
-    return client->noClientException;
+    return Success;
 }
 
 /*
@@ -1317,7 +1317,7 @@ ProcSyncCreateCounter(ClientPtr client)
     if (!SyncCreateCounter(client, stuff->cid, initial))
 	return BadAlloc;
 
-    return client->noClientException;
+    return Success;
 }
 
 /*
@@ -1569,7 +1569,7 @@ ProcSyncQueryCounter(ClientPtr client)
 	swapl(&rep.value_lo, n);
     }
     WriteToClient(client, sizeof(xSyncQueryCounterReply), (char *) &rep);
-    return client->noClientException;
+    return Success;
 }
 
 
@@ -1749,7 +1749,7 @@ ProcSyncQueryAlarm(ClientPtr client)
     }
 
     WriteToClient(client, sizeof(xSyncQueryAlarmReply), (char *) &rep);
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -1767,7 +1767,7 @@ ProcSyncDestroyAlarm(ClientPtr client)
 	return (rc == BadValue) ? SyncErrorBase + XSyncBadAlarm : rc;
 
     FreeResource(stuff->alarm, RT_NONE);
-    return client->noClientException;
+    return Success;
 }
 
 /*
diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c
index 6e6461a5f..364b92ac4 100644
--- a/Xext/xcalibrate.c
+++ b/Xext/xcalibrate.c
@@ -90,7 +90,7 @@ ProcXCalibrateQueryVersion (ClientPtr client)
     swaps(&rep.minorVersion, n);
   }
   WriteToClient(client, sizeof (xXCalibrateQueryVersionReply), (char *)&rep);
-  return (client->noClientException);
+  return Success;
 }
 
 static int
@@ -160,7 +160,7 @@ ProcXCalibrateSetRawMode (ClientPtr client)
       swaps (&rep.status, n);
     }
   WriteToClient(client, sizeof (rep), (char *) &rep);
-  return (client->noClientException);
+  return Success;
 }
 
 static int
@@ -200,7 +200,7 @@ ProcXCalibrateScreenToCoord (ClientPtr client)
       swaps (&rep.y, n);
     }
   WriteToClient(client, sizeof (rep), (char *) &rep);
-  return (client->noClientException);
+  return Success;
 }
 
 static int
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 1c8e3f2c4..986c870a5 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -83,7 +83,7 @@ ProcXCMiscGetVersion(ClientPtr client)
 	swaps(&rep.minorVersion, n);
     }
     WriteToClient(client, sizeof(xXCMiscGetVersionReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -106,7 +106,7 @@ ProcXCMiscGetXIDRange(ClientPtr client)
 	swapl(&rep.count, n);
     }
     WriteToClient(client, sizeof(xXCMiscGetXIDRangeReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -145,7 +145,7 @@ ProcXCMiscGetXIDList(ClientPtr client)
 	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
     }
     free(pids);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 312fcc9e9..8c4a7eba9 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -368,7 +368,7 @@ ProcXF86BigfontQueryVersion(
     }
     WriteToClient(client,
 		  sizeof(xXF86BigfontQueryVersionReply), (char *)&reply);
-    return client->noClientException;
+    return Success;
 }
 
 static void
@@ -698,7 +698,7 @@ ProcXF86BigfontQueryFont(
 	    if (shmid == -1) free(pIndex2UniqIndex);
 	    if (!pDesc) free(pCI);
 	}
-	return (client->noClientException);
+	return Success;
     }
 }
 
diff --git a/Xext/xres.c b/Xext/xres.c
index 14641f70f..06639a2cf 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -50,7 +50,7 @@ ProcXResQueryVersion (ClientPtr client)
         swaps(&rep.server_minor, n);
     }
     WriteToClient(client, sizeof (xXResQueryVersionReply), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 static int
@@ -103,7 +103,7 @@ ProcXResQueryClients (ClientPtr client)
 
     free(current_clients);
 
-    return (client->noClientException);
+    return Success;
 }
 
 
@@ -184,7 +184,7 @@ ProcXResQueryClientResources (ClientPtr client)
 
     free(counts);
     
-    return (client->noClientException);
+    return Success;
 }
 
 static unsigned long
@@ -295,7 +295,7 @@ ProcXResQueryClientPixmapBytes (ClientPtr client)
     }
     WriteToClient (client,sizeof(xXResQueryClientPixmapBytesReply),(char*)&rep);
 
-    return (client->noClientException);
+    return Success;
 }
 
 static int
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 4d55e1565..93c1b595f 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -78,7 +78,7 @@ ProcSELinuxQueryVersion(ClientPtr client)
 	swaps(&rep.server_minor, n);
     }
     WriteToClient(client, sizeof(rep), (char *)&rep);
-    return (client->noClientException);
+    return Success;
 }
 
 static int
@@ -109,7 +109,7 @@ SELinuxSendContextReply(ClientPtr client, security_id_t sid)
     WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep);
     WriteToClient(client, len, ctx);
     freecon(ctx);
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -390,7 +390,7 @@ SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec *items,
     WriteToClient(client, size * 4, (char *)buf);
 
     /* Free stuff and return */
-    rc = client->noClientException;
+    rc = Success;
     free(buf);
 out:
     SELinuxFreeItems(items, count);
diff --git a/Xext/xtest.c b/Xext/xtest.c
index bb5bae6bc..09c4677a2 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -126,7 +126,7 @@ ProcXTestGetVersion(ClientPtr client)
         swaps(&rep.minorVersion, n);
     }
     WriteToClient(client, sizeof(xXTestGetVersionReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -164,7 +164,7 @@ ProcXTestCompareCursor(ClientPtr client)
         swaps(&rep.sequenceNumber, n);
     }
     WriteToClient(client, sizeof(xXTestCompareCursorReply), (char *)&rep);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
@@ -457,7 +457,7 @@ ProcXTestFakeInput(ClientPtr client)
 
     if (need_ptr_update)
         miPointerUpdateSprite(dev);
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -475,7 +475,7 @@ ProcXTestGrabControl(ClientPtr client)
         MakeClientGrabImpervious(client);
     else
         MakeClientGrabPervious(client);
-    return(client->noClientException);
+    return Success;
 }
 
 static int
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index b8d8d17c3..fd633f1f9 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -460,7 +460,7 @@ ProcXvQueryAdaptors(ClientPtr client)
 
     }
 
-  return (client->noClientException);
+  return Success;
 }
 
 static int
@@ -520,7 +520,7 @@ ProcXvQueryEncodings(ClientPtr client)
       pe++;
     }
 
-  return (client->noClientException);
+  return Success;
 }
 
 static int