summaryrefslogtreecommitdiff
path: root/randr
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-10 20:22:05 -0700
committerJamey Sharp <jamey@minilop.net>2010-05-13 17:14:07 -0700
commit92ed75ac59e2d3af149cddb962efd05fc8487750 (patch)
treec05f3b03627ebd67a921fcec5cef3655083bb345 /randr
parent11c69880c7c48ef9e755c4e09fadef7a629d7bc7 (diff)
Eliminate boilerplate around client->noClientException.
Just let Dispatch() check for a noClientException, rather than making every single dispatch procedure take care of it. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'randr')
-rw-r--r--randr/rrcrtc.c14
-rw-r--r--randr/rrdispatch.c2
-rw-r--r--randr/rrmode.c2
-rw-r--r--randr/rroutput.c6
-rw-r--r--randr/rrproperty.c14
-rw-r--r--randr/rrscreen.c8
-rw-r--r--randr/rrxinerama.c12
7 files changed, 29 insertions, 29 deletions
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