dix: rename MarkClientException() to dixMarkClientException()
DIX functions should have proper naming. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
6a3b60cfe7
commit
0b9a2fc6b0
|
@ -3913,7 +3913,7 @@ SendErrorToClient(ClientPtr client, CARD8 majorCode, CARD16 minorCode,
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
MarkClientException(ClientPtr client)
|
dixMarkClientException(ClientPtr client)
|
||||||
{
|
{
|
||||||
client->noClientException = -1;
|
client->noClientException = -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -406,7 +406,7 @@ ClientPtr NextAvailableClient(void *ospriv);
|
||||||
*
|
*
|
||||||
* @param pClient pointer to client that has exception
|
* @param pClient pointer to client that has exception
|
||||||
*/
|
*/
|
||||||
void MarkClientException(ClientPtr pClient)
|
void dixMarkClientException(ClientPtr pClient)
|
||||||
_X_ATTRIBUTE_NONNULL_ARG(1);
|
_X_ATTRIBUTE_NONNULL_ARG(1);
|
||||||
|
|
||||||
typedef Bool (*ClientSleepProcPtr) (ClientPtr client, void *closure);
|
typedef Bool (*ClientSleepProcPtr) (ClientPtr client, void *closure);
|
||||||
|
|
|
@ -800,7 +800,7 @@ FakeClientID(int client)
|
||||||
if (!id) {
|
if (!id) {
|
||||||
if (!client)
|
if (!client)
|
||||||
FatalError("FakeClientID: server internal ids exhausted\n");
|
FatalError("FakeClientID: server internal ids exhausted\n");
|
||||||
MarkClientException(clients[client]);
|
dixMarkClientException(clients[client]);
|
||||||
id = ((Mask) client << CLIENTOFFSET) | (SERVER_BIT * 3);
|
id = ((Mask) client << CLIENTOFFSET) | (SERVER_BIT * 3);
|
||||||
maxid = id | RESOURCE_ID_MASK;
|
maxid = id | RESOURCE_ID_MASK;
|
||||||
}
|
}
|
||||||
|
|
6
os/io.c
6
os/io.c
|
@ -742,7 +742,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
|
||||||
}
|
}
|
||||||
else if (!(oco = AllocateOutputBuffer())) {
|
else if (!(oco = AllocateOutputBuffer())) {
|
||||||
AbortClient(who);
|
AbortClient(who);
|
||||||
MarkClientException(who);
|
dixMarkClientException(who);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
oc->output = oco;
|
oc->output = oco;
|
||||||
|
@ -920,7 +920,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
|
||||||
}
|
}
|
||||||
if (!obuf) {
|
if (!obuf) {
|
||||||
AbortClient(who);
|
AbortClient(who);
|
||||||
MarkClientException(who);
|
dixMarkClientException(who);
|
||||||
oco->count = 0;
|
oco->count = 0;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -947,7 +947,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
|
||||||
#endif
|
#endif
|
||||||
else {
|
else {
|
||||||
AbortClient(who);
|
AbortClient(who);
|
||||||
MarkClientException(who);
|
dixMarkClientException(who);
|
||||||
oco->count = 0;
|
oco->count = 0;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue