replace obsolete "pointer" typedef by plain void*

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-01-05 17:36:11 +01:00 • committed by Enrico Weigelt
commit 03c42577c9
12 changed files with 28 additions and 28 deletions

View file

@ -137,7 +137,7 @@ ati_device_get_indexed(int index)
#endif
void
ati_gdev_subdriver(pointer options)
ati_gdev_subdriver(void *options)
{
int nATIGDev, nMach64GDev, nR128GDev, nRadeonGDev, nAmdgpuGDev;
GDevPtr *ATIGDevs;

View file

@ -31,6 +31,6 @@
#include "xf86_OSproc.h"
extern void ati_gdev_subdriver(pointer options);
extern void ati_gdev_subdriver(void *options);
#endif /* ___ATI_H___ */

View file

@ -45,11 +45,11 @@ static XF86ModuleVersionInfo ATIVersionRec =
*
* This function is called every time the module is loaded.
*/
static pointer
static void*
ATISetup
(
pointer Module,
pointer Options,
void *Module,
void *Options,
int *ErrorMajor,
int *ErrorMinor
)
@ -62,7 +62,7 @@ ATISetup
ati_gdev_subdriver(Options);
}
return (pointer)1;
return (void*)1;
}
/* The following record must be called atiModuleData */

View file

@ -485,7 +485,7 @@ typedef struct {
Bool (*CloseScreen)(ScreenPtr pScreen);
void (*BlockHandler)(ScreenPtr pScreen, pointer pTimeout);
void (*BlockHandler)(ScreenPtr pScreen, void *pTimeout);
void (*CreateFence) (ScreenPtr pScreen, struct _SyncFence *pFence,
Bool initially_triggered);

View file

@ -430,7 +430,7 @@ radeon_dri2_unref_buffer(BufferPtr buffer)
}
static void
radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer data, pointer calldata)
radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, void *data, void *calldata)
{
NewClientInfoRec *clientinfo = calldata;
ClientPtr pClient = clientinfo->client;
@ -938,7 +938,7 @@ static int radeon_dri2_get_msc(DrawablePtr draw, CARD64 *ust, CARD64 *msc)
}
static
CARD32 radeon_dri2_deferred_event(OsTimerPtr timer, CARD32 now, pointer data)
CARD32 radeon_dri2_deferred_event(OsTimerPtr timer, CARD32 now, void *data)
{
DRI2FrameEventPtr event_info = (DRI2FrameEventPtr)data;
xf86CrtcPtr crtc = event_info->crtc;

View file

@ -69,7 +69,7 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
{
RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
RADEONInfoPtr info = RADEONPTR(scrn);
pointer glamor_module;
void *glamor_module;
CARD32 version;
const char *s;

View file

@ -425,7 +425,7 @@ radeon_glamor_poly_fill_rect(DrawablePtr pDrawable, GCPtr pGC,
static void
radeon_glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
CharInfoPtr *ppci, pointer pglyphBase)
CharInfoPtr *ppci, void *pglyphBase)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(pDrawable->pScreen);
PixmapPtr pixmap = get_drawable_pixmap(pDrawable);
@ -444,7 +444,7 @@ radeon_glamor_image_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
static void
radeon_glamor_poly_glyph_blt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
CharInfoPtr *ppci, pointer pglyphBase)
CharInfoPtr *ppci, void *pglyphBase)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(pDrawable->pScreen);
PixmapPtr pixmap = get_drawable_pixmap(pDrawable);

View file

@ -272,7 +272,7 @@ callback_needs_flush(RADEONInfoPtr info, struct radeon_client_priv *client_priv)
static void
radeon_event_callback(CallbackListPtr *list,
pointer user_data, pointer call_data)
void *user_data, void *call_data)
{
EventInfoRec *eventinfo = call_data;
ScrnInfoPtr pScrn = user_data;
@ -307,7 +307,7 @@ radeon_event_callback(CallbackListPtr *list,
static void
radeon_flush_callback(CallbackListPtr *list,
pointer user_data, pointer call_data)
void *user_data, void *call_data)
{
ScrnInfoPtr pScrn = user_data;
ScreenPtr pScreen = pScrn->pScreen;
@ -1201,7 +1201,7 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info,
drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->flip_pending, fb);
}
static void RADEONBlockHandler_KMS(ScreenPtr pScreen, pointer pTimeout)
static void RADEONBlockHandler_KMS(ScreenPtr pScreen, void *pTimeout)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
RADEONInfoPtr info = RADEONPTR(pScrn);
@ -2582,7 +2582,7 @@ Bool RADEONEnterVT_KMS(ScrnInfoPtr pScrn)
}
static
CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data)
CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, void *data)
{
ScreenPtr screen = data;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);

View file

@ -47,11 +47,11 @@ static XF86ModuleVersionInfo RADEONVersionRec =
*
* This function is called every time the module is loaded.
*/
static pointer
static void *
RADEONSetup
(
pointer Module,
pointer Options,
void *Module,
void *Options,
int *ErrorMajor,
int *ErrorMinor
)
@ -63,7 +63,7 @@ RADEONSetup
xf86AddDriver(&RADEON, Module, HaveDriverFuncs);
}
return (pointer)TRUE;
return (void*)TRUE;
}
/* The following record must be called radeonModuleData */

View file

@ -163,7 +163,7 @@ RADEONFreeVideoMemory(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
}
static void
RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
RADEONStopVideo(ScrnInfoPtr pScrn, void *data, Bool cleanup)
{
RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
@ -220,7 +220,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
short height,
Bool sync,
RegionPtr clipBoxes,
pointer data,
void *data,
DrawablePtr pDraw)
{
ScreenPtr pScreen = pScrn->pScreen;
@ -603,7 +603,7 @@ int
RADEONGetTexPortAttribute(ScrnInfoPtr pScrn,
Atom attribute,
INT32 *value,
pointer data)
void *data)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
@ -645,7 +645,7 @@ int
RADEONSetTexPortAttribute(ScrnInfoPtr pScrn,
Atom attribute,
INT32 value,
pointer data)
void *data)
{
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
@ -737,7 +737,7 @@ RADEONQueryBestSize(
short vid_w, short vid_h,
short drw_w, short drw_h,
unsigned int *p_w, unsigned int *p_h,
pointer data
void *data
){
RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
@ -911,7 +911,7 @@ RADEONSetupImageTexturedVideo(ScreenPtr pScreen)
/* gotta uninit this someplace, XXX: shouldn't be necessary for textured */
REGION_NULL(pScreen, &pPriv->clip);
adapt->pPortPrivates[i].ptr = (pointer) (pPriv);
adapt->pPortPrivates[i].ptr = (void*) (pPriv);
}
if (IS_R500_3D || IS_R300_3D)

View file

@ -31,7 +31,7 @@ radeon_vbo_space(ScrnInfoPtr pScrn,
radeon_vbo_check(pScrn, vbo, vert_size);
vbo->vb_op_vert_size = vert_size;
vb = (pointer)((char *)vbo->vb_bo->ptr + vbo->vb_offset);
vb = (void*)((char *)vbo->vb_bo->ptr + vbo->vb_offset);
return vb;
}

View file

@ -245,7 +245,7 @@ RADEONCopyMungedData(
w /= 2;
for( j = 0; j < h; j++ ) {
dst = (pointer)dst1;
dst = (void*)dst1;
s1 = src1; s2 = src2; s3 = src3;
i = w;
while( i > 4 ) {