From 8e9e77665efb1ca232e661b99df2227ac0360e20 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 May 2019 15:01:00 +0200 Subject: NXextension.c: use ProcQueryExtension() from dix --- nx-X11/programs/Xserver/dix/extension.c | 2 +- nx-X11/programs/Xserver/hw/nxagent/NXextension.c | 40 ------------------------ 2 files changed, 1 insertion(+), 41 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index 763f57337..cd2e51fe4 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -332,7 +332,6 @@ CloseDownExtensions() } } -#ifndef NXAGENT_SERVER int ProcQueryExtension(ClientPtr client) { @@ -373,6 +372,7 @@ ProcQueryExtension(ClientPtr client) return(client->noClientException); } +#ifndef NXAGENT_SERVER int ProcListExtensions(ClientPtr client) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c index 0b832cc7d..0c4a4b457 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXextension.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXextension.c @@ -74,46 +74,6 @@ SOFTWARE. #include "../../dix/extension.c" -int -ProcQueryExtension(ClientPtr client) -{ - xQueryExtensionReply reply; - int i; - REQUEST(xQueryExtensionReq); - - REQUEST_FIXED_SIZE(xQueryExtensionReq, stuff->nbytes); - - memset(&reply, 0, sizeof(xQueryExtensionReply)); - reply.type = X_Reply; - reply.length = 0; - reply.major_opcode = 0; - reply.sequenceNumber = client->sequence; - - if ( ! NumExtensions ) - reply.present = xFalse; - else - { - i = FindExtension((char *)&stuff[1], stuff->nbytes); - if (i < 0 -#ifdef XCSECURITY - /* don't show insecure extensions to untrusted clients */ - || (client->trustLevel == XSecurityClientUntrusted && - !extensions[i]->secure) -#endif - ) - reply.present = xFalse; - else - { - reply.present = xTrue; - reply.major_opcode = extensions[i]->base; - reply.first_event = extensions[i]->eventBase; - reply.first_error = extensions[i]->errorBase; - } - } - WriteReplyToClient(client, sizeof(xQueryExtensionReply), &reply); - return(client->noClientException); -} - int ProcListExtensions(ClientPtr client) { -- cgit v1.2.3