aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-23 10:42:19 +0000
committermarha <marha@users.sourceforge.net>2010-05-23 10:42:19 +0000
commit77f85e3c78dda5d9c3db617426f929144890c03f (patch)
tree859e5cdda5ba4b7a53a6c51e0c824a4fb4fa46ae /xorg-server/dix
parent8b1228fdd95f63ae5ed6f80597eafc973fc5bf57 (diff)
parent23e2ddeb0f81d5ee9c6d01cf0b768eeb1c27555c (diff)
downloadvcxsrv-77f85e3c78dda5d9c3db617426f929144890c03f.tar.gz
vcxsrv-77f85e3c78dda5d9c3db617426f929144890c03f.tar.bz2
vcxsrv-77f85e3c78dda5d9c3db617426f929144890c03f.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix')
-rw-r--r--xorg-server/dix/dixfonts.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index 467be355f..431b3ef6f 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1175,7 +1175,6 @@ int
doPolyText(ClientPtr client, PTclosurePtr c)
{
FontPtr pFont = c->pGC->font, oldpFont;
- Font fid, oldfid;
int err = Success, lgerr; /* err is in X error, not font error, space */
enum { NEVER_SLEPT, START_SLEEP, SLEEPING } client_state = NEVER_SLEPT;
FontPathElementPtr fpe;
@@ -1223,6 +1222,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
{
if (*c->pElt == FontChange)
{
+ Font fid;
if (c->endReq - c->pElt < FontShiftSize)
{
err = BadLength;
@@ -1230,7 +1230,6 @@ doPolyText(ClientPtr client, PTclosurePtr c)
}
oldpFont = pFont;
- oldfid = fid;
fid = ((Font)*(c->pElt+4)) /* big-endian */
| ((Font)*(c->pElt+3)) << 8
@@ -1240,9 +1239,8 @@ doPolyText(ClientPtr client, PTclosurePtr c)
client, DixUseAccess);
if (err != Success)
{
- /* restore pFont and fid for step 4 (described below) */
+ /* restore pFont for step 4 (described below) */
pFont = oldpFont;
- fid = oldfid;
/* If we're in START_SLEEP mode, the following step
shortens the request... in the unlikely event that