diff options
52 files changed, 475 insertions, 621 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 diff --git a/Xi/exevents.c b/Xi/exevents.c index 3ddee7791..b24204d82 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -1851,7 +1851,7 @@ ChangeKeyMapping(ClientPtr client, XkbApplyMappingChange(dev, &keysyms, firstKeyCode, keyCodes, NULL, serverClient); - return client->noClientException; + return Success; } static void diff --git a/composite/compext.c b/composite/compext.c index 17c4bae1e..3bb9a3701 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -132,7 +132,7 @@ ProcCompositeQueryVersion (ClientPtr client) swapl(&rep.minorVersion, n); } WriteToClient(client, sizeof(xCompositeQueryVersionReply), (char *)&rep); - return(client->noClientException); + return Success; } #define VERIFY_WINDOW(pWindow, wid, client, mode) \ @@ -226,7 +226,7 @@ ProcCompositeCreateRegionFromBorderClip (ClientPtr client) if (!AddResource (stuff->region, RegionResType, (pointer) pRegion)) return BadAlloc; - return(client->noClientException); + return Success; } static int @@ -265,7 +265,7 @@ ProcCompositeNameWindowPixmap (ClientPtr client) if (!AddResource (stuff->pixmap, RT_PIXMAP, (pointer) pPixmap)) return BadAlloc; - return(client->noClientException); + return Success; } @@ -325,7 +325,7 @@ ProcCompositeGetOverlayWindow (ClientPtr client) } (void) WriteToClient(client, sz_xCompositeGetOverlayWindowReply, (char *)&rep); - return client->noClientException; + return Success; } static int @@ -351,7 +351,7 @@ ProcCompositeReleaseOverlayWindow (ClientPtr client) /* The delete function will free the client structure */ FreeResource (pOc->resource, RT_NONE); - return client->noClientException; + return Success; } static int (*ProcCompositeVector[CompositeNumberRequests])(ClientPtr) = { diff --git a/damageext/damageext.c b/damageext/damageext.c index f2630feb4..af4fef678 100644 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -162,7 +162,7 @@ ProcDamageQueryVersion(ClientPtr client) swapl(&rep.minorVersion, n); } WriteToClient(client, sizeof(xDamageQueryVersionReply), (char *)&rep); - return(client->noClientException); + return Success; } static int @@ -231,7 +231,7 @@ ProcDamageCreate (ClientPtr client) DamageRegionAppend(pDrawable, pRegion); } - return (client->noClientException); + return Success; } static int @@ -243,7 +243,7 @@ ProcDamageDestroy (ClientPtr client) REQUEST_SIZE_MATCH(xDamageDestroyReq); VERIFY_DAMAGEEXT(pDamageExt, stuff->damage, client, DixWriteAccess); FreeResource (stuff->damage, RT_NONE); - return (client->noClientException); + return Success; } static int @@ -276,7 +276,7 @@ ProcDamageSubtract (ClientPtr client) DamageEmpty (pDamage); } } - return (client->noClientException); + return Success; } static int @@ -301,7 +301,7 @@ ProcDamageAdd (ClientPtr client) DamageRegionAppend(pDrawable, pRegion); REGION_TRANSLATE(pScreen, pRegion, -pDrawable->x, -pDrawable->y); - return (client->noClientException); + return Success; } /* Major version controls available requests */ @@ -147,7 +147,7 @@ ProcDbeGetVersion(ClientPtr client) WriteToClient(client, sizeof(xDbeGetVersionReply), (char *)&rep); - return(client->noClientException); + return Success; } /* ProcDbeGetVersion() */ @@ -810,7 +810,7 @@ ProcDbeGetVisualInfo(ClientPtr client) free(pDrawables); } - return(client->noClientException); + return Success; } /* ProcDbeGetVisualInfo() */ @@ -866,7 +866,7 @@ ProcDbeGetBackBufferAttributes(ClientPtr client) WriteToClient(client, sizeof(xDbeGetBackBufferAttributesReply), (char *)&rep); - return(client->noClientException); + return Success; } /* ProcDbeGetbackBufferAttributes() */ diff --git a/dix/devices.c b/dix/devices.c index db5c4a136..de72c8834 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1535,7 +1535,7 @@ ProcSetModifierMapping(ClientPtr client) rep.success = rc; WriteReplyToClient(client, sizeof(xSetModifierMappingReply), &rep); - return client->noClientException; + return Success; } int @@ -1561,7 +1561,7 @@ ProcGetModifierMapping(ClientPtr client) free(modkeymap); - return client->noClientException; + return Success; } int @@ -1619,7 +1619,7 @@ ProcChangeKeyboardMapping(ClientPtr client) stuff->keyCodes, NULL, client); } - return client->noClientException; + return Success; } int @@ -1722,7 +1722,7 @@ ProcGetKeyboardMapping(ClientPtr client) free(syms->map); free(syms); - return client->noClientException; + return Success; } int diff --git a/dix/dispatch.c b/dix/dispatch.c index aee9143e9..fe9ddb2a8 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -437,16 +437,18 @@ Dispatch(void) client->sequence, client->index, result); #endif - if (result != Success) + if (client->noClientException != Success) { - if (client->noClientException != Success) - CloseDownClient(client); - else - SendErrorToClient(client, MAJOROP, - MinorOpcodeOfRequest(client), - client->errorValue, result); + CloseDownClient(client); break; - } + } + else if (result != Success) + { + SendErrorToClient(client, MAJOROP, + MinorOpcodeOfRequest(client), + client->errorValue, result); + break; + } } FlushAllOutput(); client = clients[clientReady[nready]]; @@ -668,10 +670,7 @@ ProcCreateWindow(ClientPtr client) return BadAlloc; pWin->eventMask = mask; } - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; + return rc; } int @@ -679,7 +678,7 @@ ProcChangeWindowAttributes(ClientPtr client) { WindowPtr pWin; REQUEST(xChangeWindowAttributesReq); - int result, len, rc; + int len, rc; Mask access_mode = 0; REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq); @@ -691,14 +690,10 @@ ProcChangeWindowAttributes(ClientPtr client) len = client->req_len - bytes_to_int32(sizeof(xChangeWindowAttributesReq)); if (len != Ones(stuff->valueMask)) return BadLength; - result = ChangeWindowAttributes(pWin, + return ChangeWindowAttributes(pWin, stuff->valueMask, (XID *) &stuff[1], client); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); } int @@ -716,7 +711,7 @@ ProcGetWindowAttributes(ClientPtr client) memset(&wa, 0, sizeof(xGetWindowAttributesReply)); GetWindowAttributes(pWin, client, &wa); WriteReplyToClient(client, sizeof(xGetWindowAttributesReply), &wa); - return(client->noClientException); + return Success; } int @@ -737,7 +732,7 @@ ProcDestroyWindow(ClientPtr client) return rc; FreeResource(stuff->id, RT_NONE); } - return(client->noClientException); + return Success; } int @@ -752,7 +747,7 @@ ProcDestroySubwindows(ClientPtr client) if (rc != Success) return rc; DestroySubwindows(pWin, client); - return(client->noClientException); + return Success; } int @@ -760,7 +755,7 @@ ProcChangeSaveSet(ClientPtr client) { WindowPtr pWin; REQUEST(xChangeSaveSetReq); - int result, rc; + int rc; REQUEST_SIZE_MATCH(xChangeSaveSetReq); rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); @@ -769,18 +764,9 @@ ProcChangeSaveSet(ClientPtr client) if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id))) return BadMatch; if ((stuff->mode == SetModeInsert) || (stuff->mode == SetModeDelete)) - { - result = AlterSaveSetForClient(client, pWin, stuff->mode, FALSE, TRUE); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); - } - else - { - client->errorValue = stuff->mode; - return( BadValue ); - } + return AlterSaveSetForClient(client, pWin, stuff->mode, FALSE, TRUE); + client->errorValue = stuff->mode; + return BadValue; } int @@ -788,7 +774,7 @@ ProcReparentWindow(ClientPtr client) { WindowPtr pWin, pParent; REQUEST(xReparentWindowReq); - int result, rc; + int rc; REQUEST_SIZE_MATCH(xReparentWindowReq); rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); @@ -797,23 +783,16 @@ ProcReparentWindow(ClientPtr client) rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess); if (rc != Success) return rc; - if (SAME_SCREENS(pWin->drawable, pParent->drawable)) - { - if ((pWin->backgroundState == ParentRelative) && - (pParent->drawable.depth != pWin->drawable.depth)) - return BadMatch; - if ((pWin->drawable.class != InputOnly) && - (pParent->drawable.class == InputOnly)) - return BadMatch; - result = ReparentWindow(pWin, pParent, - (short)stuff->x, (short)stuff->y, client); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); - } - else - return (BadMatch); + if (!SAME_SCREENS(pWin->drawable, pParent->drawable)) + return BadMatch; + if ((pWin->backgroundState == ParentRelative) && + (pParent->drawable.depth != pWin->drawable.depth)) + return BadMatch; + if ((pWin->drawable.class != InputOnly) && + (pParent->drawable.class == InputOnly)) + return BadMatch; + return ReparentWindow(pWin, pParent, + (short)stuff->x, (short)stuff->y, client); } int @@ -829,7 +808,7 @@ ProcMapWindow(ClientPtr client) return rc; MapWindow(pWin, client); /* update cache to say it is mapped */ - return(client->noClientException); + return Success; } int @@ -845,7 +824,7 @@ ProcMapSubwindows(ClientPtr client) return rc; MapSubwindows(pWin, client); /* update cache to say it is mapped */ - return(client->noClientException); + return Success; } int @@ -861,7 +840,7 @@ ProcUnmapWindow(ClientPtr client) return rc; UnmapWindow(pWin, FALSE); /* update cache to say it is mapped */ - return(client->noClientException); + return Success; } int @@ -876,7 +855,7 @@ ProcUnmapSubwindows(ClientPtr client) if (rc != Success) return rc; UnmapSubwindows(pWin); - return(client->noClientException); + return Success; } int @@ -884,7 +863,6 @@ ProcConfigureWindow(ClientPtr client) { WindowPtr pWin; REQUEST(xConfigureWindowReq); - int result; int len, rc; REQUEST_AT_LEAST_SIZE(xConfigureWindowReq); @@ -895,12 +873,7 @@ ProcConfigureWindow(ClientPtr client) len = client->req_len - bytes_to_int32(sizeof(xConfigureWindowReq)); if (Ones((Mask)stuff->mask) != len) return BadLength; - result = ConfigureWindow(pWin, (Mask)stuff->mask, (XID *) &stuff[1], - client); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); + return ConfigureWindow(pWin, (Mask)stuff->mask, (XID *) &stuff[1], client); } int @@ -921,7 +894,7 @@ ProcCirculateWindow(ClientPtr client) if (rc != Success) return rc; CirculateWindow(pWin, (int)stuff->direction, client); - return(client->noClientException); + return Success; } static int @@ -980,7 +953,7 @@ ProcGetGeometry(ClientPtr client) return status; WriteReplyToClient(client, sizeof(xGetGeometryReply), &rep); - return(client->noClientException); + return Success; } @@ -1030,7 +1003,7 @@ ProcQueryTree(ClientPtr client) free(childIDs); } - return(client->noClientException); + return Success; } int @@ -1057,7 +1030,7 @@ ProcInternAtom(ClientPtr client) reply.sequenceNumber = client->sequence; reply.atom = atom; WriteReplyToClient(client, sizeof(xInternAtomReply), &reply); - return(client->noClientException); + return Success; } else return (BadAlloc); @@ -1082,7 +1055,7 @@ ProcGetAtomName(ClientPtr client) reply.nameLength = len; WriteReplyToClient(client, sizeof(xGetAtomNameReply), &reply); (void)WriteToClient(client, len, str); - return(client->noClientException); + return Success; } else { @@ -1102,7 +1075,7 @@ ProcGrabServer(ClientPtr client) client->sequence--; BITSET(grabWaiters, client->index); IgnoreClient(client); - return(client->noClientException); + return Success; } rc = OnlyListenToOneClient(client); if (rc != Success) @@ -1118,7 +1091,7 @@ ProcGrabServer(ClientPtr client) CallCallbacks(&ServerGrabCallback, (pointer)&grabinfo); } - return(client->noClientException); + return Success; } static void @@ -1153,7 +1126,7 @@ ProcUngrabServer(ClientPtr client) { REQUEST_SIZE_MATCH(xReq); UngrabServer(client); - return(client->noClientException); + return Success; } int @@ -1227,7 +1200,7 @@ ProcTranslateCoords(ClientPtr client) rep.dstY = y - pDst->drawable.y; } WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep); - return(client->noClientException); + return Success; } int @@ -1243,7 +1216,7 @@ ProcOpenFont(ClientPtr client) stuff->nbytes, (char *)&stuff[1]); if (err == Success) { - return(client->noClientException); + return Success; } else return err; @@ -1262,7 +1235,7 @@ ProcCloseFont(ClientPtr client) if (rc == Success) { FreeResource(stuff->id, RT_NONE); - return(client->noClientException); + return Success; } else { @@ -1314,7 +1287,7 @@ ProcQueryFont(ClientPtr client) WriteReplyToClient(client, rlength, reply); free(reply); - return(client->noClientException); + return Success; } } @@ -1355,7 +1328,7 @@ ProcQueryTextExtents(ClientPtr client) reply.overallLeft = info.overallLeft; reply.overallRight = info.overallRight; WriteReplyToClient(client, sizeof(xQueryTextExtentsReply), &reply); - return(client->noClientException); + return Success; } int @@ -1456,7 +1429,7 @@ CreatePmap: return rc; } if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap)) - return(client->noClientException); + return Success; (*pDraw->pScreen->DestroyPixmap)(pMap); } return (BadAlloc); @@ -1475,7 +1448,7 @@ ProcFreePixmap(ClientPtr client) if (rc == Success) { FreeResource(stuff->id, RT_NONE); - return(client->noClientException); + return Success; } else { @@ -1510,7 +1483,7 @@ ProcCreateGC(ClientPtr client) return error; if (!AddResource(stuff->gc, RT_GC, (pointer)pGC)) return (BadAlloc); - return(client->noClientException); + return Success; } int @@ -1530,11 +1503,7 @@ ProcChangeGC(ClientPtr client) if (len != Ones(stuff->mask)) return BadLength; - result = ChangeGCXIDs(client, pGC, stuff->mask, (CARD32 *) &stuff[1]); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); + return ChangeGCXIDs(client, pGC, stuff->mask, (CARD32 *) &stuff[1]); } int @@ -1559,11 +1528,7 @@ ProcCopyGC(ClientPtr client) client->errorValue = stuff->mask; return BadValue; } - result = CopyGC(pGC, dstGC, stuff->mask); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); + return CopyGC(pGC, dstGC, stuff->mask); } int @@ -1584,17 +1549,11 @@ ProcSetDashes(ClientPtr client) if (result != Success) return result; - result = SetDashes(pGC, stuff->dashOffset, stuff->nDashes, + /* If there's an error, either there's no sensible errorValue, + * or there was a dash segment of 0. */ + client->errorValue = 0; + return SetDashes(pGC, stuff->dashOffset, stuff->nDashes, (unsigned char *)&stuff[1]); - if (client->noClientException != Success) - return(client->noClientException); - else - { - /* If there's an error, either there's no sensible errorValue, - * or there was a dash segment of 0. */ - client->errorValue = 0; - return(result); - } } int @@ -1619,12 +1578,8 @@ ProcSetClipRectangles(ClientPtr client) if (nr & 4) return(BadLength); nr >>= 3; - result = SetClipRects(pGC, stuff->xOrigin, stuff->yOrigin, + return SetClipRects(pGC, stuff->xOrigin, stuff->yOrigin, nr, (xRectangle *)&stuff[1], (int)stuff->ordering); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); } int @@ -1640,7 +1595,7 @@ ProcFreeGC(ClientPtr client) return rc; FreeResource(stuff->id, RT_NONE); - return(client->noClientException); + return Success; } int @@ -1667,7 +1622,7 @@ ProcClearToBackground(ClientPtr client) (*pWin->drawable.pScreen->ClearToBackground)(pWin, stuff->x, stuff->y, stuff->width, stuff->height, (Bool)stuff->exposures); - return(client->noClientException); + return Success; } int @@ -1709,7 +1664,7 @@ ProcCopyArea(ClientPtr client) REGION_DESTROY(pDst->pScreen, pRgn); } - return(client->noClientException); + return Success; } int @@ -1758,7 +1713,7 @@ ProcCopyPlane(ClientPtr client) if (pRgn) REGION_DESTROY(pdstDraw->pScreen, pRgn); } - return(client->noClientException); + return Success; } int @@ -1781,7 +1736,7 @@ ProcPolyPoint(ClientPtr client) if (npoint) (*pGC->ops->PolyPoint)(pDraw, pGC, stuff->coordMode, npoint, (xPoint *) &stuff[1]); - return (client->noClientException); + return Success; } int @@ -1804,7 +1759,7 @@ ProcPolyLine(ClientPtr client) if (npoint > 1) (*pGC->ops->Polylines)(pDraw, pGC, stuff->coordMode, npoint, (DDXPointPtr) &stuff[1]); - return(client->noClientException); + return Success; } int @@ -1823,7 +1778,7 @@ ProcPolySegment(ClientPtr client) nsegs >>= 3; if (nsegs) (*pGC->ops->PolySegment)(pDraw, pGC, nsegs, (xSegment *) &stuff[1]); - return (client->noClientException); + return Success; } int @@ -1843,7 +1798,7 @@ ProcPolyRectangle (ClientPtr client) if (nrects) (*pGC->ops->PolyRectangle)(pDraw, pGC, nrects, (xRectangle *) &stuff[1]); - return(client->noClientException); + return Success; } int @@ -1862,7 +1817,7 @@ ProcPolyArc(ClientPtr client) narcs /= sizeof(xArc); if (narcs) (*pGC->ops->PolyArc)(pDraw, pGC, narcs, (xArc *) &stuff[1]); - return (client->noClientException); + return Success; } int @@ -1893,7 +1848,7 @@ ProcFillPoly(ClientPtr client) (*pGC->ops->FillPolygon) (pDraw, pGC, stuff->shape, stuff->coordMode, things, (DDXPointPtr) &stuff[1]); - return(client->noClientException); + return Success; } int @@ -1914,7 +1869,7 @@ ProcPolyFillRectangle(ClientPtr client) if (things) (*pGC->ops->PolyFillRect) (pDraw, pGC, things, (xRectangle *) &stuff[1]); - return (client->noClientException); + return Success; } int @@ -1933,7 +1888,7 @@ ProcPolyFillArc(ClientPtr client) narcs /= sizeof(xArc); if (narcs) (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]); - return (client->noClientException); + return Success; } #ifdef MATCH_CLIENT_ENDIAN @@ -2044,7 +1999,7 @@ ProcPutImage(ClientPtr client) stuff->width, stuff->height, stuff->leftPad, stuff->format, tmpImage); - return (client->noClientException); + return Success; } static int @@ -2288,7 +2243,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable, REGION_DESTROY(pDraw->pScreen, pVisibleRegion); if (!im_return) free(pBuf); - return (client->noClientException); + return Success; } int @@ -2327,7 +2282,7 @@ ProcPolyText(ClientPtr client) if (err == Success) { - return(client->noClientException); + return Success; } else return err; @@ -2357,7 +2312,7 @@ ProcImageText8(ClientPtr client) if (err == Success) { - return(client->noClientException); + return Success; } else return err; @@ -2387,7 +2342,7 @@ ProcImageText16(ClientPtr client) if (err == Success) { - return(client->noClientException); + return Success; } else return err; @@ -2425,12 +2380,8 @@ ProcCreateColormap(ClientPtr client) { if (pVisual->vid != stuff->visual) continue; - result = CreateColormap(mid, pScreen, pVisual, &pmap, + return CreateColormap(mid, pScreen, pVisual, &pmap, (int)stuff->alloc, client->index); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); } client->errorValue = stuff->visual; return(BadMatch); @@ -2451,7 +2402,7 @@ ProcFreeColormap(ClientPtr client) /* Freeing a default colormap is a no-op */ if (!(pmap->flags & IsDefault)) FreeResource(stuff->id, RT_NONE); - return (client->noClientException); + return Success; } else { @@ -2475,18 +2426,9 @@ ProcCopyColormapAndFree(ClientPtr client) rc = dixLookupResourceByType((pointer *)&pSrcMap, stuff->srcCmap, RT_COLORMAP, client, DixReadAccess|DixRemoveAccess); if (rc == Success) - { - rc = CopyColormapAndFree(mid, pSrcMap, client->index); - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; - } - else - { - client->errorValue = stuff->srcCmap; - return (rc == BadValue) ? BadColor : rc; - } + return CopyColormapAndFree(mid, pSrcMap, client->index); + client->errorValue = stuff->srcCmap; + return (rc == BadValue) ? BadColor : rc; } int @@ -2507,8 +2449,8 @@ ProcInstallColormap(ClientPtr client) goto out; (*(pcmp->pScreen->InstallColormap)) (pcmp); + return Success; - rc = client->noClientException; out: client->errorValue = stuff->id; return (rc == BadValue) ? BadColor : rc; @@ -2533,8 +2475,8 @@ ProcUninstallColormap(ClientPtr client) if(pcmp->mid != pcmp->pScreen->defColormap) (*(pcmp->pScreen->UninstallColormap)) (pcmp); + return Success; - rc = client->noClientException; out: client->errorValue = stuff->id; return (rc == BadValue) ? BadColor : rc; @@ -2551,12 +2493,12 @@ ProcListInstalledColormaps(ClientPtr client) rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); if (rc != Success) - goto out; + return rc; rc = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen, DixGetAttrAccess); if (rc != Success) - goto out; + return rc; preply = malloc(sizeof(xListInstalledColormapsReply) + pWin->drawable.pScreen->maxInstalledCmaps * @@ -2574,9 +2516,7 @@ ProcListInstalledColormaps(ClientPtr client) client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; WriteSwappedDataToClient(client, nummaps * sizeof(Colormap), &preply[1]); free(preply); - rc = client->noClientException; -out: - return rc; + return Success; } int @@ -2601,17 +2541,12 @@ ProcAllocColor (ClientPtr client) acr.pixel = 0; if( (rc = AllocColor(pmap, &acr.red, &acr.green, &acr.blue, &acr.pixel, client->index)) ) - { - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; - } + return rc; #ifdef PANORAMIX if (noPanoramiXExtension || !pmap->pScreen->myNum) #endif WriteReplyToClient(client, sizeof(xAllocColorReply), &acr); - return (client->noClientException); + return Success; } else @@ -2649,17 +2584,12 @@ ProcAllocNamedColor (ClientPtr client) if( (rc = AllocColor(pcmp, &ancr.screenRed, &ancr.screenGreen, &ancr.screenBlue, &ancr.pixel, client->index)) ) - { - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; - } + return rc; #ifdef PANORAMIX if (noPanoramiXExtension || !pcmp->pScreen->myNum) #endif WriteReplyToClient(client, sizeof (xAllocNamedColorReply), &ancr); - return (client->noClientException); + return Success; } else return(BadName); @@ -2711,10 +2641,7 @@ ProcAllocColorCells (ClientPtr client) (Bool)stuff->contiguous, ppixels, pmasks)) ) { free(ppixels); - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; + return rc; } #ifdef PANORAMIX if (noPanoramiXExtension || !pcmp->pScreen->myNum) @@ -2730,7 +2657,7 @@ ProcAllocColorCells (ClientPtr client) WriteSwappedDataToClient(client, length, ppixels); } free(ppixels); - return (client->noClientException); + return Success; } else { @@ -2780,10 +2707,7 @@ ProcAllocColorPlanes(ClientPtr client) &acpr.redMask, &acpr.greenMask, &acpr.blueMask)) ) { free(ppixels); - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; + return rc; } acpr.length = bytes_to_int32(length); #ifdef PANORAMIX @@ -2795,7 +2719,7 @@ ProcAllocColorPlanes(ClientPtr client) WriteSwappedDataToClient(client, length, ppixels); } free(ppixels); - return (client->noClientException); + return Success; } else { @@ -2821,13 +2745,8 @@ ProcFreeColors(ClientPtr client) if(pcmp->flags & AllAllocated) return(BadAccess); count = bytes_to_int32((client->req_len << 2) - sizeof(xFreeColorsReq)); - rc = FreeColors(pcmp, client->index, count, + return FreeColors(pcmp, client->index, count, (Pixel *)&stuff[1], (Pixel)stuff->planeMask); - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; - } else { @@ -2854,11 +2773,7 @@ ProcStoreColors (ClientPtr client) if (count % sizeof(xColorItem)) return(BadLength); count /= sizeof(xColorItem); - rc = StoreColors(pcmp, count, (xColorItem *)&stuff[1], client); - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; + return StoreColors(pcmp, count, (xColorItem *)&stuff[1], client); } else { @@ -2886,11 +2801,7 @@ ProcStoreNamedColor (ClientPtr client) { def.flags = stuff->flags; def.pixel = stuff->pixel; - rc = StoreColors(pcmp, 1, &def, client); - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; + return StoreColors(pcmp, 1, &def, client); } return (BadName); } @@ -2924,10 +2835,7 @@ ProcQueryColors(ClientPtr client) if( (rc = QueryColors(pcmp, count, (Pixel *)&stuff[1], prgbs, client)) ) { if (prgbs) free(prgbs); - if (client->noClientException != Success) - return(client->noClientException); - else - return rc; + return rc; } memset(&qcr, 0, sizeof(xQueryColorsReply)); qcr.type = X_Reply; @@ -2941,7 +2849,7 @@ ProcQueryColors(ClientPtr client) WriteSwappedDataToClient(client, count * sizeof(xrgb), prgbs); } if (prgbs) free(prgbs); - return(client->noClientException); + return Success; } else @@ -2979,7 +2887,7 @@ ProcLookupColor(ClientPtr client) &lcr.screenBlue, pcmp->pVisual); WriteReplyToClient(client, sizeof(xLookupColorReply), &lcr); - return(client->noClientException); + return Success; } return (BadName); } @@ -3078,7 +2986,7 @@ ProcCreateCursor (ClientPtr client) if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) return BadAlloc; - return client->noClientException; + return Success; } int @@ -3100,7 +3008,7 @@ ProcCreateGlyphCursor (ClientPtr client) if (res != Success) return res; if (AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) - return client->noClientException; + return Success; return BadAlloc; } @@ -3118,7 +3026,7 @@ ProcFreeCursor (ClientPtr client) if (rc == Success) { FreeResource(stuff->id, RT_NONE); - return (client->noClientException); + return Success; } else { @@ -3164,7 +3072,7 @@ ProcQueryBestSize (ClientPtr client) reply.width = stuff->width; reply.height = stuff->height; WriteReplyToClient(client, sizeof(xQueryBestSizeReply), &reply); - return (client->noClientException); + return Success; } @@ -3228,7 +3136,7 @@ ProcSetScreenSaver (ClientPtr client) ScreenSaverInterval = defaultScreenSaverInterval; SetScreenSaverTimer(); - return (client->noClientException); + return Success; } int @@ -3253,31 +3161,24 @@ ProcGetScreenSaver(ClientPtr client) rep.preferBlanking = ScreenSaverBlanking; rep.allowExposures = ScreenSaverAllowExposures; WriteReplyToClient(client, sizeof(xGetScreenSaverReply), &rep); - return (client->noClientException); + return Success; } int ProcChangeHosts(ClientPtr client) { REQUEST(xChangeHostsReq); - int result; REQUEST_FIXED_SIZE(xChangeHostsReq, stuff->hostLength); if(stuff->mode == HostInsert) - result = AddHost(client, (int)stuff->hostFamily, + return AddHost(client, (int)stuff->hostFamily, stuff->hostLength, (pointer)&stuff[1]); - else if (stuff->mode == HostDelete) - result = RemoveHost(client, (int)stuff->hostFamily, + if (stuff->mode == HostDelete) + return RemoveHost(client, (int)stuff->hostFamily, stuff->hostLength, (pointer)&stuff[1]); - else - { - client->errorValue = stuff->mode; - return BadValue; - } - if (!result) - result = client->noClientException; - return (result); + client->errorValue = stuff->mode; + return BadValue; } int @@ -3309,13 +3210,12 @@ ProcListHosts(ClientPtr client) WriteSwappedDataToClient(client, len, pdata); } free(pdata); - return (client->noClientException); + return Success; } int ProcChangeAccessControl(ClientPtr client) { - int result; REQUEST(xSetAccessControlReq); REQUEST_SIZE_MATCH(xSetAccessControlReq); @@ -3324,10 +3224,7 @@ ProcChangeAccessControl(ClientPtr client) client->errorValue = stuff->mode; return BadValue; } - result = ChangeAccessControl(client, stuff->mode == EnableAccess); - if (!result) - result = client->noClientException; - return (result); + return ChangeAccessControl(client, stuff->mode == EnableAccess); } /********************* @@ -3363,7 +3260,7 @@ ProcKillClient(ClientPtr client) if (stuff->id == AllTemporary) { CloseDownRetainedResources(); - return (client->noClientException); + return Success; } rc = dixLookupClient(&killclient, stuff->id, client, DixDestroyAccess); @@ -3378,7 +3275,7 @@ ProcKillClient(ClientPtr client) isItTimeToYield = TRUE; return (Success); } - return (client->noClientException); + return Success; } else return rc; @@ -3390,7 +3287,7 @@ ProcSetFontPath(ClientPtr client) unsigned char *ptr; unsigned long nbytes, total; long nfonts; - int n, result; + int n; REQUEST(xSetFontPathReq); REQUEST_AT_LEAST_SIZE(xSetFontPathReq); @@ -3408,10 +3305,7 @@ ProcSetFontPath(ClientPtr client) } if (total >= 4) return(BadLength); - result = SetFontPath(client, stuff->nFonts, (unsigned char *)&stuff[1]); - if (!result) - result = client->noClientException; - return (result); + return SetFontPath(client, stuff->nFonts, (unsigned char *)&stuff[1]); } int @@ -3435,7 +3329,7 @@ ProcGetFontPath(ClientPtr client) WriteReplyToClient(client, sizeof(xGetFontPathReply), &reply); if (stringLens || numpaths) (void)WriteToClient(client, stringLens + numpaths, (char *)bufferStart); - return(client->noClientException); + return Success; } int @@ -3454,7 +3348,7 @@ ProcChangeCloseDownMode(ClientPtr client) (stuff->mode == RetainTemporary)) { client->closeDownMode = stuff->mode; - return (client->noClientException); + return Success; } else { @@ -3479,7 +3373,7 @@ int ProcForceScreenSaver(ClientPtr client) rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int)stuff->mode); if (rc != Success) return rc; - return client->noClientException; + return Success; } int ProcNoOperation(ClientPtr client) @@ -3487,7 +3381,7 @@ int ProcNoOperation(ClientPtr client) REQUEST_AT_LEAST_SIZE(xReq); /* noop -- don't do anything */ - return(client->noClientException); + return Success; } void @@ -3705,7 +3599,7 @@ ProcInitialConnection(ClientPtr client) swaps(&stuff->length, whichbyte); } ResetCurrentRequest(client); - return (client->noClientException); + return Success; } static int @@ -3802,7 +3696,7 @@ SendConnSetup(ClientPtr client, char *reason) clientinfo.setup = (xConnSetup *)lConnectionInfo; CallCallbacks((&ClientStateCallback), (pointer)&clientinfo); } - return (client->noClientException); + return Success; } int @@ -3836,7 +3730,7 @@ ProcEstablishConnection(ClientPtr client) client->clientState = ClientStateCheckedSecurity; else if (client->clientState != ClientStateAuthenticating) return(SendConnSetup(client, reason)); - return(client->noClientException); + return Success; } void diff --git a/dix/extension.c b/dix/extension.c index 6940b68b0..d3d4db042 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -293,7 +293,7 @@ ProcQueryExtension(ClientPtr client) } } WriteReplyToClient(client, sizeof(xQueryExtensionReply), &reply); - return(client->noClientException); + return Success; } int @@ -354,5 +354,5 @@ ProcListExtensions(ClientPtr client) WriteToClient(client, total_length, buffer); free(buffer); } - return(client->noClientException); + return Success; } diff --git a/dix/property.c b/dix/property.c index 74d3d7826..03b70efc6 100644 --- a/dix/property.c +++ b/dix/property.c @@ -244,7 +244,7 @@ ProcChangeProperty(ClientPtr client) if (err != Success) return err; else - return client->noClientException; + return Success; } int @@ -442,7 +442,7 @@ NullPropertyReply( reply->propertyType = propertyType; reply->format = format; WriteReplyToClient(client, sizeof(xGenericReply), reply); - return(client->noClientException); + return Success; } /***************** @@ -574,7 +574,7 @@ ProcGetProperty(ClientPtr client) free(pProp->data); free(pProp); } - return(client->noClientException); + return Success; } int @@ -620,7 +620,7 @@ ProcListProperties(ClientPtr client) WriteSwappedDataToClient(client, numProps * sizeof(Atom), pAtoms); } free(pAtoms); - return(client->noClientException); + return Success; } int @@ -641,9 +641,5 @@ ProcDeleteProperty(ClientPtr client) return (BadAtom); } - result = DeleteProperty(client, pWin, stuff->property); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); + return DeleteProperty(client, pWin, stuff->property); } diff --git a/dix/selection.c b/dix/selection.c index 6a13572fb..4f592d123 100644 --- a/dix/selection.c +++ b/dix/selection.c @@ -225,7 +225,7 @@ ProcSetSelectionOwner(ClientPtr client) pSel->client = (pWin ? client : NullClient); CallSelectionCallback(pSel, client, SelectionSetOwner); - return client->noClientException; + return Success; } int @@ -257,7 +257,7 @@ ProcGetSelectionOwner(ClientPtr client) return rc; WriteReplyToClient(client, sizeof(xGetSelectionOwnerReply), &reply); - return client->noClientException; + return Success; } int @@ -298,7 +298,7 @@ ProcConvertSelection(ClientPtr client) event.u.selectionRequest.property = stuff->property; if (TryClientEvents(pSel->client, NULL, &event, 1, NoEventMask, NoEventMask /* CantBeFiltered */, NullGrab)) - return client->noClientException; + return Success; } event.u.u.type = SelectionNotify; @@ -309,5 +309,5 @@ ProcConvertSelection(ClientPtr client) event.u.selectionNotify.property = None; TryClientEvents(client, NULL, &event, 1, NoEventMask, NoEventMask /* CantBeFiltered */, NullGrab); - return client->noClientException; + return Success; } diff --git a/glx/glxext.c b/glx/glxext.c index 593e05309..b234afcd0 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -583,7 +583,7 @@ static int __glXDispatch(ClientPtr client) ResetCurrentRequest(client); client->sequence--; IgnoreClient(client); - return(client->noClientException); + return Success; } /* diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index 95e7adca9..5718b6a59 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -235,7 +235,7 @@ static int ProcDMXQueryVersion(ClientPtr client) swapl(&rep.patchVersion, n); } WriteToClient(client, sizeof(xDMXQueryVersionReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXSync(ClientPtr client) @@ -257,7 +257,7 @@ static int ProcDMXSync(ClientPtr client) swapl(&rep.status, n); } WriteToClient(client, sizeof(xDMXSyncReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXForceWindowCreation(ClientPtr client) @@ -326,7 +326,7 @@ static int ProcDMXGetScreenCount(ClientPtr client) swapl(&rep.screenCount, n); } WriteToClient(client, sizeof(xDMXGetScreenCountReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXGetScreenAttributes(ClientPtr client) @@ -384,7 +384,7 @@ static int ProcDMXGetScreenAttributes(ClientPtr client) } WriteToClient(client, sizeof(xDMXGetScreenAttributesReply), (char *)&rep); if (length) WriteToClient(client, length, (char *)attr.displayName); - return client->noClientException; + return Success; } static int ProcDMXChangeScreensAttributes(ClientPtr client) @@ -457,7 +457,7 @@ static int ProcDMXChangeScreensAttributes(ClientPtr client) WriteToClient(client, sizeof(xDMXChangeScreensAttributesReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXAddScreen(ClientPtr client) @@ -508,7 +508,7 @@ static int ProcDMXAddScreen(ClientPtr client) WriteToClient(client, sizeof(xDMXAddScreenReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXRemoveScreen(ClientPtr client) @@ -534,7 +534,7 @@ static int ProcDMXRemoveScreen(ClientPtr client) WriteToClient(client, sizeof(xDMXRemoveScreenReply), (char *)&rep); - return client->noClientException; + return Success; } @@ -678,7 +678,7 @@ static int ProcDMXGetWindowAttributes(ClientPtr client) free(windows); free(screens); - return client->noClientException; + return Success; } static int ProcDMXGetDesktopAttributes(ClientPtr client) @@ -709,7 +709,7 @@ static int ProcDMXGetDesktopAttributes(ClientPtr client) swapl(&rep.shiftY, n); } WriteToClient(client, sizeof(xDMXGetDesktopAttributesReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXChangeDesktopAttributes(ClientPtr client) @@ -752,7 +752,7 @@ static int ProcDMXChangeDesktopAttributes(ClientPtr client) WriteToClient(client, sizeof(xDMXChangeDesktopAttributesReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXGetInputCount(ClientPtr client) @@ -772,7 +772,7 @@ static int ProcDMXGetInputCount(ClientPtr client) swapl(&rep.inputCount, n); } WriteToClient(client, sizeof(xDMXGetInputCountReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXGetInputAttributes(ClientPtr client) @@ -810,7 +810,7 @@ static int ProcDMXGetInputAttributes(ClientPtr client) } WriteToClient(client, sizeof(xDMXGetInputAttributesReply), (char *)&rep); if (length) WriteToClient(client, length, (char *)attr.name); - return client->noClientException; + return Success; } static int ProcDMXAddInput(ClientPtr client) @@ -861,7 +861,7 @@ static int ProcDMXAddInput(ClientPtr client) swapl(&rep.physicalId, n); } WriteToClient(client, sizeof(xDMXAddInputReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXRemoveInput(ClientPtr client) @@ -887,7 +887,7 @@ static int ProcDMXRemoveInput(ClientPtr client) swapl(&rep.status, n); } WriteToClient(client, sizeof(xDMXRemoveInputReply), (char *)&rep); - return client->noClientException; + return Success; } static int ProcDMXDispatch(ClientPtr client) diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index b6b2e3111..7a418c813 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -208,8 +208,6 @@ static int dmxProcSetFontPath(ClientPtr client) /* Restore old fontpath in the DMX server */ SetFontPath(client, nOldPaths, oldFontPath); client->errorValue = error; - } else { - result = client->noClientException; } } diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c index 07733381f..55cc0f128 100644 --- a/hw/kdrive/ephyr/ephyrdriext.c +++ b/hw/kdrive/ephyr/ephyrdriext.c @@ -636,7 +636,7 @@ ProcXF86DRIQueryVersion (register ClientPtr client) } WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep); EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -674,7 +674,7 @@ ProcXF86DRIQueryDirectRenderingCapable (register ClientPtr client) WriteToClient(client, sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep); EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -717,7 +717,7 @@ ProcXF86DRIOpenConnection (register ClientPtr client) if (rep.busIdStringLength) WriteToClient(client, rep.busIdStringLength, busIdString); EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -744,7 +744,7 @@ ProcXF86DRIAuthConnection (register ClientPtr client) } WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep); EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -763,7 +763,7 @@ ProcXF86DRICloseConnection (register ClientPtr client) */ EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -802,7 +802,7 @@ ProcXF86DRIGetClientDriverName (register ClientPtr client) rep.clientDriverNameLength, clientDriverName); EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -848,7 +848,7 @@ ProcXF86DRICreateContext (register ClientPtr client) WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep); EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -868,7 +868,7 @@ ProcXF86DRIDestroyContext (register ClientPtr client) } EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static Bool @@ -1079,7 +1079,7 @@ ProcXF86DRICreateDrawable (ClientPtr client) WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep); EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -1123,7 +1123,7 @@ ProcXF86DRIDestroyDrawable (register ClientPtr client) pair->remote=0; EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -1257,7 +1257,7 @@ ProcXF86DRIGetDrawableInfo (register ClientPtr client) EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int @@ -1308,7 +1308,7 @@ ProcXF86DRIGetDeviceInfo (register ClientPtr client) WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate); } EPHYR_LOG ("leave\n") ; - return (client->noClientException); + return Success; } static int diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 711a9cb75..6587af947 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -129,7 +129,7 @@ ProcXDGAQueryVersion(ClientPtr client) rep.minorVersion = SERVER_XDGA_MINOR_VERSION; WriteToClient(client, sizeof(xXDGAQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } @@ -166,7 +166,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client) if(rep.length) WriteToClient(client, nameSize, deviceName); - return (client->noClientException); + return Success; } @@ -185,7 +185,7 @@ ProcXDGACloseFramebuffer(ClientPtr client) DGACloseFramebuffer(stuff->screen); - return (client->noClientException); + return Success; } static int @@ -210,12 +210,12 @@ ProcXDGAQueryModes(ClientPtr client) rep.number = 0; rep.length = 0; WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep); - return (client->noClientException); + return Success; } if(!(num = DGAGetModes(stuff->screen))) { WriteToClient(client, sz_xXDGAQueryModesReply, (char*)&rep); - return (client->noClientException); + return Success; } if(!(mode = (XDGAModePtr)malloc(num * sizeof(XDGAModeRec)))) @@ -269,7 +269,7 @@ ProcXDGAQueryModes(ClientPtr client) free(mode); - return (client->noClientException); + return Success; } @@ -342,7 +342,7 @@ ProcXDGASetMode(ClientPtr client) DGASelectInput(stuff->screen, NULL, 0); DGASetMode(stuff->screen, 0, &mode, &pPix); WriteToClient(client, sz_xXDGASetModeReply, (char*)&rep); - return (client->noClientException); + return Success; } if(Success != DGASetMode(stuff->screen, stuff->mode, &mode, &pPix)) @@ -397,7 +397,7 @@ ProcXDGASetMode(ClientPtr client) WriteToClient(client, sz_xXDGAModeInfo, (char*)(&info)); WriteToClient(client, size, mode.name); - return (client->noClientException); + return Success; } static int @@ -415,7 +415,7 @@ ProcXDGASetViewport(ClientPtr client) DGASetViewport(stuff->screen, stuff->x, stuff->y, stuff->flags); - return (client->noClientException); + return Success; } static int @@ -435,14 +435,10 @@ ProcXDGAInstallColormap(ClientPtr client) rc = dixLookupResourceByType((pointer *)&cmap, stuff->cmap, RT_COLORMAP, client, DixInstallAccess); - if (rc == Success) { - DGAInstallCmap(cmap); - return (client->noClientException); - } else { + if (rc != Success) return (rc == BadValue) ? BadColor : rc; - } - - return (client->noClientException); + DGAInstallCmap(cmap); + return Success; } @@ -462,7 +458,7 @@ ProcXDGASelectInput(ClientPtr client) if(DGA_GETCLIENT(stuff->screen) == client) DGASelectInput(stuff->screen, client, stuff->mask); - return (client->noClientException); + return Success; } @@ -483,7 +479,7 @@ ProcXDGAFillRectangle(ClientPtr client) stuff->width, stuff->height, stuff->color)) return BadMatch; - return (client->noClientException); + return Success; } static int @@ -503,7 +499,7 @@ ProcXDGACopyArea(ClientPtr client) stuff->width, stuff->height, stuff->dstx, stuff->dsty)) return BadMatch; - return (client->noClientException); + return Success; } @@ -524,7 +520,7 @@ ProcXDGACopyTransparentArea(ClientPtr client) stuff->width, stuff->height, stuff->dstx, stuff->dsty, stuff->key)) return BadMatch; - return (client->noClientException); + return Success; } @@ -548,7 +544,7 @@ ProcXDGAGetViewportStatus(ClientPtr client) rep.status = DGAGetViewportStatus(stuff->screen); WriteToClient(client, sizeof(xXDGAGetViewportStatusReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -571,7 +567,7 @@ ProcXDGASync(ClientPtr client) DGASync(stuff->screen); WriteToClient(client, sizeof(xXDGASyncReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -592,7 +588,7 @@ ProcXDGASetClientVersion(ClientPtr client) pPriv->major = stuff->major; pPriv->minor = stuff->minor; - return (client->noClientException); + return Success; } static int @@ -623,7 +619,7 @@ ProcXDGAChangePixmapMode(ClientPtr client) rep.y = y; WriteToClient(client, sizeof(xXDGAChangePixmapModeReply), (char *)&rep); - return (client->noClientException); + return Success; } @@ -649,7 +645,7 @@ ProcXDGACreateColormap(ClientPtr client) if(result != Success) return result; - return (client->noClientException); + return Success; } /* @@ -707,7 +703,7 @@ ProcXF86DGAGetVideoLL(ClientPtr client) rep.ram_size = rep.bank_size >> 10; WriteToClient(client, SIZEOF(xXF86DGAGetVideoLLReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -762,7 +758,7 @@ ProcXF86DGADirectVideo(ClientPtr client) DGA_SETCLIENT(stuff->screen, NULL); } - return (client->noClientException); + return Success; } static int @@ -793,7 +789,7 @@ ProcXF86DGAGetViewPortSize(ClientPtr client) rep.height = mode.viewportHeight; WriteToClient(client, SIZEOF(xXF86DGAGetViewPortSizeReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -819,7 +815,7 @@ ProcXF86DGASetViewPort(ClientPtr client) != Success) return DGAErrorBase + XF86DGADirectNotActivated; - return (client->noClientException); + return Success; } static int @@ -838,7 +834,7 @@ ProcXF86DGAGetVidPage(ClientPtr client) rep.vpage = 0; /* silently fail */ WriteToClient(client, SIZEOF(xXF86DGAGetVidPageReply), (char *)&rep); - return (client->noClientException); + return Success; } @@ -854,7 +850,7 @@ ProcXF86DGASetVidPage(ClientPtr client) /* silently fail */ - return (client->noClientException); + return Success; } @@ -880,7 +876,7 @@ ProcXF86DGAInstallColormap(ClientPtr client) client, DixInstallAccess); if (rc == Success) { DGAInstallCmap(pcmp); - return (client->noClientException); + return Success; } else { return (rc == BadValue) ? BadColor : rc; } @@ -905,7 +901,7 @@ ProcXF86DGAQueryDirectVideo(ClientPtr client) rep.flags = XF86DGADirectPresent; WriteToClient(client, SIZEOF(xXF86DGAQueryDirectVideoReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -931,7 +927,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client) rep.result = 1; WriteToClient(client, SIZEOF(xXF86DGAViewPortChangedReply), (char *)&rep); - return (client->noClientException); + return Success; } #endif /* DGA_PROTOCOL_OLD_SUPPORT */ diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 5bdd88c0a..665f74396 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -394,7 +394,7 @@ ProcXF86VidModeQueryVersion(ClientPtr client) swaps(&rep.minorVersion, n); } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -495,7 +495,7 @@ ProcXF86VidModeGetModeLine(ClientPtr client) WriteToClient(client, sizeof(xXF86VidModeGetModeLineReply), (char *)&rep); } - return (client->noClientException); + return Success; } static int @@ -590,7 +590,7 @@ ProcXF86VidModeGetAllModeLines(ClientPtr client) } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock)); - return (client->noClientException); + return Success; } #define MODEMATCH(mode,stuff) \ @@ -761,7 +761,7 @@ ProcXF86VidModeAddModeLine(ClientPtr client) if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) ErrorF("AddModeLine - Succeeded\n"); - return client->noClientException; + return Success; } static int @@ -874,7 +874,7 @@ ProcXF86VidModeDeleteModeLine(ClientPtr client) VidModeDeleteModeline(stuff->screen, mode); if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) ErrorF("DeleteModeLine - Succeeded\n"); - return(client->noClientException); + return Success; } } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock)); @@ -1002,7 +1002,7 @@ ProcXF86VidModeModModeLine(ClientPtr client) if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) ErrorF("ModModeLine - Succeeded\n"); - return(client->noClientException); + return Success; } static int @@ -1120,7 +1120,7 @@ status_reply: WriteToClient(client, sizeof(xXF86VidModeValidateModeLineReply), (char *)&rep); if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) ErrorF("ValidateModeLine - Succeeded (status = %d)\n", status); - return(client->noClientException); + return Success; } static int @@ -1137,7 +1137,7 @@ ProcXF86VidModeSwitchMode(ClientPtr client) VidModeZoomViewport(stuff->screen, (short)stuff->zoom); - return (client->noClientException); + return Success; } static int @@ -1201,7 +1201,7 @@ ProcXF86VidModeSwitchToMode(ClientPtr client) if ((VidModeGetDotClock(stuff->screen, stuff->dotclock) == dotClock) && MODEMATCH(mode, stuff)) - return (client->noClientException); + return Success; if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) return BadValue; @@ -1230,7 +1230,7 @@ ProcXF86VidModeSwitchToMode(ClientPtr client) if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) ErrorF("SwitchToMode - Succeeded\n"); - return(client->noClientException); + return Success; } } while (VidModeGetNextModeline(stuff->screen, &mode, &dotClock)); @@ -1252,7 +1252,7 @@ ProcXF86VidModeLockModeSwitch(ClientPtr client) if (!VidModeLockZoom(stuff->screen, (short)stuff->lock)) return VidModeErrorBase + XF86VidModeZoomLocked; - return (client->noClientException); + return Success; } static int @@ -1339,7 +1339,7 @@ ProcXF86VidModeGetMonitor(ClientPtr client) free(hsyncdata); free(vsyncdata); - return (client->noClientException); + return Success; } static int @@ -1371,7 +1371,7 @@ ProcXF86VidModeGetViewPort(ClientPtr client) swapl(&rep.y, n); } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -1389,7 +1389,7 @@ ProcXF86VidModeSetViewPort(ClientPtr client) if (!VidModeSetViewPort(stuff->screen, stuff->x, stuff->y)) return BadValue; - return (client->noClientException); + return Success; } static int @@ -1453,7 +1453,7 @@ ProcXF86VidModeGetDotClocks(ClientPtr client) } free(Clocks); - return (client->noClientException); + return Success; } static int @@ -1472,7 +1472,7 @@ ProcXF86VidModeSetGamma(ClientPtr client) ((float)stuff->green)/10000., ((float)stuff->blue)/10000.)) return BadValue; - return (client->noClientException); + return Success; } static int @@ -1506,7 +1506,7 @@ ProcXF86VidModeGetGamma(ClientPtr client) swapl(&rep.blue, n); } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -1533,7 +1533,7 @@ ProcXF86VidModeSetGammaRamp(ClientPtr client) if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b)) return BadValue; - return (client->noClientException); + return Success; } static int @@ -1584,7 +1584,7 @@ ProcXF86VidModeGetGammaRamp(ClientPtr client) free(ramp); } - return (client->noClientException); + return Success; } @@ -1611,7 +1611,7 @@ ProcXF86VidModeGetGammaRampSize(ClientPtr client) } WriteToClient(client,sizeof(xXF86VidModeGetGammaRampSizeReply),(char*)&rep); - return (client->noClientException); + return Success; } static int @@ -1641,7 +1641,7 @@ ProcXF86VidModeGetPermissions(ClientPtr client) } WriteToClient(client,sizeof(xXF86VidModeGetPermissionsReply),(char*)&rep); - return (client->noClientException); + return Success; } @@ -1665,7 +1665,7 @@ ProcXF86VidModeSetClientVersion(ClientPtr client) pPriv->major = stuff->major; pPriv->minor = stuff->minor; - return (client->noClientException); + return Success; } static int diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 4e5a15fca..f32565d3c 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -146,7 +146,7 @@ ProcXF86DRIQueryVersion( swapl(&rep.patchVersion, n); } WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -185,7 +185,7 @@ ProcXF86DRIQueryDirectRenderingCapable( WriteToClient(client, sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -228,7 +228,7 @@ ProcXF86DRIOpenConnection( WriteToClient(client, sizeof(xXF86DRIOpenConnectionReply), (char *)&rep); if (rep.busIdStringLength) WriteToClient(client, rep.busIdStringLength, busIdString); - return (client->noClientException); + return Success; } static int @@ -255,7 +255,7 @@ ProcXF86DRIAuthConnection( rep.authenticated = 0; } WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -272,7 +272,7 @@ ProcXF86DRICloseConnection( DRICloseConnection( screenInfo.screens[stuff->screen]); - return (client->noClientException); + return Success; } static int @@ -311,7 +311,7 @@ ProcXF86DRIGetClientDriverName( WriteToClient(client, rep.clientDriverNameLength, clientDriverName); - return (client->noClientException); + return Success; } static int @@ -343,7 +343,7 @@ ProcXF86DRICreateContext( } WriteToClient(client, sizeof(xXF86DRICreateContextReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -363,7 +363,7 @@ ProcXF86DRIDestroyContext( return BadValue; } - return (client->noClientException); + return Success; } static int @@ -397,7 +397,7 @@ ProcXF86DRICreateDrawable( } WriteToClient(client, sizeof(xXF86DRICreateDrawableReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -425,7 +425,7 @@ ProcXF86DRIDestroyDrawable( return BadValue; } - return (client->noClientException); + return Success; } static int @@ -533,7 +533,7 @@ ProcXF86DRIGetDrawableInfo( (char *)pBackClipRects); } - return (client->noClientException); + return Success; } static int @@ -584,7 +584,7 @@ ProcXF86DRIGetDeviceInfo( if (rep.length) { WriteToClient(client, rep.devPrivateSize, (char *)pDevPrivate); } - return (client->noClientException); + return Success; } static int diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c index 94193266b..602eb6653 100644 --- a/hw/xfree86/dri2/dri2ext.c +++ b/hw/xfree86/dri2/dri2ext.c @@ -91,7 +91,7 @@ ProcDRI2QueryVersion(ClientPtr client) WriteToClient(client, sizeof(xDRI2QueryVersionReply), &rep); - return client->noClientException; + return Success; } static int @@ -129,7 +129,7 @@ ProcDRI2Connect(ClientPtr client) WriteToClient(client, rep.driverNameLength, driverName); WriteToClient(client, rep.deviceNameLength, deviceName); - return client->noClientException; + return Success; } static int @@ -151,7 +151,7 @@ ProcDRI2Authenticate(ClientPtr client) rep.authenticated = DRI2Authenticate(pDraw->pScreen, stuff->magic); WriteToClient(client, sizeof(xDRI2AuthenticateReply), &rep); - return client->noClientException; + return Success; } static void @@ -188,7 +188,7 @@ ProcDRI2CreateDrawable(ClientPtr client) if (status != Success) return status; - return client->noClientException; + return Success; } static int @@ -203,7 +203,7 @@ ProcDRI2DestroyDrawable(ClientPtr client) &pDrawable, &status)) return status; - return client->noClientException; + return Success; } @@ -269,7 +269,7 @@ ProcDRI2GetBuffers(ClientPtr client) return status; if (DRI2ThrottleClient(client, pDrawable)) - return client->noClientException; + return Success; attachments = (unsigned int *) &stuff[1]; buffers = DRI2GetBuffers(pDrawable, &width, &height, @@ -278,7 +278,7 @@ ProcDRI2GetBuffers(ClientPtr client) send_buffers_reply(client, pDrawable, buffers, count, width, height); - return client->noClientException; + return Success; } static int @@ -296,7 +296,7 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client) return status; if (DRI2ThrottleClient(client, pDrawable)) - return client->noClientException; + return Success; attachments = (unsigned int *) &stuff[1]; buffers = DRI2GetBuffersWithFormat(pDrawable, &width, &height, @@ -304,7 +304,7 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client) send_buffers_reply(client, pDrawable, buffers, count, width, height); - return client->noClientException; + return Success; } static int @@ -341,7 +341,7 @@ ProcDRI2CopyRegion(ClientPtr client) WriteToClient(client, sizeof(xDRI2CopyRegionReply), &rep); - return client->noClientException; + return Success; } static void @@ -398,7 +398,7 @@ ProcDRI2SwapBuffers(ClientPtr client) * also orders swaps. */ if (DRI2ThrottleClient(client, pDrawable)) - return client->noClientException; + return Success; target_msc = vals_to_card64(stuff->target_msc_lo, stuff->target_msc_hi); divisor = vals_to_card64(stuff->divisor_lo, stuff->divisor_hi); @@ -416,7 +416,7 @@ ProcDRI2SwapBuffers(ClientPtr client) WriteToClient(client, sizeof(xDRI2SwapBuffersReply), &rep); - return client->noClientException; + return Success; } static void @@ -456,7 +456,7 @@ ProcDRI2GetMSC(ClientPtr client) WriteToClient(client, sizeof(xDRI2MSCReply), &rep); - return client->noClientException; + return Success; } static int @@ -483,7 +483,7 @@ ProcDRI2WaitMSC(ClientPtr client) if (status != Success) return status; - return client->noClientException; + return Success; } int @@ -498,7 +498,7 @@ ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust, CARD64 msc, CARD64 sbc) WriteToClient(client, sizeof(xDRI2MSCReply), &rep); - return client->noClientException; + return Success; } static int @@ -518,7 +518,7 @@ ProcDRI2SwapInterval(ClientPtr client) DRI2SwapInterval(pDrawable, stuff->interval); - return client->noClientException; + return Success; } static int @@ -548,7 +548,7 @@ ProcDRI2WaitSBC(ClientPtr client) WriteToClient(client, sizeof(xDRI2MSCReply), &rep); - return client->noClientException; + return Success; } static int @@ -613,7 +613,7 @@ SProcDRI2Connect(ClientPtr client) rep.driverNameLength = 0; rep.deviceNameLength = 0; - return client->noClientException; + return Success; } static int diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c index 8750f5d00..53d167e5b 100644 --- a/hw/xquartz/applewm.c +++ b/hw/xquartz/applewm.c @@ -192,7 +192,7 @@ ProcAppleWMQueryVersion( swapl(&rep.length, n); } WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } @@ -383,7 +383,7 @@ ProcAppleWMDisableUpdate( appleWMProcs->DisableUpdate(); - return (client->noClientException); + return Success; } static int @@ -395,7 +395,7 @@ ProcAppleWMReenableUpdate( appleWMProcs->EnableUpdate(); - return (client->noClientException); + return Success; } @@ -435,7 +435,7 @@ ProcAppleWMSetWindowMenu( free(items); free(shortcuts); - return (client->noClientException); + return Success; } static int @@ -447,7 +447,7 @@ ProcAppleWMSetWindowMenuCheck( REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq); X11ApplicationSetWindowMenuCheck(stuff->index); - return (client->noClientException); + return Success; } static int @@ -458,7 +458,7 @@ ProcAppleWMSetFrontProcess( REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq); X11ApplicationSetFrontProcess(); - return (client->noClientException); + return Success; } static int @@ -483,7 +483,7 @@ ProcAppleWMSetWindowLevel(register ClientPtr client) return err; } - return (client->noClientException); + return Success; } static int @@ -502,7 +502,7 @@ ProcAppleWMSendPSN(register ClientPtr client) return err; } - return (client->noClientException); + return Success; } static int @@ -532,7 +532,7 @@ ProcAppleWMAttachTransient(register ClientPtr client) return err; } - return (client->noClientException); + return Success; } static int @@ -545,7 +545,7 @@ ProcAppleWMSetCanQuit( REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq); X11ApplicationSetCanQuit(stuff->state); - return (client->noClientException); + return Success; } @@ -581,7 +581,7 @@ ProcAppleWMFrameGetRect( rep.h = rr.y2 - rr.y1; WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -611,7 +611,7 @@ ProcAppleWMFrameHitTest( rep.ret = ret; WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -649,7 +649,7 @@ ProcAppleWMFrameDraw( return errno; } - return (client->noClientException); + return Success; } diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c index c3154b948..5868ab129 100644 --- a/hw/xquartz/pseudoramiX.c +++ b/hw/xquartz/pseudoramiX.c @@ -202,7 +202,7 @@ static int ProcPseudoramiXGetState(ClientPtr client) swaps (&rep.state, n); } WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep); - return client->noClientException; + return Success; } @@ -231,7 +231,7 @@ static int ProcPseudoramiXGetScreenCount(ClientPtr client) swaps (&rep.ScreenCount, n); } WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep); - return client->noClientException; + return Success; } @@ -265,7 +265,7 @@ static int ProcPseudoramiXGetScreenSize(ClientPtr client) swaps (&rep.height, n); } WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep); - return client->noClientException; + return Success; } @@ -290,7 +290,7 @@ static int ProcPseudoramiXIsActive(ClientPtr client) swapl (&rep.state, n); } WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep); - return client->noClientException; + return Success; } @@ -337,7 +337,7 @@ static int ProcPseudoramiXQueryScreens(ClientPtr client) } } - return client->noClientException; + return Success; } diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c index 74a4ec315..71cfb591b 100644 --- a/hw/xquartz/xpr/appledri.c +++ b/hw/xquartz/xpr/appledri.c @@ -128,7 +128,7 @@ ProcAppleDRIQueryVersion( swapl(&rep.length, n); } WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } @@ -159,7 +159,7 @@ ProcAppleDRIQueryDirectRenderingCapable( WriteToClient(client, sizeof(xAppleDRIQueryDirectRenderingCapableReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -182,7 +182,7 @@ ProcAppleDRIAuthConnection( rep.authenticated = 0; } WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *)&rep); - return (client->noClientException); + return Success; } static void surface_notify( @@ -247,7 +247,7 @@ ProcAppleDRICreateSurface( rep.uid = sid; WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *)&rep); - return (client->noClientException); + return Success; } static int @@ -271,7 +271,7 @@ ProcAppleDRIDestroySurface( return BadValue; } - return (client->noClientException); + return Success; } static int @@ -323,7 +323,7 @@ ProcAppleDRICreatePixmap(ClientPtr client) WriteReplyToClient(client, sizeof(rep), &rep); (void)WriteToClient(client, rep.stringLength, path); - return (client->noClientException); + return Success; } static int @@ -342,7 +342,7 @@ ProcAppleDRIDestroyPixmap(ClientPtr client) DRIDestroyPixmap(pDrawable); - return (client->noClientException); + return Success; } /* dispatch */ diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c index a996bc4ec..d09e98352 100755 --- a/hw/xwin/winwindowswm.c +++ b/hw/xwin/winwindowswm.c @@ -124,7 +124,7 @@ ProcWindowsWMQueryVersion(register ClientPtr client) swapl(&rep.length, n); } WriteToClient(client, sizeof(xWindowsWMQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } @@ -335,7 +335,7 @@ ProcWindowsWMDisableUpdate (register ClientPtr client) //winDisableUpdate(); - return (client->noClientException); + return Success; } static int @@ -345,7 +345,7 @@ ProcWindowsWMReenableUpdate (register ClientPtr client) //winEnableUpdate(); - return (client->noClientException); + return Success; } @@ -358,7 +358,7 @@ ProcWindowsWMSetFrontProcess (register ClientPtr client) //QuartzMessageMainThread(kWindowsSetFrontProcess, NULL, 0); - return (client->noClientException); + return Success; } @@ -414,7 +414,7 @@ ProcWindowsWMFrameGetRect (register ClientPtr client) #endif WriteToClient(client, sizeof(xWindowsWMFrameGetRectReply), (char *)&rep); - return (client->noClientException); + return Success; } @@ -507,7 +507,7 @@ ProcWindowsWMFrameDraw (register ClientPtr client) ErrorF ("ProcWindowsWMFrameDraw - done\n"); #endif - return (client->noClientException); + return Success; } static int @@ -566,7 +566,7 @@ ProcWindowsWMFrameSetTitle( ErrorF ("ProcWindowsWMFrameSetTitle - done\n"); #endif - return (client->noClientException); + return Success; } diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index f2b30ebaf..854353533 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -752,7 +752,7 @@ ProcRRGetCrtcInfo (ClientPtr client) free(extra); } - return client->noClientException; + return Success; } int @@ -997,7 +997,7 @@ sendReply: } WriteToClient(client, sizeof(xRRSetCrtcConfigReply), (char *)&rep); - return client->noClientException; + return Success; } int @@ -1066,7 +1066,7 @@ ProcRRGetPanning (ClientPtr client) swaps(&rep.border_bottom, n); } WriteToClient(client, sizeof(xRRGetPanningReply), (char *)&rep); - return client->noClientException; + return Success; } int @@ -1145,7 +1145,7 @@ sendReply: swaps(&rep.newTimestamp, n); } WriteToClient(client, sizeof(xRRSetPanningReply), (char *)&rep); - return client->noClientException; + return Success; } int @@ -1173,7 +1173,7 @@ ProcRRGetCrtcGammaSize (ClientPtr client) swaps (&reply.size, n); } WriteToClient (client, sizeof (xRRGetCrtcGammaSizeReply), (char *) &reply); - return client->noClientException; + return Success; } int @@ -1218,7 +1218,7 @@ ProcRRGetCrtcGamma (ClientPtr client) WriteSwappedDataToClient (client, len, extra); free(extra); } - return client->noClientException; + return Success; } int @@ -1383,5 +1383,5 @@ ProcRRGetCrtcTransform (ClientPtr client) } WriteToClient (client, sizeof (xRRGetCrtcTransformReply) + nextra, (char *) reply); free(reply); - return client->noClientException; + return Success; } diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c index ad1439d78..ebfda5717 100644 --- a/randr/rrdispatch.c +++ b/randr/rrdispatch.c @@ -65,7 +65,7 @@ ProcRRQueryVersion (ClientPtr client) swapl(&rep.minorVersion, n); } WriteToClient(client, sizeof(xRRQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } static int diff --git a/randr/rrmode.c b/randr/rrmode.c index 01511e2fd..e73d1acd8 100644 --- a/randr/rrmode.c +++ b/randr/rrmode.c @@ -320,7 +320,7 @@ ProcRRCreateMode (ClientPtr client) WriteToClient(client, sizeof(xRRCreateModeReply), (char *)&rep); /* Drop out reference to this mode */ RRModeDestroy (mode); - return client->noClientException; + return Success; } int diff --git a/randr/rroutput.c b/randr/rroutput.c index b1a5dbb6e..e9ab2b904 100644 --- a/randr/rroutput.c +++ b/randr/rroutput.c @@ -527,7 +527,7 @@ ProcRRGetOutputInfo (ClientPtr client) free(extra); } - return client->noClientException; + return Success; } static void @@ -581,7 +581,7 @@ ProcRRSetOutputPrimary(ClientPtr client) pScrPriv = rrGetScrPriv(pWin->drawable.pScreen); RRSetPrimaryOutput(pWin->drawable.pScreen, pScrPriv, output); - return client->noClientException; + return Success; } int @@ -617,5 +617,5 @@ ProcRRGetOutputPrimary(ClientPtr client) WriteToClient(client, sizeof(xRRGetOutputPrimaryReply), &rep); - return client->noClientException; + return Success; } diff --git a/randr/rrproperty.c b/randr/rrproperty.c index 5fc04a9ea..ff0bca014 100644 --- a/randr/rrproperty.c +++ b/randr/rrproperty.c @@ -447,7 +447,7 @@ ProcRRListOutputProperties (ClientPtr client) WriteSwappedDataToClient(client, numProps * sizeof(Atom), pAtoms); free(pAtoms); } - return(client->noClientException); + return Success; } int @@ -493,7 +493,7 @@ ProcRRQueryOutputProperty (ClientPtr client) extra); free(extra); } - return(client->noClientException); + return Success; } int @@ -566,7 +566,7 @@ ProcRRChangeOutputProperty (ClientPtr client) if (err != Success) return err; else - return client->noClientException; + return Success; } int @@ -587,7 +587,7 @@ ProcRRDeleteOutputProperty (ClientPtr client) RRDeleteOutputProperty(output, stuff->property); - return client->noClientException; + return Success; } int @@ -646,7 +646,7 @@ ProcRRGetOutputProperty (ClientPtr client) swapl(&reply.nItems, n); } WriteToClient(client, sizeof(xRRGetOutputPropertyReply), &reply); - return(client->noClientException); + return Success; } if (prop->immutable && stuff->delete) @@ -678,7 +678,7 @@ ProcRRGetOutputProperty (ClientPtr client) swapl(&reply.nItems, n); } WriteToClient(client, sizeof(xRRGetOutputPropertyReply), &reply); - return(client->noClientException); + return Success; } /* @@ -753,6 +753,6 @@ ProcRRGetOutputProperty (ClientPtr client) *prev = prop->next; RRDestroyOutputProperty (prop); } - return(client->noClientException); + return Success; } diff --git a/randr/rrscreen.c b/randr/rrscreen.c index c372d4669..051d51410 100644 --- a/randr/rrscreen.c +++ b/randr/rrscreen.c @@ -244,7 +244,7 @@ ProcRRGetScreenSizeRange (ClientPtr client) swaps(&rep.maxHeight, n); } WriteToClient(client, sizeof(xRRGetScreenSizeRangeReply), (char *)&rep); - return (client->noClientException); + return Success; } int @@ -470,7 +470,7 @@ rrGetScreenResources(ClientPtr client, Bool query) WriteToClient (client, extraLen, (char *) extra); free(extra); } - return client->noClientException; + return Success; } int @@ -740,7 +740,7 @@ ProcRRGetScreenInfo (ClientPtr client) WriteToClient (client, extraLen, (char *) extra); free(extra); } - return (client->noClientException); + return Success; } int @@ -975,7 +975,7 @@ sendReply: } WriteToClient(client, sizeof(xRRSetScreenConfigReply), (char *)&rep); - return (client->noClientException); + return Success; } static CARD16 diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c index 94c8e54e5..457b2b40f 100644 --- a/randr/rrxinerama.c +++ b/randr/rrxinerama.c @@ -105,7 +105,7 @@ ProcRRXineramaQueryVersion(ClientPtr client) swaps(&rep.minorVersion, n); } WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } int @@ -143,7 +143,7 @@ ProcRRXineramaGetState(ClientPtr client) swapl (&rep.window, n); } WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep); - return client->noClientException; + return Success; } static Bool @@ -198,7 +198,7 @@ ProcRRXineramaGetScreenCount(ClientPtr client) swapl(&rep.window, n); } WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep); - return client->noClientException; + return Success; } int @@ -234,7 +234,7 @@ ProcRRXineramaGetScreenSize(ClientPtr client) swapl(&rep.screen, n); } WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep); - return client->noClientException; + return Success; } int @@ -256,7 +256,7 @@ ProcRRXineramaIsActive(ClientPtr client) swapl(&rep.state, n); } WriteToClient(client, sizeof(xXineramaIsActiveReply), (char *) &rep); - return client->noClientException; + return Success; } static void @@ -341,7 +341,7 @@ ProcRRXineramaQueryScreens(ClientPtr client) } } - return client->noClientException; + return Success; } static int diff --git a/record/record.c b/record/record.c index 930374001..1b55d6bf0 100644 --- a/record/record.c +++ b/record/record.c @@ -1903,7 +1903,7 @@ ProcRecordQueryVersion(ClientPtr client) } (void)WriteToClient(client, sizeof(xRecordQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } /* ProcRecordQueryVersion */ @@ -2347,7 +2347,7 @@ ProcRecordGetContext(ClientPtr client) (char *)pri->pRanges); } } - err = client->noClientException; + err = Success; bailout: for (i = 0; i < nRCAPs; i++) diff --git a/render/render.c b/render/render.c index c9d3e8e8c..bba1ce1e6 100644 --- a/render/render.c +++ b/render/render.c @@ -290,7 +290,7 @@ ProcRenderQueryVersion (ClientPtr client) swapl(&rep.minorVersion, n); } WriteToClient(client, sizeof(xRenderQueryVersionReply), (char *)&rep); - return (client->noClientException); + return Success; } static VisualPtr @@ -513,7 +513,7 @@ ProcRenderQueryPictFormats (ClientPtr client) } WriteToClient(client, rlength, (char *) reply); free(reply); - return client->noClientException; + return Success; } static int @@ -572,7 +572,7 @@ ProcRenderQueryPictIndexValues (ClientPtr client) WriteToClient(client, rlength, (char *) reply); free(reply); - return (client->noClientException); + return Success; } static int @@ -647,7 +647,6 @@ ProcRenderSetPictureClipRectangles (ClientPtr client) REQUEST(xRenderSetPictureClipRectanglesReq); PicturePtr pPicture; int nr; - int result; REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq); VERIFY_PICTURE (pPicture, stuff->picture, client, DixSetAttrAccess); @@ -658,13 +657,9 @@ ProcRenderSetPictureClipRectangles (ClientPtr client) if (nr & 4) return BadLength; nr >>= 3; - result = SetPictureClipRects (pPicture, + return SetPictureClipRects (pPicture, stuff->xOrigin, stuff->yOrigin, nr, (xRectangle *) &stuff[1]); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); } static int @@ -677,7 +672,7 @@ ProcRenderFreePicture (ClientPtr client) VERIFY_PICTURE (pPicture, stuff->picture, client, DixDestroyAccess); FreeResource (stuff->picture, RT_NONE); - return(client->noClientException); + return Success; } static Bool @@ -772,7 +767,7 @@ ProcRenderTrapezoids (ClientPtr client) CompositeTrapezoids (stuff->op, pSrc, pDst, pFormat, stuff->xSrc, stuff->ySrc, ntraps, (xTrapezoid *) &stuff[1]); - return client->noClientException; + return Success; } static int @@ -812,7 +807,7 @@ ProcRenderTriangles (ClientPtr client) CompositeTriangles (stuff->op, pSrc, pDst, pFormat, stuff->xSrc, stuff->ySrc, ntris, (xTriangle *) &stuff[1]); - return client->noClientException; + return Success; } static int @@ -852,7 +847,7 @@ ProcRenderTriStrip (ClientPtr client) CompositeTriStrip (stuff->op, pSrc, pDst, pFormat, stuff->xSrc, stuff->ySrc, npoints, (xPointFixed *) &stuff[1]); - return client->noClientException; + return Success; } static int @@ -892,7 +887,7 @@ ProcRenderTriFan (ClientPtr client) CompositeTriFan (stuff->op, pSrc, pDst, pFormat, stuff->xSrc, stuff->ySrc, npoints, (xPointFixed *) &stuff[1]); - return client->noClientException; + return Success; } static int @@ -984,7 +979,7 @@ ProcRenderReferenceGlyphSet (ClientPtr client) glyphSet->refcnt++; if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet)) return BadAlloc; - return client->noClientException; + return Success; } #define NLOCALDELTA 64 @@ -1006,7 +1001,7 @@ ProcRenderFreeGlyphSet (ClientPtr client) return (rc == BadValue) ? RenderErrBase + BadGlyphSet : rc; } FreeResource (stuff->glyphset, RT_NONE); - return client->noClientException; + return Success; } typedef struct _GlyphNew { @@ -1201,7 +1196,7 @@ ProcRenderAddGlyphs (ClientPtr client) if (glyphsBase != glyphsLocal) free(glyphsBase); - return client->noClientException; + return Success; bail: if (pSrc) FreePicture ((pointer) pSrc, 0); @@ -1249,7 +1244,7 @@ ProcRenderFreeGlyphs (ClientPtr client) return RenderErrBase + BadGlyph; } } - return client->noClientException; + return Success; } static int @@ -1426,7 +1421,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) if (listsBase != listsLocal) free(listsBase); - return client->noClientException; + return Success; } static int @@ -1457,7 +1452,7 @@ ProcRenderFillRectangles (ClientPtr client) things, (xRectangle *) &stuff[1]); - return client->noClientException; + return Success; } static void @@ -1682,7 +1677,7 @@ ProcRenderCreateCursor (ClientPtr client) if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor)) return BadAlloc; - return client->noClientException; + return Success; } static int @@ -1690,15 +1685,10 @@ ProcRenderSetPictureTransform (ClientPtr client) { REQUEST(xRenderSetPictureTransformReq); PicturePtr pPicture; - int result; REQUEST_SIZE_MATCH(xRenderSetPictureTransformReq); VERIFY_PICTURE (pPicture, stuff->picture, client, DixSetAttrAccess); - result = SetPictureTransform (pPicture, (PictTransform *) &stuff->transform); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); + return SetPictureTransform (pPicture, (PictTransform *) &stuff->transform); } static int @@ -1808,7 +1798,7 @@ ProcRenderQueryFilters (ClientPtr client) WriteToClient(client, total_bytes, (char *) reply); free(reply); - return(client->noClientException); + return Success; } static int @@ -1871,7 +1861,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) return ret; if (AddResource (stuff->cid, RT_CURSOR, (pointer)pCursor)) - return client->noClientException; + return Success; return BadAlloc; } @@ -1894,7 +1884,7 @@ ProcRenderAddTraps (ClientPtr client) AddTraps (pPicture, stuff->xOff, stuff->yOff, ntraps, (xTrap *) &stuff[1]); - return client->noClientException; + return Success; } static int ProcRenderCreateSolidFill(ClientPtr client) diff --git a/xfixes/cursor.c b/xfixes/cursor.c index b7e6c7b8c..d5f8b290b 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -424,7 +424,7 @@ ProcXFixesGetCursorImage (ClientPtr client) WriteToClient(client, sizeof (xXFixesGetCursorImageReply) + (npixels << 2), (char *) rep); free(rep); - return client->noClientException; + return Success; } int @@ -452,7 +452,7 @@ ProcXFixesSetCursorName (ClientPtr client) return BadAlloc; pCursor->name = atom; - return(client->noClientException); + return Success; } int @@ -501,7 +501,7 @@ ProcXFixesGetCursorName (ClientPtr client) WriteReplyToClient(client, sizeof(xXFixesGetCursorNameReply), &reply); WriteToClient(client, len, str); - return(client->noClientException); + return Success; } int @@ -584,7 +584,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client) WriteToClient(client, sizeof (xXFixesGetCursorImageAndNameReply) + (npixels << 2) + nbytesRound, (char *) rep); free(rep); - return client->noClientException; + return Success; } int @@ -719,7 +719,7 @@ ProcXFixesChangeCursor (ClientPtr client) DixWriteAccess|DixSetAttrAccess); ReplaceCursor (pSource, TestForCursor, (pointer) pDestination); - return (client->noClientException); + return Success; } int @@ -757,7 +757,7 @@ ProcXFixesChangeCursorByName (ClientPtr client) name = MakeAtom (tchar, stuff->nbytes, FALSE); if (name) ReplaceCursor (pSource, TestForCursorName, &name); - return (client->noClientException); + return Success; } int @@ -895,7 +895,7 @@ ProcXFixesHideCursor (ClientPtr client) pChc = findCursorHideCount(client, pWin->drawable.pScreen); if (pChc != NULL) { pChc->hideCount++; - return client->noClientException; + return Success; } /* @@ -969,7 +969,7 @@ ProcXFixesShowCursor (ClientPtr client) FreeResource(pChc->resource, 0); } - return (client->noClientException); + return Success; } int diff --git a/xfixes/region.c b/xfixes/region.c index d5f583f1b..5f0c2c432 100644 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -87,7 +87,7 @@ ProcXFixesCreateRegion (ClientPtr client) if (!AddResource (stuff->region, RegionResType, (pointer) pRegion)) return BadAlloc; - return(client->noClientException); + return Success; } int @@ -132,7 +132,7 @@ ProcXFixesCreateRegionFromBitmap (ClientPtr client) if (!AddResource (stuff->region, RegionResType, (pointer) pRegion)) return BadAlloc; - return(client->noClientException); + return Success; } int @@ -194,7 +194,7 @@ ProcXFixesCreateRegionFromWindow (ClientPtr client) if (!AddResource (stuff->region, RegionResType, (pointer) pRegion)) return BadAlloc; - return(client->noClientException); + return Success; } int @@ -244,7 +244,7 @@ ProcXFixesCreateRegionFromGC (ClientPtr client) if (!AddResource (stuff->region, RegionResType, (pointer) pRegion)) return BadAlloc; - return(client->noClientException); + return Success; } int @@ -291,7 +291,7 @@ ProcXFixesCreateRegionFromPicture (ClientPtr client) if (!AddResource (stuff->region, RegionResType, (pointer) pRegion)) return BadAlloc; - return(client->noClientException); + return Success; } int @@ -316,7 +316,7 @@ ProcXFixesDestroyRegion (ClientPtr client) REQUEST_SIZE_MATCH(xXFixesDestroyRegionReq); VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess); FreeResource (stuff->region, RT_NONE); - return(client->noClientException); + return Success; } int @@ -355,7 +355,7 @@ ProcXFixesSetRegion (ClientPtr client) return BadAlloc; } REGION_DESTROY (0, pNew); - return(client->noClientException); + return Success; } int @@ -383,7 +383,7 @@ ProcXFixesCopyRegion (ClientPtr client) if (!REGION_COPY(pScreen, pDestination, pSource)) return BadAlloc; - return(client->noClientException); + return Success; } int @@ -403,7 +403,6 @@ int ProcXFixesCombineRegion (ClientPtr client) { RegionPtr pSource1, pSource2, pDestination; - int ret = Success; REQUEST (xXFixesCombineRegionReq); REQUEST_SIZE_MATCH (xXFixesCombineRegionReq); @@ -414,21 +413,19 @@ ProcXFixesCombineRegion (ClientPtr client) switch (stuff->xfixesReqType) { case X_XFixesUnionRegion: if (!REGION_UNION (0, pDestination, pSource1, pSource2)) - ret = BadAlloc; + return BadAlloc; break; case X_XFixesIntersectRegion: if (!REGION_INTERSECT (0, pDestination, pSource1, pSource2)) - ret = BadAlloc; + return BadAlloc; break; case X_XFixesSubtractRegion: if (!REGION_SUBTRACT (0, pDestination, pSource1, pSource2)) - ret = BadAlloc; + return BadAlloc; break; } - if (ret == Success) - ret = client->noClientException; - return ret; + return Success; } int @@ -450,7 +447,6 @@ ProcXFixesInvertRegion (ClientPtr client) { RegionPtr pSource, pDestination; BoxRec bounds; - int ret = Success; REQUEST(xXFixesInvertRegionReq); REQUEST_SIZE_MATCH(xXFixesInvertRegionReq); @@ -471,11 +467,9 @@ ProcXFixesInvertRegion (ClientPtr client) bounds.y2 = stuff->y + stuff->height; if (!REGION_INVERSE(0, pDestination, pSource, &bounds)) - ret = BadAlloc; + return BadAlloc; - if (ret == Success) - ret = client->noClientException; - return ret; + return Success; } int @@ -505,7 +499,7 @@ ProcXFixesTranslateRegion (ClientPtr client) VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess); REGION_TRANSLATE(pScreen, pRegion, stuff->dx, stuff->dy); - return (client->noClientException); + return Success; } int @@ -534,7 +528,7 @@ ProcXFixesRegionExtents (ClientPtr client) REGION_RESET (0, pDestination, REGION_EXTENTS (0, pSource)); - return (client->noClientException); + return Success; } int @@ -602,7 +596,7 @@ ProcXFixesFetchRegion (ClientPtr client) (void) WriteToClient(client, sizeof (xXFixesFetchRegionReply) + nBox * sizeof (xRectangle), (char *) reply); free(reply); - return (client->noClientException); + return Success; } int @@ -645,7 +639,7 @@ ProcXFixesSetGCClipRegion (ClientPtr client) ChangeGC (NullClient, pGC, GCClipXOrigin|GCClipYOrigin, vals); (*pGC->funcs->ChangeClip)(pGC, pRegion ? CT_REGION : CT_NONE, (pointer)pRegion, 0); - return (client->noClientException); + return Success; } int @@ -741,7 +735,7 @@ ProcXFixesSetWindowShapeRegion (ClientPtr client) *pDestRegion = pRegion; (*pScreen->SetShape) (pWin); SendShapeNotify (pWin, stuff->destKind); - return (client->noClientException); + return Success; } int @@ -797,7 +791,6 @@ int ProcXFixesExpandRegion (ClientPtr client) { RegionPtr pSource, pDestination; - int ret = Success; REQUEST (xXFixesExpandRegionReq); BoxPtr pTmp; BoxPtr pSrc; @@ -831,9 +824,7 @@ ProcXFixesExpandRegion (ClientPtr client) } free(pTmp); } - if (ret == Success) - ret = client->noClientException; - return ret; + return Success; } int diff --git a/xfixes/saveset.c b/xfixes/saveset.c index 29de0d8f2..3c0504f7f 100644 --- a/xfixes/saveset.c +++ b/xfixes/saveset.c @@ -57,11 +57,7 @@ ProcXFixesChangeSaveSet(ClientPtr client) } toRoot = (stuff->target == SaveSetRoot); map = (stuff->map == SaveSetMap); - result = AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, map); - if (client->noClientException != Success) - return(client->noClientException); - else - return(result); + return AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, map); } int diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index 5163dc11e..49ed5a0d5 100644 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -92,7 +92,7 @@ ProcXFixesQueryVersion(ClientPtr client) swapl(&rep.minorVersion, n); } WriteToClient(client, sizeof(xXFixesQueryVersionReply), (char *)&rep); - return(client->noClientException); + return Success; } /* Major version controls available requests */ @@ -194,7 +194,7 @@ ProcXkbUseExtension(ClientPtr client) swaps(&rep.serverMinor, n); } WriteToClient(client,SIZEOF(xkbUseExtensionReply), (char *)&rep); - return client->noClientException; + return Success; } /***====================================================================***/ @@ -219,7 +219,7 @@ ProcXkbSelectEvents(ClientPtr client) client->mapNotifyMask|= (stuff->affectMap&stuff->map); } if ((stuff->affectWhich&(~XkbMapNotifyMask))==0) - return client->noClientException; + return Success; masks = XkbFindClientResource((DevicePtr)dev,client); if (!masks){ @@ -343,7 +343,7 @@ ProcXkbSelectEvents(ClientPtr client) ErrorF("[xkb] Extra data (%d bytes) after SelectEvents\n",dataLeft); return BadLength; } - return client->noClientException; + return Success; } return BadAlloc; } @@ -578,7 +578,7 @@ ProcXkbGetState(ClientPtr client) swaps(&rep.ptrBtnState,n); } WriteToClient(client, SIZEOF(xkbGetStateReply), (char *)&rep); - return client->noClientException; + return Success; } /***====================================================================***/ @@ -646,7 +646,7 @@ ProcXkbLatchLockState(ClientPtr client) } } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -722,7 +722,7 @@ ProcXkbGetControls(ClientPtr client) swaps(&rep.axOptions, n); } WriteToClient(client, SIZEOF(xkbGetControlsReply), (char *)&rep); - return(client->noClientException); + return Success; } int @@ -942,7 +942,7 @@ ProcXkbSetControls(ClientPtr client) } } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -1406,7 +1406,7 @@ char *desc,*start; WriteToClient(client, (i=SIZEOF(xkbGetMapReply)), (char *)rep); WriteToClient(client, len, start); free((char *)start); - return client->noClientException; + return Success; } int @@ -2594,7 +2594,7 @@ ProcXkbSetMap(ClientPtr client) } } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -2682,7 +2682,7 @@ int size; WriteToClient(client, size, data); free((char *)data); } - return client->noClientException; + return Success; } int @@ -2923,7 +2923,7 @@ ProcXkbSetCompatMap(ClientPtr client) } } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -2960,7 +2960,7 @@ ProcXkbGetIndicatorState(ClientPtr client) swapl(&rep.state,i); } WriteToClient(client, SIZEOF(xkbGetIndicatorStateReply), (char *)&rep); - return client->noClientException; + return Success; } /***====================================================================***/ @@ -3036,7 +3036,7 @@ register unsigned bit; WriteToClient(client, length, (char *)map); free((char *)map); } - return client->noClientException; + return Success; } int @@ -3130,7 +3130,7 @@ ProcXkbSetIndicatorMap(ClientPtr client) CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess); if (stuff->which==0) - return client->noClientException; + return Success; for (nIndicators=i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) { if (stuff->which&bit) @@ -3257,7 +3257,7 @@ ProcXkbGetNamedIndicator(ClientPtr client) } WriteToClient(client,SIZEOF(xkbGetNamedIndicatorReply), (char *)&rep); - return client->noClientException; + return Success; } @@ -3467,7 +3467,7 @@ ProcXkbSetNamedIndicator(ClientPtr client) } } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -3757,7 +3757,7 @@ register int n; WriteToClient(client, SIZEOF(xkbGetNamesReply), (char *)rep); WriteToClient(client, length, start); free((char *)start); - return client->noClientException; + return Success; } int @@ -4286,7 +4286,7 @@ ProcXkbSetNames(ClientPtr client) /* everything is okay -- update names */ - return client->noClientException; + return Success; } /***====================================================================***/ @@ -4787,7 +4787,7 @@ XkbSendGeometry( ClientPtr client, free((char *)start); if (freeGeom) XkbFreeGeometry(geom,XkbGeomAllMask,TRUE); - return client->noClientException; + return Success; } int @@ -5414,7 +5414,7 @@ ProcXkbPerClientFlags(ClientPtr client) swapl(&rep.autoCtrlValues,n); } WriteToClient(client,SIZEOF(xkbPerClientFlagsReply), (char *)&rep); - return client->noClientException; + return Success; } /***====================================================================***/ @@ -5548,7 +5548,7 @@ ProcXkbListComponents(ClientPtr client) free(list.pool); list.pool= NULL; } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -5891,7 +5891,7 @@ ProcXkbGetKbdByName(ClientPtr client) if (names.compat) { free(names.compat); names.compat= NULL; } if (names.symbols) { free(names.symbols); names.symbols= NULL; } if (names.geometry) { free(names.geometry); names.geometry= NULL; } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -6231,7 +6231,7 @@ char * str; ErrorF("[xkb] Wrote %d fewer bytes than expected\n",length); return BadLength; } - return client->noClientException; + return Success; } static char * @@ -6556,7 +6556,7 @@ ProcXkbSetDeviceInfo(ClientPtr client) } } - return client->noClientException; + return Success; } /***====================================================================***/ @@ -6619,7 +6619,7 @@ int rc; swapl(&rep.supportedCtrls, n); } WriteToClient(client,SIZEOF(xkbSetDebuggingFlagsReply), (char *)&rep); - return client->noClientException; + return Success; } /***====================================================================***/ |