aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-05 15:01:00 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-11-02 11:21:00 +0100
commit8e9e77665efb1ca232e661b99df2227ac0360e20 (patch)
treea6b742f6ab52b593a762175d6b8e977c0694ee21
parentd6872d4e01df9a7e329524ea311512a9cf34da3b (diff)
downloadnx-libs-8e9e77665efb1ca232e661b99df2227ac0360e20.tar.gz
nx-libs-8e9e77665efb1ca232e661b99df2227ac0360e20.tar.bz2
nx-libs-8e9e77665efb1ca232e661b99df2227ac0360e20.zip
NXextension.c: use ProcQueryExtension() from dix
-rw-r--r--nx-X11/programs/Xserver/dix/extension.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXextension.c40
2 files changed, 1 insertions, 41 deletions
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
@@ -75,46 +75,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)
{
xListExtensionsReply reply;