diff options
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/panoramiXprocs.c | 2 | ||||
| -rw-r--r-- | Xext/saver.c | 4 | ||||
| -rw-r--r-- | Xext/shape.c | 2 | ||||
| -rw-r--r-- | Xext/xtest.c | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index a1816958f..dbaae26c4 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -457,7 +457,7 @@ int PanoramiXConfigureWindow(ClientPtr client) result = dixLookupResourceByType((pointer *)&pWin, stuff->window, RT_WINDOW, client, DixWriteAccess); if (result != Success) - return (result == BadValue) ? BadWindow : result; + return result; result = dixLookupResourceByType((pointer *)&win, stuff->window, XRT_WINDOW, client, DixWriteAccess); diff --git a/Xext/saver.c b/Xext/saver.c index 30c4a8c9b..63a41d6d7 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1043,7 +1043,6 @@ ScreenSaverSetAttributes (ClientPtr client) } else { - ret = (ret == BadValue) ? BadPixmap : ret; client->errorValue = pixID; goto PatchUp; } @@ -1081,7 +1080,6 @@ ScreenSaverSetAttributes (ClientPtr client) } else { - ret = (ret == BadValue) ? BadPixmap : ret; client->errorValue = pixID; goto PatchUp; } @@ -1163,7 +1161,6 @@ ScreenSaverSetAttributes (ClientPtr client) client, DixUseAccess); if (ret != Success) { - ret = (ret == BadValue) ? BadColor : ret; client->errorValue = cmap; goto PatchUp; } @@ -1187,7 +1184,6 @@ ScreenSaverSetAttributes (ClientPtr client) RT_CURSOR, client, DixUseAccess); if (ret != Success) { - ret = (ret == BadValue) ? BadCursor : ret; client->errorValue = cursorID; goto PatchUp; } diff --git a/Xext/shape.c b/Xext/shape.c index 10ac2839c..f49e9a02b 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -415,7 +415,7 @@ ProcShapeMask (ClientPtr client) rc = dixLookupResourceByType((pointer *)&pPixmap, stuff->src, RT_PIXMAP, client, DixReadAccess); if (rc != Success) - return (rc == BadValue) ? BadPixmap : rc; + return rc; if (pPixmap->drawable.pScreen != pScreen || pPixmap->drawable.depth != 1) return BadMatch; diff --git a/Xext/xtest.c b/Xext/xtest.c index 09c4677a2..263d0c16a 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -153,7 +153,7 @@ ProcXTestCompareCursor(ClientPtr client) if (rc != Success) { client->errorValue = stuff->cursor; - return (rc == BadValue) ? BadCursor : rc; + return rc; } } rep.type = X_Reply; |