summaryrefslogtreecommitdiff
path: root/Xext/xf86bigfont.c
diff options
context:
space:
mode:
Diffstat (limited to 'Xext/xf86bigfont.c')
-rw-r--r--Xext/xf86bigfont.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index b20e82d6e..779f3b940 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -86,10 +86,6 @@ static DISPATCH_PROC(SProcXF86BigfontDispatch);
static DISPATCH_PROC(SProcXF86BigfontQueryVersion);
static DISPATCH_PROC(SProcXF86BigfontQueryFont);
-#if 0
-static unsigned char XF86BigfontReqCode;
-#endif
-
#ifdef HAS_SHM
/* A random signature, transmitted to the clients so they can verify that the
@@ -149,18 +145,6 @@ CheckForShmSyscall(void)
void
XFree86BigfontExtensionInit()
{
-#if 0
- ExtensionEntry* extEntry;
-
- if ((extEntry = AddExtension(XF86BIGFONTNAME,
- XF86BigfontNumberEvents,
- XF86BigfontNumberErrors,
- ProcXF86BigfontDispatch,
- SProcXF86BigfontDispatch,
- XF86BigfontResetProc,
- StandardMinorOpcode))) {
- XF86BigfontReqCode = (unsigned char) extEntry->base;
-#else
if (AddExtension(XF86BIGFONTNAME,
XF86BigfontNumberEvents,
XF86BigfontNumberErrors,
@@ -168,7 +152,6 @@ XFree86BigfontExtensionInit()
SProcXF86BigfontDispatch,
XF86BigfontResetProc,
StandardMinorOpcode)) {
-#endif
#ifdef HAS_SHM
#ifdef MUST_CHECK_FOR_SHM_SYSCALL
/*
@@ -445,10 +428,10 @@ ProcXF86BigfontQueryFont(
#endif
client->errorValue = stuff->id; /* EITHER font or gc */
pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT,
- DixReadAccess);
+ DixGetAttrAccess);
if (!pFont) {
GC *pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC,
- DixReadAccess);
+ DixGetAttrAccess);
if (!pGC) {
client->errorValue = stuff->id;
return BadFont; /* procotol spec says only error is BadFont */