From f189faf98bdfd8cac757264bca05a762b67dc0d0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 8 May 2024 14:33:27 +0200 Subject: [PATCH] use XNFcallocarray() instead of xnfcalloc macro 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 Part-of: --- src/ct_driver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ct_driver.c b/src/ct_driver.c index 3bf7dc3..0ea8128 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -782,7 +782,7 @@ CHIPSGetRec(ScrnInfoPtr pScrn) if (pScrn->driverPrivate != NULL) return TRUE; - pScrn->driverPrivate = xnfcalloc(sizeof(CHIPSRec), 1); + pScrn->driverPrivate = XNFcallocarray(sizeof(CHIPSRec), 1); if (pScrn->driverPrivate == NULL) return FALSE; @@ -871,7 +871,7 @@ CHIPSPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev, CHIPSEntityIndex = xf86AllocateEntityPrivateIndex(); pPriv = xf86GetEntityPrivate(pScrn->entityList[0], CHIPSEntityIndex); if (!pPriv->ptr) { - pPriv->ptr = xnfcalloc(sizeof(CHIPSEntRec), 1); + pPriv->ptr = XNFcallocarray(sizeof(CHIPSEntRec), 1); cPtrEnt = pPriv->ptr; cPtrEnt->lastInstance = -1; } else { @@ -955,7 +955,7 @@ CHIPSProbe(DriverPtr drv, int flags) pPriv = xf86GetEntityPrivate(pScrn->entityList[0], CHIPSEntityIndex); if (!pPriv->ptr) { - pPriv->ptr = xnfcalloc(sizeof(CHIPSEntRec), 1); + pPriv->ptr = XNFcallocarray(sizeof(CHIPSEntRec), 1); cPtrEnt = pPriv->ptr; cPtrEnt->lastInstance = -1; } else { @@ -1264,7 +1264,7 @@ CHIPSPreInit(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->ClockMulFactor = cPtr->ClockMulFactor; clockRanges->minClock = cPtr->MinClock; @@ -4095,7 +4095,7 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) miBankInfoPtr pBankInfo; /* Setup the vga banking variables */ - pBankInfo = (miBankInfoPtr)xnfcalloc(sizeof(miBankInfoRec),1); + pBankInfo = (miBankInfoPtr)XNFcallocarray(sizeof(miBankInfoRec),1); if (pBankInfo == NULL) return FALSE;