frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quit using clientErrorValue in dix/gc.c. 

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Jamey Sharp 2010-05-08 19:18:11 -07:00
parent 5193f25ea3
commit 653e4878c4
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dix/dispatch.c
View File

@ -1541,10 +1541,7 @@ ProcChangeGC(ClientPtr client)
if (client->noClientException != Success) if (client->noClientException != Success)
return(client->noClientException); return(client->noClientException);
else else
{
client->errorValue = clientErrorValue;
return(result); return(result);
}
} }
int int
@ -1564,14 +1561,16 @@ ProcCopyGC(ClientPtr client)
return result; return result;
if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth)) if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth))
return (BadMatch); return (BadMatch);
if (stuff->mask & ~GCAllBits)
{
client->errorValue = stuff->mask;
return BadValue;
}
result = CopyGC(pGC, dstGC, stuff->mask); result = CopyGC(pGC, dstGC, stuff->mask);
if (client->noClientException != Success) if (client->noClientException != Success)
return(client->noClientException); return(client->noClientException);
else else
{
client->errorValue = clientErrorValue;
return(result); return(result);
}
} }
int int
@ -1598,7 +1597,9 @@ ProcSetDashes(ClientPtr client)
return(client->noClientException); return(client->noClientException);
else 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); return(result);
} }
} }

43
dix/gc.c
View File

@ -66,7 +66,6 @@ SOFTWARE.
#include "xace.h" #include "xace.h"
#include <assert.h> #include <assert.h>
extern XID clientErrorValue;
extern FontPtr defaultFont; extern FontPtr defaultFont;
static Bool CreateDefaultTile(GCPtr pGC); static Bool CreateDefaultTile(GCPtr pGC);
@ -149,7 +148,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->alu = newalu; pGC->alu = newalu;
else else
{ {
clientErrorValue = newalu; if (client)
client->errorValue = newalu;
error = BadValue; error = BadValue;
} }
break; break;
@ -182,7 +182,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->lineStyle = newlinestyle; pGC->lineStyle = newlinestyle;
else else
{ {
clientErrorValue = newlinestyle; if (client)
client->errorValue = newlinestyle;
error = BadValue; error = BadValue;
} }
break; break;
@ -195,7 +196,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->capStyle = newcapstyle; pGC->capStyle = newcapstyle;
else else
{ {
clientErrorValue = newcapstyle; if (client)
client->errorValue = newcapstyle;
error = BadValue; error = BadValue;
} }
break; break;
@ -208,7 +210,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->joinStyle = newjoinstyle; pGC->joinStyle = newjoinstyle;
else else
{ {
clientErrorValue = newjoinstyle; if (client)
client->errorValue = newjoinstyle;
error = BadValue; error = BadValue;
} }
break; break;
@ -221,7 +224,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->fillStyle = newfillstyle; pGC->fillStyle = newfillstyle;
else else
{ {
clientErrorValue = newfillstyle; if (client)
client->errorValue = newfillstyle;
error = BadValue; error = BadValue;
} }
break; break;
@ -234,7 +238,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->fillRule = newfillrule; pGC->fillRule = newfillrule;
else else
{ {
clientErrorValue = newfillrule; if (client)
client->errorValue = newfillrule;
error = BadValue; error = BadValue;
} }
break; break;
@ -294,7 +299,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->subWindowMode = newclipmode; pGC->subWindowMode = newclipmode;
else else
{ {
clientErrorValue = newclipmode; if (client)
client->errorValue = newclipmode;
error = BadValue; error = BadValue;
} }
break; break;
@ -307,7 +313,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->graphicsExposures = newge; pGC->graphicsExposures = newge;
else else
{ {
clientErrorValue = newge; if (client)
client->errorValue = newge;
error = BadValue; error = BadValue;
} }
break; break;
@ -368,7 +375,8 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
} }
else else
{ {
clientErrorValue = newdash; if (client)
client->errorValue = newdash;
error = BadValue; error = BadValue;
} }
break; break;
@ -381,13 +389,15 @@ ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
pGC->arcMode = newarcmode; pGC->arcMode = newarcmode;
else else
{ {
clientErrorValue = newarcmode; if (client)
client->errorValue = newarcmode;
error = BadValue; error = BadValue;
} }
break; break;
} }
default: default:
clientErrorValue = maskQ; if (client)
client->errorValue = maskQ;
error = BadValue; error = BadValue;
break; break;
} }
@ -426,7 +436,7 @@ ChangeGCXIDs(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32)
int i; int i;
if (mask & ~GCAllBits) if (mask & ~GCAllBits)
{ {
clientErrorValue = mask; client->errorValue = mask;
return BadValue; return BadValue;
} }
for (i = Ones(mask); i; --i) for (i = Ones(mask); i; --i)
@ -446,7 +456,7 @@ ChangeGCXIDs(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32)
xidfields[i].type, client, xidfields[i].access_mode); xidfields[i].type, client, xidfields[i].access_mode);
if (rc != Success) if (rc != Success)
{ {
clientErrorValue = vals[offset].val; client->errorValue = vals[offset].val;
if (rc == BadValue) if (rc == BadValue)
rc = (xidfields[i].type == RT_PIXMAP) ? BadPixmap : BadFont; rc = (xidfields[i].type == RT_PIXMAP) ? BadPixmap : BadFont;
return rc; return rc;
@ -737,9 +747,7 @@ CopyGC(GC *pgcSrc, GC *pgcDst, BITS32 mask)
pgcDst->arcMode = pgcSrc->arcMode; pgcDst->arcMode = pgcSrc->arcMode;
break; break;
default: default:
clientErrorValue = maskQ; FatalError ("CopyGC: Unhandled mask!\n");
error = BadValue;
break;
} }
} }
if (pgcDst->fillStyle == FillTiled && pgcDst->tileIsPixel) if (pgcDst->fillStyle == FillTiled && pgcDst->tileIsPixel)
@ -955,7 +963,6 @@ SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
if (!*p++) if (!*p++)
{ {
/* dash segment must be > 0 */ /* dash segment must be > 0 */
clientErrorValue = 0;
return BadValue; return BadValue;
} }
} }