From a82971b07035ee9a4e3ed01326e7c1eab34b5a19 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 29 Apr 2017 00:21:47 -0700
Subject: [PATCH] os: un-duplicate code to close client on write failure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There are three copies of the same short sequence of operations to
close down a client when a write error occurs. Create a new function,
AbortClient, which performs these operations and then call it from the
three places.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
---
os/io.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/os/io.c b/os/io.c
index 46c7e23715..9b6a7d459c 100644
--- a/os/io.c
+++ b/os/io.c
@@ -632,6 +632,24 @@ SetCriticalOutputPending(void)
CriticalOutputPending = TRUE;
}
+/*****************
+ * AbortClient:
+ * When a write error occurs to a client, close
+ * the connection and clean things up.
+ *****************/
+
+static void
+AbortClient(ClientPtr client)
+{
+ OsCommPtr oc = client->osPrivate;
+
+ if (oc->trans_conn) {
+ _XSERVTransDisconnect(oc->trans_conn);
+ _XSERVTransClose(oc->trans_conn);
+ oc->trans_conn = NULL;
+ }
+}
+
/*****************
* WriteToClient
* Copies buf into ClientPtr.buf if it fits (with padding), else
@@ -707,11 +725,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
FreeOutputs = oco->next;
}
else if (!(oco = AllocateOutputBuffer())) {
- if (oc->trans_conn) {
- _XSERVTransDisconnect(oc->trans_conn);
- _XSERVTransClose(oc->trans_conn);
- oc->trans_conn = NULL;
- }
+ AbortClient(who);
MarkClientException(who);
return -1;
}
@@ -892,9 +906,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
obuf = realloc(oco->buf, notWritten + BUFSIZE);
}
if (!obuf) {
- _XSERVTransDisconnect(oc->trans_conn);
- _XSERVTransClose(oc->trans_conn);
- oc->trans_conn = NULL;
+ AbortClient(who);
MarkClientException(who);
oco->count = 0;
return -1;
@@ -921,11 +933,7 @@ FlushClient(ClientPtr who, OsCommPtr oc, const void *__extraBuf, int extraCount)
}
#endif
else {
- if (oc->trans_conn) {
- _XSERVTransDisconnect(oc->trans_conn);
- _XSERVTransClose(oc->trans_conn);
- oc->trans_conn = NULL;
- }
+ AbortClient(who);
MarkClientException(who);
oco->count = 0;
return -1;
--
GitLab