aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-06-11 11:31:05 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-06-11 11:31:05 +0200
commit126cbe1ff20e19cd477c5fe9a127298bd12e3e2e (patch)
tree867fa434f7a18b496d7f776748bca351be932d0a /nx-X11/programs/Xserver
parent789d3a37e656167a63e637140805fac145c765ea (diff)
parent0eab060d17c1ecbfbda957d747fc21c1bedee416 (diff)
downloadnx-libs-126cbe1ff20e19cd477c5fe9a127298bd12e3e2e.tar.gz
nx-libs-126cbe1ff20e19cd477c5fe9a127298bd12e3e2e.tar.bz2
nx-libs-126cbe1ff20e19cd477c5fe9a127298bd12e3e2e.zip
Merge branch 'uli42-pr/remove_requestlog' into 3.6.x
Attributes GH PR #811: https://github.com/ArcticaProject/nx-libs/pull/811
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/dix/dispatch.c9
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c6
-rw-r--r--nx-X11/programs/Xserver/include/dixstruct.h8
3 files changed, 0 insertions, 23 deletions
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 5c4e54c73..86a33ec65 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -416,12 +416,6 @@ Dispatch(void)
}
client->sequence++;
-#ifdef DEBUG
- if (client->requestLogIndex == MAX_REQUEST_LOG)
- client->requestLogIndex = 0;
- client->requestLog[client->requestLogIndex] = MAJOROP;
- client->requestLogIndex++;
-#endif
if (result > (maxBigRequestSize << 2))
result = BadLength;
else
@@ -3622,9 +3616,6 @@ void InitClient(ClientPtr client, int i, void * ospriv)
client->numSaved = 0;
client->saveSet = (SaveSetElt *)NULL;
client->noClientException = Success;
-#ifdef DEBUG
- client->requestLogIndex = 0;
-#endif
client->requestVector = InitialVector;
client->osPrivate = ospriv;
client->swapped = FALSE;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index 465e791da..db055f0cd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -468,12 +468,6 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
#endif
client->sequence++;
-#ifdef DEBUG
- if ((client->requestLogIndex >= MAX_REQUEST_LOG) || (client->requestLogIndex <= 0))
- client->requestLogIndex = 0;
- client->requestLog[client->requestLogIndex] = MAJOROP;
- client->requestLogIndex++;
-#endif
if (result > (maxBigRequestSize << 2))
result = BadLength;
else
diff --git a/nx-X11/programs/Xserver/include/dixstruct.h b/nx-X11/programs/Xserver/include/dixstruct.h
index cdd2543a6..079dfb1ed 100644
--- a/nx-X11/programs/Xserver/include/dixstruct.h
+++ b/nx-X11/programs/Xserver/include/dixstruct.h
@@ -37,10 +37,6 @@ SOFTWARE.
* translation from client ids to server addresses.
*/
-#ifdef DEBUG
-#define MAX_REQUEST_LOG 100
-#endif
-
extern CallbackListPtr ClientStateCallback;
typedef struct {
@@ -121,10 +117,6 @@ typedef struct _Client {
KeyCode minKC,maxKC;
#endif
-#ifdef DEBUG
- unsigned char requestLog[MAX_REQUEST_LOG];
- int requestLogIndex;
-#endif
unsigned long replyBytesRemaining;
#ifdef XCSECURITY
XID authId;