diff options
| author | Nicolas Reinecke <nr@das-labor.org> | 2010-09-27 13:33:55 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2010-09-27 13:34:37 -0400 |
| commit | c4f834cdfbe96aa47ac5fb039f9dd7aa9730c8a3 (patch) | |
| tree | 97f5f7abf785d7e6b183199ce526ed701225a978 | |
| parent | f8fb9312d791af1f77020e8c2d35bb30841ed9aa (diff) | |
radeon: Convert remaining x(c)alloc/xfree to m/calloc/free.
Fixes deprecation warnings missed out by
f7a91ece264af9f3fd2fc18e99aefcda93ce9f5c
| -rw-r--r-- | src/ati.c | 2 | ||||
| -rw-r--r-- | src/theatre200.c | 8 | ||||
| -rw-r--r-- | src/theatre_detect.c | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -227,7 +227,7 @@ ati_gdev_subdriver(pointer options) } } - xfree(ATIGDevs); + free(ATIGDevs); /* load subdrivers as primary modules and only if they do not get loaded * from other device sections diff --git a/src/theatre200.c b/src/theatre200.c index 16b18400..1b2a46c6 100644 --- a/src/theatre200.c +++ b/src/theatre200.c @@ -162,7 +162,7 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_ { int ret; - curr_seg = (struct rt200_microc_seg*)Xalloc(sizeof(struct rt200_microc_seg)); + curr_seg = (struct rt200_microc_seg*)malloc(sizeof(struct rt200_microc_seg)); if (curr_seg == NULL) { ERROR_0("Cannot allocate memory\n"); @@ -178,7 +178,7 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_ goto fail_exit; } - curr_seg->data = (unsigned char*)Xalloc(curr_seg->num_bytes); + curr_seg->data = (unsigned char*)malloc(curr_seg->num_bytes); if (curr_seg->data == NULL) { ERROR_0("cannot allocate memory\n"); @@ -241,7 +241,7 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_ for (i = 0; i < microc_headp->num_seg; i++) { - curr_seg = (struct rt200_microc_seg*)Xalloc(sizeof(struct rt200_microc_seg)); + curr_seg = (struct rt200_microc_seg*)malloc(sizeof(struct rt200_microc_seg)); if (curr_seg == NULL) { ERROR_0("Cannot allocate memory\n"); @@ -262,7 +262,7 @@ static int microc_load (char* micro_path, char* micro_type, struct rt200_microc_ goto fail_exit; } - curr_seg->data = (unsigned char*)Xalloc(curr_seg->num_bytes); + curr_seg->data = (unsigned char*)malloc(curr_seg->num_bytes); if (curr_seg->data == NULL) { ERROR_0("cannot allocate memory\n"); diff --git a/src/theatre_detect.c b/src/theatre_detect.c index 7e7f813e..44cd9fa9 100644 --- a/src/theatre_detect.c +++ b/src/theatre_detect.c @@ -79,7 +79,7 @@ _X_EXPORT TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b) return NULL; } - t = xcalloc(1,sizeof(TheatreRec)); + t = calloc(1,sizeof(TheatreRec)); t->VIP = b; t->theatre_num = -1; t->mode=MODE_UNINITIALIZED; @@ -113,7 +113,7 @@ _X_EXPORT TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b) if(t->theatre_num < 0) { - xfree(t); + free(t); return NULL; } |