diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-26 01:38:22 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:05:30 +0200 |
| commit | acf87144d019f18e646501657d9082c6eba77f54 (patch) | |
| tree | dadb838cd54010836230358a4a5805bb0696b5bb /nx-X11/programs/Xserver/os/io.c | |
| parent | 279d37127db241a9ee685f6b671f51aa21a972ea (diff) | |
| download | nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.gz nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.bz2 nx-libs-acf87144d019f18e646501657d9082c6eba77f54.zip | |
nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.
Fixes ArcticaProject/nx-libs#105
Diffstat (limited to 'nx-X11/programs/Xserver/os/io.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/io.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index fefe3007f..b8f05d939 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -222,8 +222,8 @@ ReadRequestFromClient(ClientPtr client) register ConnectionInputPtr aci = AvailableInput->input; if (aci->size > BUFWATERMARK) { - xfree(aci->buffer); - xfree(aci); + free(aci->buffer); + free(aci); } else { @@ -504,8 +504,8 @@ InsertFakeRequest(ClientPtr client, char *data, int count) ConnectionInputPtr aci = AvailableInput->input; if (aci->size > BUFWATERMARK) { - xfree(aci->buffer); - xfree(aci); + free(aci->buffer); + free(aci); } else { @@ -1154,8 +1154,8 @@ FlushClient(ClientPtr who, OsCommPtr oc, char *extraBuf, int extraCount) } if (oco->size > BUFWATERMARK) { - xfree(oco->buf); - xfree(oco); + free(oco->buf); + free(oco); } else { @@ -1177,7 +1177,7 @@ AllocateInputBuffer(void) oci->buffer = (char *)xalloc(BUFSIZE); if (!oci->buffer) { - xfree(oci); + free(oci); return (ConnectionInputPtr)NULL; } oci->size = BUFSIZE; @@ -1198,7 +1198,7 @@ AllocateOutputBuffer(void) oco->buf = (unsigned char *) xalloc(BUFSIZE); if (!oco->buf) { - xfree(oco); + free(oco); return (ConnectionOutputPtr)NULL; } oco->size = BUFSIZE; @@ -1218,8 +1218,8 @@ FreeOsBuffers(OsCommPtr oc) { if (FreeInputs) { - xfree(oci->buffer); - xfree(oci); + free(oci->buffer); + free(oci); } else { @@ -1234,8 +1234,8 @@ FreeOsBuffers(OsCommPtr oc) { if (FreeOutputs) { - xfree(oco->buf); - xfree(oco); + free(oco->buf); + free(oco); } else { @@ -1255,13 +1255,13 @@ ResetOsBuffers(void) while ((oci = FreeInputs)) { FreeInputs = oci->next; - xfree(oci->buffer); - xfree(oci); + free(oci->buffer); + free(oci); } while ((oco = FreeOutputs)) { FreeOutputs = oco->next; - xfree(oco->buf); - xfree(oco); + free(oco->buf); + free(oco); } } |