diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-08 16:40:53 +0200 |
|---|---|---|
| committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-08 16:40:53 +0200 |
| commit | bfe2dd6d5d084634776198edb040df93325d06d2 (patch) | |
| tree | 911c7c170dbca8dca1bc1e20248b582a1f4d3a04 | |
| parent | cc2f4d685f28e231ef5807c7e7a60b6d11e3ebd9 (diff) | |
xnfcalloc is just an alias for XNFcallocarray() that doesn't seem to serve
any practical purpose, so it can go away once all drivers stopped using it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/7>
| -rw-r--r-- | src/sis310_accel.c | 2 | ||||
| -rw-r--r-- | src/sis_driver.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/sis310_accel.c b/src/sis310_accel.c index a264e55..279a620 100644 --- a/src/sis310_accel.c +++ b/src/sis310_accel.c @@ -178,7 +178,7 @@ SiSCalcRenderAccelArray(ScrnInfoPtr pScrn) if(pSiSEnt) pSiS->RenderAccelArray = pSiSEnt->RenderAccelArray; #endif if(!pSiS->RenderAccelArray) { - if((pSiS->RenderAccelArray = xnfcalloc(65536, 1))) { + if((pSiS->RenderAccelArray = XNFcallocarray(65536, 1))) { #ifdef SISDUALHEAD if(pSiSEnt) pSiSEnt->RenderAccelArray = pSiS->RenderAccelArray; #endif diff --git a/src/sis_driver.c b/src/sis_driver.c index 7bc39c2..b7bfca9 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -302,7 +302,7 @@ SISGetRec(ScrnInfoPtr pScrn) */ if(pScrn->driverPrivate != NULL) return TRUE; - pScrn->driverPrivate = xnfcalloc(sizeof(SISRec), 1); + pScrn->driverPrivate = XNFcallocarray(sizeof(SISRec), 1); /* Initialise it to 0 */ memset(pScrn->driverPrivate, 0, sizeof(SISRec)); @@ -588,7 +588,7 @@ SISProbe(DriverPtr drv, int flags) } pPriv = xf86GetEntityPrivate(pScrn->entityList[0], SISEntityIndex); if(!pPriv->ptr) { - pPriv->ptr = xnfcalloc(sizeof(SISEntRec), 1); + pPriv->ptr = XNFcallocarray(sizeof(SISEntRec), 1); pSiSEnt = pPriv->ptr; memset(pSiSEnt, 0, sizeof(SISEntRec)); pSiSEnt->lastInstance = -1; @@ -3926,7 +3926,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) } #endif if(!pSiS->SiS_Pr) { - if(!(pSiS->SiS_Pr = xnfcalloc(sizeof(struct SiS_Private), 1))) { + if(!(pSiS->SiS_Pr = XNFcallocarray(sizeof(struct SiS_Private), 1))) { SISErrorLog(pScrn, "Could not allocate memory for SiS_Pr structure\n"); goto my_error_1; } @@ -6196,7 +6196,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) * Setup the ClockRanges, which describe what clock ranges are available, * and what sort of modes they can be used for. */ - clockRanges = xnfcalloc(sizeof(ClockRange), 1); + clockRanges = XNFcallocarray(sizeof(ClockRange), 1); clockRanges->next = NULL; clockRanges->minClock = pSiS->MinClock; clockRanges->maxClock = pSiS->MaxClock; @@ -13538,7 +13538,7 @@ SiSBuildVesaModeList(ScrnInfoPtr pScrn, vbeInfoPtr pVbe, VbeInfoBlock *vbe) continue; } - m = xnfcalloc(sizeof(sisModeInfoRec), 1); + m = XNFcallocarray(sizeof(sisModeInfoRec), 1); if(!m) { VBEFreeModeInfo(mode); continue; |