aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Args.c
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Args.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Args.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c
index 6e6d61772..895de1ef8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Args.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c
@@ -355,14 +355,14 @@ int ddxProcessArgument(int argc, char *argv[], int i)
if (nxagentOptionFile != NULL)
{
- xfree(nxagentOptionFile);
+ free(nxagentOptionFile);
nxagentOptionFile = NULL;
}
if ((size = strlen(argv[i])) < 1024)
{
- if ((nxagentOptionFile = xalloc(size + 1)) == NULL)
+ if ((nxagentOptionFile = malloc(size + 1)) == NULL)
{
FatalError("malloc failed");
}
@@ -719,14 +719,14 @@ int ddxProcessArgument(int argc, char *argv[], int i)
if (nxagentKeyboard != NULL)
{
- xfree(nxagentKeyboard);
+ free(nxagentKeyboard);
nxagentKeyboard = NULL;
}
if ((size = strlen(argv[i])) < 256)
{
- if ((nxagentKeyboard = xalloc(size + 1)) == NULL)
+ if ((nxagentKeyboard = malloc(size + 1)) == NULL)
{
FatalError("malloc failed");
}
@@ -1537,7 +1537,7 @@ void nxagentProcessOptionsFile()
goto nxagentProcessOptionsFileClose;
}
- if ((data = xalloc(sizeOfFile + 1)) == NULL)
+ if ((data = malloc(sizeOfFile + 1)) == NULL)
{
fprintf(stderr, "Warning: Memory allocation failed processing file '%s'.\n",
validateString(nxagentOptionFile));
@@ -1591,7 +1591,7 @@ nxagentProcessOptionsFileFree:
if (data != NULL)
{
- Xfree(data);
+ free(data);
}
nxagentProcessOptionsFileClose: