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

treewide: replace XNFcallocarray with XNFcalloc and add wrap it

Browse Source 
Otherwise older xservers complain, also add a wrapper in case XNFcalloc
is dead.

Signed-off-by: Yusuf Khan <yusisamerican@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv/-/merge_requests/24>
This commit is contained in:
Yusuf Khan
2024-06-05 09:42:58 -05:00
parent 6db1b9fde7
commit a8608636da
6 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compat-api.h
View File

@@ -28,6 +28,10 @@
#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

2
src/g80_dac.c
View File

@@ -194,7 +194,7 @@ static const xf86OutputFuncsRec G80DacOutputFuncs = {
xf86OutputPtr
G80CreateDac(ScrnInfoPtr pScrn, ORNum or)
{
G80OutputPrivPtr pPriv = XNFcallocarray(sizeof(*pPriv), 1);
G80OutputPrivPtr pPriv = XNFcalloc(sizeof(*pPriv));
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 = XNFcallocarray(sizeof(*g80_crtc), 1);
g80_crtc = XNFcalloc(sizeof(*g80_crtc));
g80_crtc->head = head;
g80_crtc->dither = pNv->Dither;
crtc->driver_private = g80_crtc;

4
src/g80_sor.c
View File

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

4
src/nv_driver.c
View File

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

4
src/riva_driver.c
View File

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