From 3f3ff971ecff9936cebafc813af9193b97bba89c Mon Sep 17 00:00:00 2001 From: Mikhail Gusarov Date: Thu, 6 May 2010 01:44:06 +0700 Subject: 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 Reviewed-by: Peter Hutterer --- Xext/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Xext/security.c') diff --git a/Xext/security.c b/Xext/security.c index af8d2052f..268581579 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -222,7 +222,7 @@ SecurityDeleteAuthorization( } SecurityAudit("revoked authorization ID %d\n", pAuth->id); - xfree(pAuth); + free(pAuth); return Success; } /* SecurityDeleteAuthorization */ @@ -247,7 +247,7 @@ SecurityDeleteAuthorizationEventClient( prev->next = pEventClient->next; else pAuth->eventClients = pEventClient->next; - xfree(pEventClient); + free(pEventClient); return(Success); } prev = pEventClient; @@ -409,7 +409,7 @@ SecurityEventSelectForAuthorization( } } - pEventClient = xalloc(sizeof(OtherClients)); + pEventClient = malloc(sizeof(OtherClients)); if (!pEventClient) return BadAlloc; pEventClient->mask = mask; @@ -418,7 +418,7 @@ SecurityEventSelectForAuthorization( if (!AddResource(pEventClient->resource, RTEventClient, (pointer)pAuth)) { - xfree(pEventClient); + free(pEventClient); return BadAlloc; } pAuth->eventClients = pEventClient; @@ -541,7 +541,7 @@ ProcSecurityGenerateAuthorization( /* associate additional information with this auth ID */ - pAuth = xalloc(sizeof(SecurityAuthorizationRec)); + pAuth = malloc(sizeof(SecurityAuthorizationRec)); if (!pAuth) { err = BadAlloc; @@ -613,7 +613,7 @@ bailout: if (removeAuth) RemoveAuthorization(stuff->nbytesAuthProto, protoname, authdata_len, pAuthdata); - if (pAuth) xfree(pAuth); + if (pAuth) free(pAuth); return err; } /* ProcSecurityGenerateAuthorization */ -- cgit v1.2.3