diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-08 16:15:41 +0200 |
|---|---|---|
| committer | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-08 16:15:41 +0200 |
| commit | b99d421ca77ab3fdb2859debe6caced35859897d (patch) | |
| tree | 5d30594cf2c5afbe4f296e7abe15a0145fd42199 | |
| parent | 42635410201344d89a2ea8859a10cf0d1e9aa492 (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-neomagic/-/merge_requests/7>
| -rw-r--r-- | src/neo_cursor.c | 2 | ||||
| -rw-r--r-- | src/neo_driver.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/neo_cursor.c b/src/neo_cursor.c index 40a517c..53c88a7 100644 --- a/src/neo_cursor.c +++ b/src/neo_cursor.c @@ -256,7 +256,7 @@ neoRealizeCursor(xf86CursorInfoPtr infoPtr, CursorPtr pCurs) unsigned char *mem; int SrcPitch, DstPitch, y, x, z; - mem = (unsigned char*)xnfcalloc(4096,1); + mem = (unsigned char*)XNFcallocarray(4096,1); SrcPitch = (pCurs->bits->width + 31) >> 5; DstPitch = infoPtr->MaxWidth >> 4; SrcS = (CARD32*)pCurs->bits->source; diff --git a/src/neo_driver.c b/src/neo_driver.c index d2ed16d..704a9fb 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -459,7 +459,7 @@ NEOGetRec(ScrnInfoPtr pScrn) if (pScrn->driverPrivate != NULL) return TRUE; - pScrn->driverPrivate = xnfcalloc(sizeof(NEORec), 1); + pScrn->driverPrivate = XNFcallocarray(sizeof(NEORec), 1); if (pScrn->driverPrivate == NULL) return FALSE; @@ -1227,7 +1227,7 @@ NEOPreInit(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 = (ClockRangePtr)xnfcalloc(sizeof(ClockRange), 1); + clockRanges = (ClockRangePtr)XNFcallocarray(sizeof(ClockRange), 1); clockRanges->next = NULL; clockRanges->ClockMulFactor = 1; clockRanges->minClock = 11000; /* guessed ยงยงยง */ @@ -2144,7 +2144,7 @@ neoSave(ScrnInfoPtr pScrn) save->ProgramVCLK = TRUE; if (save->reg == NULL) - save->reg = (regSavePtr)xnfcalloc(sizeof(regSaveRec), 1); + save->reg = (regSavePtr)XNFcallocarray(sizeof(regSaveRec), 1); else xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Non-NULL reg in NeoSave: reg=%p\n", (void *)save->reg); |