summaryrefslogtreecommitdiff
path: root/dix/dispatch.c
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-08 19:18:11 -0700
committerJamey Sharp <jamey@minilop.net>2010-05-13 17:14:07 -0700
commit653e4878c4cc03613172a93ad4800e1eacc98f17 (patch)
tree48d808696b061f8f662bce7b0d29d51e34f6b968 /dix/dispatch.c
parent5193f25ea33eed31d6a75cdc1a86427c23d8033c (diff)
Quit using clientErrorValue in dix/gc.c.
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'dix/dispatch.c')
-rw-r--r--dix/dispatch.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c
index d6a8a5aaf..fddfb709c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1541,10 +1541,7 @@ ProcChangeGC(ClientPtr client)
if (client->noClientException != Success)
return(client->noClientException);
else
- {
- client->errorValue = clientErrorValue;
return(result);
- }
}
int
@@ -1564,14 +1561,16 @@ ProcCopyGC(ClientPtr client)
return result;
if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth))
return (BadMatch);
+ if (stuff->mask & ~GCAllBits)
+ {
+ client->errorValue = stuff->mask;
+ return BadValue;
+ }
result = CopyGC(pGC, dstGC, stuff->mask);
if (client->noClientException != Success)
return(client->noClientException);
else
- {
- client->errorValue = clientErrorValue;
return(result);
- }
}
int
@@ -1598,7 +1597,9 @@ ProcSetDashes(ClientPtr client)
return(client->noClientException);
else
{
- client->errorValue = clientErrorValue;
+ /* If there's an error, either there's no sensible errorValue,
+ * or there was a dash segment of 0. */
+ client->errorValue = 0;
return(result);
}
}