XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace XNFcalloc() by calloc()

Browse Source 
Standard C calloc() really is enough here, no need to extra Xserver
wrappers that are in process of being phased out anyways.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-04-14 11:27:17 +02:00
parent 93c6a64bab
commit 5b3109a76e
6 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compat-api.h
View File

@@ -28,10 +28,6 @@
#ifndef COMPAT_API_H
#define COMPAT_API_H
#ifndef XNFcalloc
#define XNFcalloc(n) XNFcallocarray(n, 1)
#endif
#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p

5
src/g80_dac.c
View File

@@ -194,7 +194,10 @@ static const xf86OutputFuncsRec G80DacOutputFuncs = {
xf86OutputPtr
G80CreateDac(ScrnInfoPtr pScrn, ORNum or)
{
G80OutputPrivPtr pPriv = XNFcalloc(sizeof(*pPriv));
G80OutputPrivPtr pPriv = calloc(1, sizeof(*pPriv));
if (!pPriv)
return NULL;
xf86OutputPtr output;
char orName[5];

2
src/g80_display.c
View File

@@ -780,7 +780,7 @@ G80DispCreateCrtcs(ScrnInfoPtr pScrn)
crtc = xf86CrtcCreate(pScrn, &g80_crtc_funcs);
if(!crtc) return;
g80_crtc = XNFcalloc(sizeof(*g80_crtc));
g80_crtc = calloc(1, sizeof(*g80_crtc));
g80_crtc->head = head;
g80_crtc->dither = pNv->Dither;
crtc->driver_private = g80_crtc;

8
src/g80_sor.c
View File

@@ -442,7 +442,9 @@ static const xf86OutputFuncsRec G80SorLVDSOutputFuncs = {
static DisplayModePtr
ReadLVDSNativeMode(G80Ptr pNv, const int off)
{
DisplayModePtr mode = XNFcalloc(sizeof(DisplayModeRec));
DisplayModePtr mode = calloc(1, sizeof(DisplayModeRec));
if (!mode)
return NULL;
const CARD32 size = pNv->reg[(0x00610B4C+off)/4];
const int width = size & 0x3fff;
const int height = (size >> 16) & 0x3fff;
@@ -481,7 +483,9 @@ xf86OutputPtr
G80CreateSor(ScrnInfoPtr pScrn, ORNum or, PanelType panelType)
{
G80Ptr pNv = G80PTR(pScrn);
G80OutputPrivPtr pPriv = XNFcalloc(sizeof(*pPriv));
G80OutputPrivPtr pPriv = calloc(1, sizeof(*pPriv));
if (!pPriv)
return NULL;
const int off = 0x800 * or;
xf86OutputPtr output;
char orName[5];

9
src/nv_driver.c
View File

@@ -695,7 +695,10 @@ NVGetRec(ScrnInfoPtr pScrn)
if (pScrn->driverPrivate != NULL)
return TRUE;
pScrn->driverPrivate = XNFcalloc(sizeof(NVRec));
pScrn->driverPrivate = calloc(1, sizeof(NVRec));
if (!(pScrn->driverPrivate))
return FALSE;
/* Initialise it */
return TRUE;
@@ -1929,7 +1932,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
* and what sort of modes they can be used for.
*/
clockRanges = XNFcalloc(sizeof(ClockRange));
clockRanges = calloc(1, sizeof(ClockRange));
if (!clockRanges)
return FALSE;
clockRanges->next = NULL;
clockRanges->minClock = pNv->MinVClockFreqKHz;
clockRanges->maxClock = pNv->MaxVClockFreqKHz;

6
src/riva_driver.c
View File

@@ -108,7 +108,7 @@ RivaGetRec(ScrnInfoPtr pScrn)
if (pScrn->driverPrivate != NULL)
return TRUE;
pScrn->driverPrivate = XNFcalloc(sizeof(RivaRec));
pScrn->driverPrivate = calloc(1, sizeof(RivaRec));
/* Initialise it */
RivaPTR(pScrn)->Dac = DacInit;
@@ -695,7 +695,9 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
pRiva->MinClock = 12000;
pRiva->MaxClock = pRiva->riva.MaxVClockFreqKHz;
clockRanges = XNFcalloc(sizeof(ClockRange));
clockRanges = calloc(1, sizeof(ClockRange));
if (!clockRanges)
return FALSE;
clockRanges->next = NULL;
clockRanges->minClock = pRiva->MinClock;
clockRanges->maxClock = pRiva->MaxClock;