diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-05-08 16:31:02 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-05-12 17:03:49 +0000 |
| commit | 965d321ac7600cd4f8fbf340be039dbff5f16ad3 (patch) | |
| tree | 3a52569496d3eb39ff31ab113ebe3c035269d7ee | |
| parent | f753d699fd2d1832e06d9eb3fd2e706fdb15fa39 (diff) | |
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 <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-r128/-/merge_requests/8>
| -rw-r--r-- | src/r128_crtc.c | 4 | ||||
| -rw-r--r-- | src/r128_driver.c | 2 | ||||
| -rw-r--r-- | src/r128_output.c | 2 | ||||
| -rw-r--r-- | src/r128_probe.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/r128_crtc.c b/src/r128_crtc.c index f03a857..bc06e30 100644 --- a/src/r128_crtc.c +++ b/src/r128_crtc.c @@ -1094,7 +1094,7 @@ Bool R128AllocateControllers(ScrnInfoPtr pScrn) if (!pR128Ent->pCrtc[0]) return FALSE; - pR128Ent->Controller[0] = xnfcalloc(sizeof(R128CrtcPrivateRec), 1); + pR128Ent->Controller[0] = XNFcallocarray(sizeof(R128CrtcPrivateRec), 1); if (!pR128Ent->Controller[0]) return FALSE; @@ -1108,7 +1108,7 @@ Bool R128AllocateControllers(ScrnInfoPtr pScrn) if (!pR128Ent->pCrtc[1]) return FALSE; - pR128Ent->Controller[1] = xnfcalloc(sizeof(R128CrtcPrivateRec), 1); + pR128Ent->Controller[1] = XNFcallocarray(sizeof(R128CrtcPrivateRec), 1); if (!pR128Ent->Controller[1]) { free(pR128Ent->Controller[0]); return FALSE; diff --git a/src/r128_driver.c b/src/r128_driver.c index 0821323..fef9c66 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -208,7 +208,7 @@ static Bool R128GetRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate) return TRUE; - pScrn->driverPrivate = xnfcalloc(sizeof(R128InfoRec), 1); + pScrn->driverPrivate = XNFcallocarray(sizeof(R128InfoRec), 1); return TRUE; } diff --git a/src/r128_output.c b/src/r128_output.c index 275ebcc..ebd8203 100644 --- a/src/r128_output.c +++ b/src/r128_output.c @@ -540,7 +540,7 @@ Bool R128SetupConnectors(ScrnInfoPtr pScrn) R128I2CBusRec i2c; R128OutputPrivatePtr r128_output; - r128_output = xnfcalloc(sizeof(R128OutputPrivateRec), 1); + r128_output = XNFcallocarray(sizeof(R128OutputPrivateRec), 1); if (!r128_output) return FALSE; r128_output->MonType = MT_UNKNOWN; diff --git a/src/r128_probe.c b/src/r128_probe.c index 20546c3..1a4532c 100644 --- a/src/r128_probe.c +++ b/src/r128_probe.c @@ -269,7 +269,7 @@ r128_get_scrninfo(int entity_num) if (!pPriv->ptr) { R128EntPtr pR128Ent; - pPriv->ptr = xnfcalloc(sizeof(R128EntRec), 1); + pPriv->ptr = XNFcallocarray(sizeof(R128EntRec), 1); pR128Ent = pPriv->ptr; pR128Ent->HasSecondary = FALSE; pR128Ent->IsSecondaryRestored = FALSE; |