diff options
| author | Julien Cristau <jcristau@debian.org> | 2012-05-01 15:10:39 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2012-05-01 15:40:03 +0200 |
| commit | 784c3a1fa53771662b4656e193fb392cbb8c8452 (patch) | |
| tree | a381a93a77387e87fa284063350a371c8a2e796a /src/apm_video.c | |
| parent | 21f5f7acf9235428ef2bcd5e34d0a44f9e4d838b (diff) | |
Replace x{{,re,c}alloc,free} with malloc/realloc/calloc/free
Diffstat (limited to 'src/apm_video.c')
| -rw-r--r-- | src/apm_video.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/apm_video.c b/src/apm_video.c index d8b69fb..c87ffd0 100644 --- a/src/apm_video.c +++ b/src/apm_video.c @@ -53,7 +53,7 @@ void A(InitVideo)(ScreenPtr pScreen) if (pApm->Chipset >= AT24) { if ((newAdaptor = A(SetupImageVideo)(pScreen))) { - newAdaptors = xalloc((num_adaptors + 1) * + newAdaptors = malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); if(newAdaptors) { if(num_adaptors) @@ -70,8 +70,7 @@ void A(InitVideo)(ScreenPtr pScreen) if(num_adaptors) xf86XVScreenInit(pScreen, adaptors, num_adaptors); - if(freeAdaptors) - xfree(adaptors); + free(adaptors); } #ifndef APM_VIDEO_DEFINES @@ -300,9 +299,9 @@ A(SetupImageVideo)(ScreenPtr pScreen) XF86VideoAdaptorPtr adapt; ApmPortPrivPtr pPriv; - if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + - 2 * sizeof(ApmPortPrivRec) + - 2 * sizeof(DevUnion)))) + if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + + 2 * sizeof(ApmPortPrivRec) + + 2 * sizeof(DevUnion)))) return NULL; adapt->type = XvWindowMask | XvInputMask | XvImageMask; |