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:
@@ -63,7 +63,7 @@ ProcXResQueryClients (ClientPtr client)
|
||||
|
||||
REQUEST_SIZE_MATCH(xXResQueryClientsReq);
|
||||
|
||||
current_clients = xalloc(currentMaxClients * sizeof(int));
|
||||
current_clients = malloc(currentMaxClients * sizeof(int));
|
||||
|
||||
num_clients = 0;
|
||||
for(i = 0; i < currentMaxClients; i++) {
|
||||
@@ -101,7 +101,7 @@ ProcXResQueryClients (ClientPtr client)
|
||||
}
|
||||
}
|
||||
|
||||
xfree(current_clients);
|
||||
free(current_clients);
|
||||
|
||||
return (client->noClientException);
|
||||
}
|
||||
@@ -132,7 +132,7 @@ ProcXResQueryClientResources (ClientPtr client)
|
||||
return BadValue;
|
||||
}
|
||||
|
||||
counts = xcalloc(lastResourceType + 1, sizeof(int));
|
||||
counts = calloc(lastResourceType + 1, sizeof(int));
|
||||
|
||||
FindAllClientResources(clients[clientID], ResFindAllRes, counts);
|
||||
|
||||
@@ -182,7 +182,7 @@ ProcXResQueryClientResources (ClientPtr client)
|
||||
}
|
||||
}
|
||||
|
||||
xfree(counts);
|
||||
free(counts);
|
||||
|
||||
return (client->noClientException);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user