diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-05 19:08:36 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-05 19:08:36 -0500 |
| commit | a52c9b2a59f27266557ff9d5d2c08492e04135a6 (patch) | |
| tree | 705f11c54e8a31a07dde9ab6835032e2849e132b /Xext/xres.c | |
| parent | c7e18beb3c87eb1ada9b21c4ffacd11c1939c087 (diff) | |
| parent | 58332894c061ae96d6a457f65266660f5f65e88b (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
Diffstat (limited to 'Xext/xres.c')
| -rw-r--r-- | Xext/xres.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Xext/xres.c b/Xext/xres.c index e78176e41..281ba20cd 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -65,7 +65,7 @@ ProcXResQueryClients (ClientPtr client) REQUEST_SIZE_MATCH(xXResQueryClientsReq); - current_clients = ALLOCATE_LOCAL((currentMaxClients - 1) * sizeof(int)); + current_clients = xalloc((currentMaxClients - 1) * sizeof(int)); num_clients = 0; for(i = 1; i < currentMaxClients; i++) { @@ -103,7 +103,7 @@ ProcXResQueryClients (ClientPtr client) } } - DEALLOCATE_LOCAL(current_clients); + xfree(current_clients); return (client->noClientException); } @@ -136,7 +136,7 @@ ProcXResQueryClientResources (ClientPtr client) return BadValue; } - counts = ALLOCATE_LOCAL((lastResourceType + 1) * sizeof(int)); + counts = xalloc((lastResourceType + 1) * sizeof(int)); memset(counts, 0, (lastResourceType + 1) * sizeof(int)); @@ -188,7 +188,7 @@ ProcXResQueryClientResources (ClientPtr client) } } - DEALLOCATE_LOCAL(counts); + xfree(counts); return (client->noClientException); } |