aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os/utils.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-26 01:38:22 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-02 14:05:30 +0200
commitacf87144d019f18e646501657d9082c6eba77f54 (patch)
treedadb838cd54010836230358a4a5805bb0696b5bb /nx-X11/programs/Xserver/os/utils.c
parent279d37127db241a9ee685f6b671f51aa21a972ea (diff)
downloadnx-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/utils.c')
-rw-r--r--nx-X11/programs/Xserver/os/utils.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 90cf55d1a..03deb811a 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -1812,7 +1812,7 @@ Popen(char *command, char *type)
return NULL;
if (pipe(pdes) < 0) {
- xfree(cur);
+ free(cur);
return NULL;
}
@@ -1826,7 +1826,7 @@ Popen(char *command, char *type)
case -1: /* error */
close(pdes[0]);
close(pdes[1]);
- xfree(cur);
+ free(cur);
#ifdef NX_TRANS_EXIT
if (OsVendorEndRedirectErrorFProc != NULL) {
OsVendorEndRedirectErrorFProc();
@@ -1950,7 +1950,7 @@ Fopen(char *file, char *type)
return NULL;
if (pipe(pdes) < 0) {
- xfree(cur);
+ free(cur);
return NULL;
}
@@ -1958,7 +1958,7 @@ Fopen(char *file, char *type)
case -1: /* error */
close(pdes[0]);
close(pdes[1]);
- xfree(cur);
+ free(cur);
return NULL;
case 0: /* child */
if (setgid(getgid()) == -1)
@@ -2052,7 +2052,7 @@ Pclose(void * iop)
pidlist = cur->next;
else
last->next = cur->next;
- xfree(cur);
+ free(cur);
/* allow EINTR again */
OsReleaseSignals ();