diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-06 01:44:06 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 00:22:37 +0700 |
| commit | 3f3ff971ecff9936cebafc813af9193b97bba89c (patch) | |
| tree | fdbbad794a42488b7ffe41eed7aba4e498335f55 /xkb/ddxLoad.c | |
| parent | 96c7ab27c383ec767f62a7a11e5fd76f86363fbc (diff) | |
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>
Diffstat (limited to 'xkb/ddxLoad.c')
| -rw-r--r-- | xkb/ddxLoad.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 4ccdddaf0..a9b5ca984 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -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; } |