Replace X-allocation functions with their C89 counterparts
The only remaining X-functions used in server are XNF*, the rest is converted to plain alloc/calloc/realloc/free/strdup. X* functions are still exported from server and x* macros are still defined in header file, so both ABI and API are not affected by this change. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
@@ -131,7 +131,7 @@ Win32System(const char *cmdline)
|
||||
LocalFree(buffer);
|
||||
}
|
||||
|
||||
xfree(cmd);
|
||||
free(cmd);
|
||||
return -1;
|
||||
}
|
||||
/* Wait until child process exits. */
|
||||
@@ -142,7 +142,7 @@ Win32System(const char *cmdline)
|
||||
/* Close process and thread handles. */
|
||||
CloseHandle( pi.hProcess );
|
||||
CloseHandle( pi.hThread );
|
||||
xfree(cmd);
|
||||
free(cmd);
|
||||
|
||||
return dwExitCode;
|
||||
}
|
||||
@@ -235,7 +235,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
|
||||
xkm_output_dir, keymap);
|
||||
|
||||
if (xkbbasedirflag != emptystring) {
|
||||
xfree(xkbbasedirflag);
|
||||
free(xkbbasedirflag);
|
||||
}
|
||||
|
||||
#ifndef WIN32
|
||||
@@ -265,7 +265,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
|
||||
nameRtrn[nameRtrnLen-1]= '\0';
|
||||
}
|
||||
if (buf != NULL)
|
||||
xfree (buf);
|
||||
free(buf);
|
||||
return TRUE;
|
||||
}
|
||||
else
|
||||
@@ -285,7 +285,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
|
||||
if (nameRtrn)
|
||||
nameRtrn[0]= '\0';
|
||||
if (buf != NULL)
|
||||
xfree (buf);
|
||||
free(buf);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user