Commit 0d9d2128 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Client.c: mask unused clientBytes stuff

The only place where this was referenced outside Client.c was a commented section in Handlers.c. For now lets mask all that by an (unset) define.
parent 7921cf79
...@@ -111,7 +111,9 @@ void nxagentInitClientPrivates(ClientPtr client) ...@@ -111,7 +111,9 @@ void nxagentInitClientPrivates(ClientPtr client)
if (nxagentClientPriv(client)) if (nxagentClientPriv(client))
{ {
nxagentClientPriv(client) -> clientState = 0; nxagentClientPriv(client) -> clientState = 0;
#ifdef COUNT_CLIENT_BYTES
nxagentClientPriv(client) -> clientBytes = 0; nxagentClientPriv(client) -> clientBytes = 0;
#endif
nxagentClientPriv(client) -> clientHint = UNKNOWN; nxagentClientPriv(client) -> clientHint = UNKNOWN;
} }
} }
...@@ -284,6 +286,7 @@ void nxagentWakeupByReset(ClientPtr client) ...@@ -284,6 +286,7 @@ void nxagentWakeupByReset(ClientPtr client)
} }
} }
#ifdef COUNT_CLIENT_BYTES
if (client -> index < MAX_CONNECTIONS) if (client -> index < MAX_CONNECTIONS)
{ {
#ifdef TEST #ifdef TEST
...@@ -293,6 +296,7 @@ void nxagentWakeupByReset(ClientPtr client) ...@@ -293,6 +296,7 @@ void nxagentWakeupByReset(ClientPtr client)
nxagentClientBytes(client) = 0; nxagentClientBytes(client) = 0;
} }
#endif
} }
/* /*
......
...@@ -59,11 +59,15 @@ extern int nxagentClientPrivateIndex; ...@@ -59,11 +59,15 @@ extern int nxagentClientPrivateIndex;
void nxagentInitClientPrivates(ClientPtr); void nxagentInitClientPrivates(ClientPtr);
#undef COUNT_CLIENT_BYTES
#ifdef COUNT_CLIENT_BYTES
#define nxagentClientAddBytes(pClient, size) \ #define nxagentClientAddBytes(pClient, size) \
(nxagentClientPriv(pClient) -> clientBytes += (size)) (nxagentClientPriv(pClient) -> clientBytes += (size))
#define nxagentClientBytes(pClient) \ #define nxagentClientBytes(pClient) \
(nxagentClientPriv(pClient) -> clientBytes) (nxagentClientPriv(pClient) -> clientBytes)
#endif
#define nxagentClientHint(pClient) \ #define nxagentClientHint(pClient) \
(nxagentClientPriv(pClient) -> clientHint) (nxagentClientPriv(pClient) -> clientHint)
......
...@@ -1041,6 +1041,7 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out) ...@@ -1041,6 +1041,7 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
in, client -> index); in, client -> index);
#endif #endif
#ifdef COUNT_CLIENT_BYTES
/* /*
* This is presently unused. * This is presently unused.
* *
...@@ -1052,6 +1053,7 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out) ...@@ -1052,6 +1053,7 @@ void nxagentDispatchHandler(ClientPtr client, int in, int out)
* #endif * #endif
* *
*/ */
#endif
nxagentBytesIn += in; nxagentBytesIn += in;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment