mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 03:44:06 +00:00
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:
@@ -388,7 +388,7 @@ unsigned changed,tmp;
|
||||
nSyms= XkbKeyNumSyms(xkb,key);
|
||||
syms= XkbKeySymsPtr(xkb,key);
|
||||
if (nSyms>IBUF_SIZE) {
|
||||
interps= xcalloc(nSyms, sizeof(XkbSymInterpretPtr));
|
||||
interps= calloc(nSyms, sizeof(XkbSymInterpretPtr));
|
||||
if (interps==NULL) {
|
||||
interps= ibuf;
|
||||
nSyms= IBUF_SIZE;
|
||||
@@ -422,7 +422,7 @@ unsigned changed,tmp;
|
||||
pActs= XkbResizeKeyActions(xkb,key,nSyms);
|
||||
if (!pActs) {
|
||||
if (nSyms > IBUF_SIZE)
|
||||
xfree(interps);
|
||||
free(interps);
|
||||
return FALSE;
|
||||
}
|
||||
new_vmodmask= 0;
|
||||
@@ -507,7 +507,7 @@ unsigned changed,tmp;
|
||||
mc->changed|= changed;
|
||||
}
|
||||
if (interps!=ibuf)
|
||||
xfree(interps);
|
||||
free(interps);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user