[Xquartz-changes] xserver: Branch 'server-1.16-apple' - 59 commits
Jeremy Huddleston
jeremyhu at freedesktop.org
Sun Jan 12 23:15:56 PST 2014
Rebased ref, commits from common ancestor:
commit d369d6cd43d9b6041e4efb6eee803ce031eb3cf9
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Tue Dec 18 01:03:38 2012 -0800
fb: Revert fb changes that broke XQuartz
http://bugs.freedesktop.org/show_bug.cgi?id=26124
Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
diff --git a/fb/fb.h b/fb/fb.h
index f584154..25a7eff 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1310,9 +1310,6 @@ extern _X_EXPORT void
extern _X_EXPORT Bool
fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
-extern _X_EXPORT void
-fbDestroyGlyphCache(void);
-
/*
* fbpixmap.c
*/
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 7c2ead5..dc0ca3c 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
free_pixman_pict(pDst, dest);
}
-static pixman_glyph_cache_t *glyphCache;
-
-void
-fbDestroyGlyphCache(void)
-{
- if (glyphCache)
- {
- pixman_glyph_cache_destroy (glyphCache);
- glyphCache = NULL;
- }
-}
-
-static void
-fbUnrealizeGlyph(ScreenPtr pScreen,
- GlyphPtr pGlyph)
-{
- if (glyphCache)
- pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);
-}
-
-static void
-fbGlyphs(CARD8 op,
- PicturePtr pSrc,
- PicturePtr pDst,
- PictFormatPtr maskFormat,
- INT16 xSrc,
- INT16 ySrc, int nlist,
- GlyphListPtr list,
- GlyphPtr *glyphs)
-{
-#define N_STACK_GLYPHS 512
- ScreenPtr pScreen = pDst->pDrawable->pScreen;
- pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
- pixman_glyph_t *pglyphs = stack_glyphs;
- pixman_image_t *srcImage, *dstImage;
- int srcXoff, srcYoff, dstXoff, dstYoff;
- GlyphPtr glyph;
- int n_glyphs;
- int x, y;
- int i, n;
- int xDst = list->xOff, yDst = list->yOff;
-
- miCompositeSourceValidate(pSrc);
-
- n_glyphs = 0;
- for (i = 0; i < nlist; ++i)
- n_glyphs += list[i].len;
-
- if (!glyphCache)
- glyphCache = pixman_glyph_cache_create();
-
- pixman_glyph_cache_freeze (glyphCache);
-
- if (n_glyphs > N_STACK_GLYPHS) {
- if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
- goto out;
- }
-
- i = 0;
- x = y = 0;
- while (nlist--) {
- x += list->xOff;
- y += list->yOff;
- n = list->len;
- while (n--) {
- const void *g;
-
- glyph = *glyphs++;
-
- if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) {
- pixman_image_t *glyphImage;
- PicturePtr pPicture;
- int xoff, yoff;
-
- pPicture = GetGlyphPicture(glyph, pScreen);
- if (!pPicture) {
- n_glyphs--;
- goto next;
- }
-
- if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff)))
- goto out;
-
- g = pixman_glyph_cache_insert(glyphCache, glyph, NULL,
- glyph->info.x,
- glyph->info.y,
- glyphImage);
-
- free_pixman_pict(pPicture, glyphImage);
-
- if (!g)
- goto out;
- }
-
- pglyphs[i].x = x;
- pglyphs[i].y = y;
- pglyphs[i].glyph = g;
- i++;
-
- next:
- x += glyph->info.xOff;
- y += glyph->info.yOff;
- }
- list++;
- }
-
- if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff)))
- goto out;
-
- if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff)))
- goto out_free_src;
-
- if (maskFormat) {
- pixman_format_code_t format;
- pixman_box32_t extents;
-
- format = maskFormat->format | (maskFormat->depth << 24);
-
- pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
-
- pixman_composite_glyphs(op, srcImage, dstImage, format,
- xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
- extents.x1, extents.y1,
- extents.x1 + dstXoff, extents.y1 + dstYoff,
- extents.x2 - extents.x1,
- extents.y2 - extents.y1,
- glyphCache, n_glyphs, pglyphs);
- }
- else {
- pixman_composite_glyphs_no_mask(op, srcImage, dstImage,
- xSrc + srcXoff - xDst, ySrc + srcYoff - yDst,
- dstXoff, dstYoff,
- glyphCache, n_glyphs, pglyphs);
- }
-
- free_pixman_pict(pDst, dstImage);
-
-out_free_src:
- free_pixman_pict(pSrc, srcImage);
-
-out:
- pixman_glyph_cache_thaw(glyphCache);
- if (pglyphs != stack_glyphs)
- free(pglyphs);
-}
-
static pixman_image_t *
create_solid_fill_image(PicturePtr pict)
{
@@ -469,8 +323,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
return FALSE;
ps = GetPictureScreen(pScreen);
ps->Composite = fbComposite;
- ps->Glyphs = fbGlyphs;
- ps->UnrealizeGlyph = fbUnrealizeGlyph;
+ ps->Glyphs = miGlyphs;
ps->CompositeRects = miCompositeRects;
ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
ps->Trapezoids = fbTrapezoids;
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index b2b9739..a88d9c7 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
int d;
DepthPtr depths = pScreen->allowedDepths;
- fbDestroyGlyphCache();
for (d = 0; d < pScreen->numDepths; d++)
free(depths[d].vids);
free(depths);
commit c9a6cd256f49760c70adbfd9fb7df99f1dd0233d
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri Feb 12 19:48:52 2010 -0800
fb: Revert fb changes that broke XQuartz
http://bugs.freedesktop.org/show_bug.cgi?id=26124
Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
Revert "fb: Adjust transform or composite coordinates for pixman operations"
http://bugs.freedesktop.org/26124
This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/fb/fb.h b/fb/fb.h
index 9057767..f584154 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1652,8 +1652,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
RegionPtr pRegion, FbBits and, FbBits xor);
extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
- Bool has_clip,
- int *xoff, int *yoff);
+ Bool has_clip);
extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
diff --git a/fb/fbpict.c b/fb/fbpict.c
index b503858..7c2ead5 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -46,23 +46,18 @@ fbComposite(CARD8 op,
INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
{
pixman_image_t *src, *mask, *dest;
- int src_xoff, src_yoff;
- int msk_xoff, msk_yoff;
- int dst_xoff, dst_yoff;
-
miCompositeSourceValidate(pSrc);
if (pMask)
miCompositeSourceValidate(pMask);
- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
- mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff);
- dest = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff);
+ src = image_from_pict(pSrc, TRUE);
+ mask = image_from_pict(pMask, TRUE);
+ dest = image_from_pict(pDst, TRUE);
if (src && dest && !(pMask && !mask)) {
pixman_image_composite(op, src, mask, dest,
- xSrc + src_xoff, ySrc + src_yoff,
- xMask + msk_xoff, yMask + msk_yoff,
- xDst + dst_xoff, yDst + dst_yoff, width, height);
+ xSrc, ySrc, xMask, yMask, xDst, yDst,
+ width, height);
}
free_pixman_pict(pSrc, src);
@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient)
}
static pixman_image_t *
-create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+create_bits_picture(PicturePtr pict, Bool has_clip)
{
- PixmapPtr pixmap;
FbBits *bits;
FbStride stride;
- int bpp;
+ int bpp, xoff, yoff;
pixman_image_t *image;
- fbGetDrawablePixmap(pict->pDrawable, pixmap, *xoff, *yoff);
- fbGetPixmapBitsData(pixmap, bits, stride, bpp);
+ fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
+
+ bits = (FbBits*)((CARD8*)bits +
+ (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
+ (pict->pDrawable->x + xoff) * (bpp / 8));
image = pixman_image_create_bits((pixman_format_code_t) pict->format,
- pixmap->drawable.width,
- pixmap->drawable.height, (uint32_t *) bits,
+ pict->pDrawable->width,
+ pict->pDrawable->height, (uint32_t *) bits,
stride * sizeof(FbStride));
if (!image)
@@ -329,57 +326,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
if (pict->clientClipType != CT_NONE)
pixman_image_set_has_client_clip(image, TRUE);
- if (*xoff || *yoff)
- pixman_region_translate(pict->pCompositeClip, *xoff, *yoff);
+ pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
pixman_image_set_clip_region(image, pict->pCompositeClip);
- if (*xoff || *yoff)
- pixman_region_translate(pict->pCompositeClip, -*xoff, -*yoff);
+ pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
}
/* Indexed table */
if (pict->pFormat->index.devPrivate)
pixman_image_set_indexed(image, pict->pFormat->index.devPrivate);
- /* Add in drawable origin to position within the image */
- *xoff += pict->pDrawable->x;
- *yoff += pict->pDrawable->y;
-
return image;
}
static pixman_image_t *image_from_pict_internal(PicturePtr pict, Bool has_clip,
- int *xoff, int *yoff,
Bool is_alpha_map);
static void
-set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
- int *xoff, int *yoff, Bool is_alpha_map)
+set_image_properties(pixman_image_t * image, PicturePtr pict, Bool is_alpha_map)
{
pixman_repeat_t repeat;
pixman_filter_t filter;
if (pict->transform) {
- /* For source images, adjust the transform to account
- * for the drawable offset within the pixman image,
- * then set the offset to 0 as it will be used
- * to compute positions within the transformed image.
- */
- if (!has_clip) {
- struct pixman_transform adjusted;
-
- adjusted = *pict->transform;
- pixman_transform_translate(&adjusted,
- NULL,
- pixman_int_to_fixed(*xoff),
- pixman_int_to_fixed(*yoff));
- pixman_image_set_transform(image, &adjusted);
- *xoff = 0;
- *yoff = 0;
- }
- else
- pixman_image_set_transform(image, pict->transform);
+ pixman_image_set_transform(image, pict->transform);
}
switch (pict->repeatType) {
@@ -407,10 +378,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
* as the alpha map for this operation
*/
if (pict->alphaMap && !is_alpha_map) {
- int alpha_xoff, alpha_yoff;
pixman_image_t *alpha_map =
- image_from_pict_internal(pict->alphaMap, FALSE, &alpha_xoff,
- &alpha_yoff, TRUE);
+ image_from_pict_internal(pict->alphaMap, TRUE, TRUE);
pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
pict->alphaOrigin.y);
@@ -444,8 +413,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
}
static pixman_image_t *
-image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
- Bool is_alpha_map)
+image_from_pict_internal(PicturePtr pict, Bool has_clip, Bool is_alpha_map)
{
pixman_image_t *image = NULL;
@@ -453,7 +421,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
return NULL;
if (pict->pDrawable) {
- image = create_bits_picture(pict, has_clip, xoff, yoff);
+ image = create_bits_picture(pict, has_clip);
}
else if (pict->pSourcePict) {
SourcePict *sp = pict->pSourcePict;
@@ -471,19 +439,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
else if (sp->type == SourcePictTypeConical)
image = create_conical_gradient_image(gradient);
}
- *xoff = *yoff = 0;
}
if (image)
- set_image_properties(image, pict, has_clip, xoff, yoff, is_alpha_map);
-
+ set_image_properties (image, pict, is_alpha_map);
return image;
}
pixman_image_t *
-image_from_pict(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+image_from_pict (PicturePtr pict, Bool has_clip)
{
- return image_from_pict_internal(pict, has_clip, xoff, yoff, FALSE);
+ return image_from_pict_internal (pict, has_clip, FALSE);
}
void
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index bf82f8f..0145ce9 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -36,13 +36,12 @@ fbAddTraps(PicturePtr pPicture,
INT16 x_off, INT16 y_off, int ntrap, xTrap * traps)
{
pixman_image_t *image;
- int dst_xoff, dst_yoff;
- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
- return;
-
- pixman_add_traps(image, x_off + dst_xoff, y_off + dst_yoff,
- ntrap, (pixman_trap_t *) traps);
+ if (!(image = image_from_pict (pPicture, FALSE)))
+ return;
+
+ pixman_add_traps(image, x_off, y_off,
+ ntrap, (pixman_trap_t *)traps);
free_pixman_pict(pPicture, image);
}
@@ -52,13 +51,12 @@ fbRasterizeTrapezoid(PicturePtr pPicture,
xTrapezoid * trap, int x_off, int y_off)
{
pixman_image_t *image;
- int dst_xoff, dst_yoff;
- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
+ if (!(image = image_from_pict (pPicture, FALSE)))
return;
- pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *) trap,
- x_off + dst_xoff, y_off + dst_yoff);
+ pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *)trap,
+ x_off, y_off);
free_pixman_pict(pPicture, image);
}
@@ -68,14 +66,12 @@ fbAddTriangles(PicturePtr pPicture,
INT16 x_off, INT16 y_off, int ntri, xTriangle * tris)
{
pixman_image_t *image;
- int dst_xoff, dst_yoff;
- if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
+ if (!(image = image_from_pict (pPicture, FALSE)))
return;
-
- pixman_add_triangles(image,
- dst_xoff + x_off, dst_yoff + y_off,
- ntri, (pixman_triangle_t *) tris);
+
+ pixman_add_triangles(image, x_off, y_off, ntri,
+ (pixman_triangle_t *)tris);
free_pixman_pict(pPicture, image);
}
@@ -98,13 +94,11 @@ fbShapes(CompositeShapesFunc composite,
int16_t ySrc, int nshapes, int shape_size, const uint8_t * shapes)
{
pixman_image_t *src, *dst;
- int src_xoff, src_yoff;
- int dst_xoff, dst_yoff;
miCompositeSourceValidate(pSrc);
- src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
- dst = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff);
+ src = image_from_pict(pSrc, FALSE);
+ dst = image_from_pict(pDst, TRUE);
if (src && dst) {
pixman_format_code_t format;
@@ -121,9 +115,8 @@ fbShapes(CompositeShapesFunc composite,
for (i = 0; i < nshapes; ++i) {
composite(op, src, dst, format,
- xSrc + src_xoff,
- ySrc + src_yoff,
- dst_xoff, dst_yoff, 1, shapes + i * shape_size);
+ xSrc, ySrc, 0, 0,
+ 1, shapes + i * shape_size);
}
}
else {
@@ -143,8 +136,8 @@ fbShapes(CompositeShapesFunc composite,
}
composite(op, src, dst, format,
- xSrc + src_xoff,
- ySrc + src_yoff, dst_xoff, dst_yoff, nshapes, shapes);
+ xSrc, ySrc, 0, 0,
+ nshapes, shapes);
}
DamageRegionProcessPending(pDst->pDrawable);
commit a11ac5efcdd34a0c80ccfb9e513a7a9268884a69
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri Apr 30 13:08:25 2010 -0700
Workaround the GC clipping problem in miPaintWindow and add some debugging output.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 198c433..ad1621d 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -489,7 +489,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
void RootlessStartDrawing(WindowPtr pWin);
void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
Bool IsFramedWindow(WindowPtr pWin);
-#endif
+#include "../fb/fb.h"
+#endif
void
miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
@@ -518,23 +519,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
Bool solid = TRUE;
DrawablePtr drawable = &pWin->drawable;
+#ifdef XQUARTZ_CLIP_DEBUG
+ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative);
+ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1,
+ prgn->extents.x2 - prgn->extents.x1,
+ prgn->extents.y2 - prgn->extents.y1);
+ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y,
+ pWin->winSize.extents.x1, pWin->winSize.extents.y1,
+ pWin->winSize.extents.x2 - pWin->winSize.extents.x1,
+ pWin->winSize.extents.y2 - pWin->winSize.extents.y1);
+ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y,
+ pWin->drawable.width, pWin->drawable.height);
+#endif
+
#ifdef ROOTLESS
if (!drawable || drawable->type == UNDRAWABLE_WINDOW)
return;
+#endif
+
+ if (what == PW_BACKGROUND)
+ {
+#ifdef ROOTLESS
+ if(IsFramedWindow(pWin)) {
+ RootlessStartDrawing(pWin);
+ RootlessDamageRegion(pWin, prgn);
- if (IsFramedWindow(pWin)) {
- RootlessStartDrawing(pWin);
- RootlessDamageRegion(pWin, prgn);
-
- if (pWin->backgroundState == ParentRelative) {
- if ((what == PW_BACKGROUND) ||
- (what == PW_BORDER && !pWin->borderIsPixel))
+ if(pWin->backgroundState == ParentRelative) {
RootlessSetPixmapOfAncestors(pWin);
+ }
}
- }
#endif
- if (what == PW_BACKGROUND) {
while (pWin->backgroundState == ParentRelative)
pWin = pWin->parent;
@@ -559,6 +574,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
else {
PixmapPtr pixmap;
+#ifdef ROOTLESS
+ if(IsFramedWindow(pWin)) {
+ RootlessStartDrawing(pWin);
+ RootlessDamageRegion(pWin, prgn);
+
+ if(!pWin->borderIsPixel &&
+ pWin->backgroundState == ParentRelative) {
+ RootlessSetPixmapOfAncestors(pWin);
+ }
+ }
+#endif
+
tile_x_off = drawable->x;
tile_y_off = drawable->y;
@@ -567,6 +594,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
return;
pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
drawable = &pixmap->drawable;
+
+#ifdef XQUARTZ_CLIP_DEBUG
+ ErrorF(" Draw: %d %d %d %d\n",
+ drawable->x, drawable->y, drawable->width, drawable->height);
+#endif
+
#ifdef COMPOSITE
draw_x_off = pixmap->screen_x;
draw_y_off = pixmap->screen_y;
@@ -629,6 +662,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
ChangeGC(NullClient, pGC, gcmask, gcval);
ValidateGC(drawable, pGC);
+#ifdef XQUARTZ_CLIP_DEBUG
+ ErrorF(" GC: %d %d %d %d\n",
+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
+#endif
+
+#ifdef XQUARTZ
+ /* Looks like our clipping isn't set right for some reason:
+ * http://xquartz.macosforge.org/trac/ticket/290
+ */
+ if(what == PW_BORDER) {
+
+#if 0
+ if(solid) {
+#if 1
+ fbFillRegionSolid(&pWin->drawable,
+ prgn,
+ 0,
+ fbReplicatePixel(fill.pixel,
+ pWin->drawable.bitsPerPixel));
+#else
+ fbFillRegionSolid(drawable,
+ prgn,
+ 0,
+ fbReplicatePixel(fill.pixel,
+ drawable->bitsPerPixel));
+#endif
+ return;
+ }
+#endif
+
+ pGC->pCompositeClip->extents.x1 += prgn->extents.x1;
+ pGC->pCompositeClip->extents.y1 += prgn->extents.y1;
+ pGC->pCompositeClip->extents.x2 += prgn->extents.x1;
+ pGC->pCompositeClip->extents.y2 += prgn->extents.y1;
+
+ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width)
+ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width;
+ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height)
+ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height;
+ }
+#endif
+
+#ifdef XQUARTZ_CLIP_DEBUG
+ ErrorF(" GC: %d %d %d %d\n",
+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
+#endif
+
numRects = RegionNumRects(prgn);
pbox = RegionRects(prgn);
for (i = numRects; --i >= 0; pbox++, prect++) {
commit 9c335fbc292aa47a0a954578271ba3d807ae09ce
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri Jan 13 12:00:57 2012 -0800
sdksyms.sh: Use CPPFLAGS, not CFLAGS
CFLAGS can include flags which are not useful to the preprocessor
or can even cause it to fail. This fixes a build issue on darwin
when building for more than one architecture.
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 9672904..5e5bb91 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -43,8 +43,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
bin_PROGRAMS = Xorg
nodist_Xorg_SOURCES = sdksyms.c
-AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
@@ -118,7 +117,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
EXTRA_DIST += sdksyms.sh
sdksyms.dep sdksyms.c: sdksyms.sh
- $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
+ $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
SDKSYMS_DEP = sdksyms.dep
-include $(SDKSYMS_DEP)
commit 77df653ae3d8448be21221711851acde12c6bc1a
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Jan 1 11:10:41 2014 -0800
XQuartz: Avoid passing uninitialized pointers to X11ApplicationSetWindowMenu in AppleWMSetWindowMenu
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 9ff0ff6..cc91c96 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -398,6 +398,15 @@ ProcAppleWMSetWindowMenu(register ClientPtr client)
break;
}
}
+
+ /* Check if we bailed out of the above loop due to a request that was too long */
+ if (j < nitems) {
+ free(items);
+ free(shortcuts);
+
+ return BadRequest;
+ }
+
X11ApplicationSetWindowMenu(nitems, items, shortcuts);
free(items);
free(shortcuts);
commit 3bc608a361a01043b226fb9aaebf88f6fd852925
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Jan 1 11:04:07 2014 -0800
XQuartz: Check for allocated memory before using it in AppleWMSetWindowMenu
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 4409d4b..9ff0ff6 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -378,6 +378,13 @@ ProcAppleWMSetWindowMenu(register ClientPtr client)
items = malloc(sizeof(char *) * nitems);
shortcuts = malloc(sizeof(char) * nitems);
+ if (!items || !shortcuts) {
+ free(items);
+ free(shortcuts);
+
+ return BadAlloc;
+ }
+
max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);
bytes = (char *)&stuff[1];
commit 64327226ddfba8f0653615cd678d2d4336fb993d
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Jan 1 11:00:40 2014 -0800
XQuartz: Silence a clang static analysis warning about a memory leak
It seems the alanyzer can't comprehend dixSetPrivate().
quartz.c:119:12: warning: Potential leak of memory pointed to by 'displayInfo'
return quartzProcs->AddScreen(index, pScreen);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 5b977c7..bc6c8d0 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -109,11 +109,14 @@ Bool
QuartzAddScreen(int index,
ScreenPtr pScreen)
{
+ // The clang static analyzer thinks we leak displayInfo here
+#ifndef __clang_analyzer__
// allocate space for private per screen Quartz specific storage
QuartzScreenPtr displayInfo = calloc(sizeof(QuartzScreenRec), 1);
// QUARTZ_PRIV(pScreen) = displayInfo;
dixSetPrivate(&pScreen->devPrivates, quartzScreenKey, displayInfo);
+#endif /* __clang_analyzer__ */
// do Quartz mode specific initialization
return quartzProcs->AddScreen(index, pScreen);
commit b2f6b3497c33a4897afae80a2cf69c596b9f81e8
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Jan 1 10:55:10 2014 -0800
XQuartz: Silence a clang static analysis warning about a possible memory leak on exit
stub.c:356:9: warning: Potential leak of memory pointed to by 'newargv'
asl_log(aslc, NULL, ASL_LEVEL_ERR,
^~~~~~~
stub.c:356:9: warning: Potential leak of memory pointed to by 'newenvp'
asl_log(aslc, NULL, ASL_LEVEL_ERR,
^~~~~~~
2 warnings generated.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index b5a3168..756e4ef 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -353,6 +353,10 @@ main(int argc, char **argv, char **envp)
newenvp = (string_array_t)calloc((1 + envpc), sizeof(string_t));
if (!newargv || !newenvp) {
+ /* Silence the clang static analyzer */
+ free(newargv);
+ free(newenvp);
+
asl_log(aslc, NULL, ASL_LEVEL_ERR,
"Xquartz: Memory allocation failure");
return EXIT_FAILURE;
commit a03f096a85537d9e881cedaa6cb71aca43a97086
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Jan 1 10:47:52 2014 -0800
XQuartz: Validate length in appledri before swapping
Avoids potential memory corruption from bad requests
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index d7e9844..7757465 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -406,6 +406,7 @@ SProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client)
{
REQUEST(xAppleDRIQueryDirectRenderingCapableReq);
swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xAppleDRIQueryDirectRenderingCapableReq);
swapl(&stuff->screen);
return ProcAppleDRIQueryDirectRenderingCapable(client);
}
@@ -415,6 +416,7 @@ SProcAppleDRIAuthConnection(register ClientPtr client)
{
REQUEST(xAppleDRIAuthConnectionReq);
swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xAppleDRIAuthConnectionReq);
swapl(&stuff->screen);
swapl(&stuff->magic);
return ProcAppleDRIAuthConnection(client);
@@ -425,6 +427,7 @@ SProcAppleDRICreateSurface(register ClientPtr client)
{
REQUEST(xAppleDRICreateSurfaceReq);
swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xAppleDRICreateSurfaceReq);
swapl(&stuff->screen);
swapl(&stuff->drawable);
swapl(&stuff->client_id);
@@ -436,6 +439,7 @@ SProcAppleDRIDestroySurface(register ClientPtr client)
{
REQUEST(xAppleDRIDestroySurfaceReq);
swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xAppleDRIDestroySurfaceReq);
swapl(&stuff->screen);
swapl(&stuff->drawable);
return ProcAppleDRIDestroySurface(client);
@@ -446,6 +450,7 @@ SProcAppleDRICreatePixmap(register ClientPtr client)
{
REQUEST(xAppleDRICreatePixmapReq);
swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xAppleDRICreatePixmapReq);
swapl(&stuff->screen);
swapl(&stuff->drawable);
return ProcAppleDRICreatePixmap(client);
@@ -456,6 +461,7 @@ SProcAppleDRIDestroyPixmap(register ClientPtr client)
{
REQUEST(xAppleDRIDestroyPixmapReq);
swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xAppleDRIDestroyPixmapReq);
swapl(&stuff->drawable);
return ProcAppleDRIDestroyPixmap(client);
}
commit b3572c0d1ab7888ac26d6b2b8be6d1d19ed9af3f
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Wed Jan 1 10:39:56 2014 -0800
XQuartz: Validate screen in AppleDRIQueryDirectRenderingCapable requests
Return an error to the caller rather than crashing the server on
invalid screens.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 9aac072..d7e9844 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -123,6 +123,10 @@ ProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client)
rep.length = 0;
rep.sequenceNumber = client->sequence;
+ if (stuff->screen >= screenInfo.numScreens) {
+ return BadValue;
+ }
+
if (!DRIQueryDirectRenderingCapable(screenInfo.screens[stuff->screen],
&isCapable)) {
return BadValue;
commit 959e8f23af7850fcaf40d6c67f5228241a36a9ab
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Dec 29 12:45:23 2013 -0800
XQuartz: Simplify hook_run to quiet static analyzer
x-hook.c:96:9: warning: Called function pointer is an uninitalized pointer value
(*fun[i])(arg, data[i]);
^~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c
index b5d8ab9..3922bb8 100644
--- a/hw/xquartz/xpr/x-hook.c
+++ b/hw/xquartz/xpr/x-hook.c
@@ -70,34 +70,19 @@ X_PFX(hook_remove) (x_list * lst, x_hook_function * fun, void *data) {
X_EXTERN void
X_PFX(hook_run) (x_list * lst, void *arg) {
- x_list *node, *cell;
- x_hook_function **fun;
- void **data;
- int length, i;
+ x_list *node;
if (!lst)
return;
- length = X_PFX(list_length) (lst);
- fun = malloc(sizeof(x_hook_function *) * length);
- data = malloc(sizeof(void *) * length);
-
- if (!fun || !data) {
- FatalError("Failed to allocate memory in %s\n", __func__);
- }
+ for (node = lst; node != NULL; node = node->next) {
+ x_list *cell = node->data;
- for (i = 0, node = lst; node != NULL; node = node->next, i++) {
- cell = node->data;
- fun[i] = CELL_FUN(cell);
- data[i] = CELL_DATA(cell);
- }
+ x_hook_function *fun = CELL_FUN(cell);
+ void *data = CELL_DATA(cell);
- for (i = 0; i < length; i++) {
- (*fun[i])(arg, data[i]);
+ (*fun)(arg, data);
}
-
- free(fun);
- free(data);
}
X_EXTERN void
commit f79af1941776fd6f1ec26c50603fcc35ca7d514b
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Dec 29 12:41:18 2013 -0800
XQuartz: Mark applicationWillTerminate: noreturn
X11Controller.m:938:1: warning: method 'applicationWillTerminate:' could be declared with attribute 'noreturn'
[-Wmissing-noreturn,Semantic Issue]
{
^
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 752bda3..5445c6f 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -934,7 +934,7 @@ extern char *bundle_id_prefix;
== NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
}
-- (void) applicationWillTerminate:(NSNotification *)aNotification
+- (void) applicationWillTerminate:(NSNotification *)aNotification _X_NORETURN
{
int remain;
[X11App prefs_synchronize];
commit ea80279e292e59a9fe9651489f03e9f2f39810d9
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Dec 29 12:36:51 2013 -0800
XQuartz: Fix get_proc_address signature
indirect.c:675:28: warning: incompatible pointer types passing 'glx_gpa_proc (*)(const char *)' to parameter of type
'glx_gpa_proc' (aka 'glx_func_ptr (*)(const char *)') [-Wincompatible-pointer-types,Semantic Issue]
__glXsetGetProcAddress(&get_proc_address);
^~~~~~~~~~~~~~~~~
../../../glx/glxserver.h:122:42: note: passing argument to parameter 'get_proc_address' here [Semantic Issue]
void __glXsetGetProcAddress(glx_gpa_proc get_proc_address);
^
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 8dabda1..19b7d86 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -643,10 +643,10 @@ __glFloorLog2(GLuint val)
static void *opengl_framework_handle;
-static glx_gpa_proc
+static glx_func_ptr
get_proc_address(const char *sym)
{
- return (glx_gpa_proc) dlsym(opengl_framework_handle, sym);
+ return (glx_func_ptr) dlsym(opengl_framework_handle, sym);
}
static void
commit 2e3ebec9520719a8e5c3c92390e83bcb5216f978
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Dec 29 12:31:23 2013 -0800
XQuartz: Fix darwinfb.h header guard
./darwinfb.h:28:9: warning: '_DARWIN_FB_H' is used as a header guard here, followed by #define of a different macro
[-Wheader-guard,Lexical or Preprocessor Issue]
^~~~~~~~~~~~
./darwinfb.h:29:9: note: '_DARWIN_DB_H' is defined here; did you mean '_DARWIN_FB_H'? [Lexical or Preprocessor Issue]
^~~~~~~~~~~~
_DARWIN_FB_H
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/darwinfb.h b/hw/xquartz/darwinfb.h
index 5de360d..541128b 100644
--- a/hw/xquartz/darwinfb.h
+++ b/hw/xquartz/darwinfb.h
@@ -26,7 +26,7 @@
*/
#ifndef _DARWIN_FB_H
-#define _DARWIN_DB_H
+#define _DARWIN_FB_H
#include "scrnintstr.h"
commit 9da6c0918f40359f28fe8889d5b7cae7efcc8377
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Dec 29 12:22:55 2013 -0800
XQuartz: Silence some static analyzer warnings by annotating referencing counts
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 1f9b05d..2efbd65 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -70,6 +70,18 @@ xpbproxy_run(void);
static dispatch_queue_t eventTranslationQueue;
#endif
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+#ifndef CF_RETURNS_RETAINED
+#if __has_feature(attribute_cf_returns_retained)
+#define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
+#else
+#define CF_RETURNS_RETAINED
+#endif
+#endif
+
extern Bool noTestExtensions;
extern Bool noRenderExtension;
extern BOOL serverRunning;
@@ -526,6 +538,7 @@ cfrelease(CFAllocatorRef a, const void *b)
CFRelease(b);
}
+CF_RETURNS_RETAINED
static CFMutableArrayRef
nsarray_to_cfarray(NSArray *in)
{
commit 2d2d49dab5c5718989de97d7227aac793479745e
Author: Keith Packard <keithp at keithp.com>
Date: Sun Dec 29 15:18:28 2013 -0800
Clean up a few function prototypes to not place formals in /**/
This just removes the comment markers from around the formals in
several function prototypes near where pointer -> void * changes were
made. There are plenty more of these to fix.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/Xext/saver.c b/Xext/saver.c
index 03f28bb..8e92fdf 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -107,9 +107,7 @@ typedef struct _ScreenSaverSuspension {
int count;
} ScreenSaverSuspensionRec;
-static int ScreenSaverFreeSuspend(void */*value */ ,
- XID /* id */
- );
+static int ScreenSaverFreeSuspend(void *value, XID id);
/*
* each screen has a list of clients requesting
@@ -131,18 +129,14 @@ typedef struct _ScreenSaverEvent {
CARD32 mask;
} ScreenSaverEventRec;
-static int ScreenSaverFreeEvents(void * /* value */ ,
- XID /* id */
- );
+static int ScreenSaverFreeEvents(void * value, XID id);
-static Bool setEventMask(ScreenPtr /* pScreen */ ,
- ClientPtr /* client */ ,
- unsigned long /* mask */
- );
+static Bool setEventMask(ScreenPtr pScreen,
+ ClientPtr client,
+ unsigned long mask);
-static unsigned long getEventMask(ScreenPtr /* pScreen */ ,
- ClientPtr /* client */
- );
+static unsigned long getEventMask(ScreenPtr pScreen,
+ ClientPtr client);
/*
* when a client sets the screen saver attributes, a resource is
@@ -168,21 +162,16 @@ typedef struct _ScreenSaverAttr {
unsigned long *values;
} ScreenSaverAttrRec, *ScreenSaverAttrPtr;
-static int ScreenSaverFreeAttr(void */* value */ ,
- XID /* id */
- );
+static int ScreenSaverFreeAttr(void *value, XID id);
-static void FreeAttrs(ScreenSaverAttrPtr /* pAttr */
- );
+static void FreeAttrs(ScreenSaverAttrPtr pAttr);
-static void FreeScreenAttr(ScreenSaverAttrPtr /* pAttr */
- );
+static void FreeScreenAttr(ScreenSaverAttrPtr pAttr);
static void
- SendScreenSaverNotify(ScreenPtr /* pScreen */ ,
- int /* state */ ,
- Bool /* forced */
- );
+SendScreenSaverNotify(ScreenPtr pScreen,
+ int state,
+ Bool forced);
typedef struct _ScreenSaverScreenPrivate {
ScreenSaverEventPtr events;
@@ -191,8 +180,7 @@ typedef struct _ScreenSaverScreenPrivate {
Colormap installedMap;
} ScreenSaverScreenPrivateRec, *ScreenSaverScreenPrivatePtr;
-static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr /* pScreen */
- );
+static ScreenSaverScreenPrivatePtr MakeScreenPrivate(ScreenPtr pScreen);
static DevPrivateKeyRec ScreenPrivateKeyRec;
diff --git a/Xext/shm.c b/Xext/shm.c
index 34545ec..4dad8b6 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -99,14 +99,10 @@ typedef struct _ShmScrPrivateRec {
} ShmScrPrivateRec;
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
-static int ShmDetachSegment(void */* value */ ,
- XID /* shmseg */
- );
-static void ShmResetProc(ExtensionEntry * /* extEntry */
- );
-static void SShmCompletionEvent(xShmCompletionEvent * /* from */ ,
- xShmCompletionEvent * /* to */
- );
+static int ShmDetachSegment(void *value, XID shmseg);
+static void ShmResetProc(ExtensionEntry *extEntry);
+static void SShmCompletionEvent(xShmCompletionEvent *from,
+ xShmCompletionEvent *to);
static Bool ShmDestroyPixmap(PixmapPtr pPixmap);
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 220040f..5de74c8 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -556,8 +556,7 @@ ProcessWorkQueueZombies(void)
}
Bool
-QueueWorkProc(Bool (*function)
- (ClientPtr /* pClient */ , void */* closure */ ),
+QueueWorkProc(Bool (*function) (ClientPtr pClient, void *closure),
ClientPtr client, void *closure)
{
WorkQueuePtr q;
diff --git a/mi/migc.h b/mi/migc.h
index fb9f35c..8d06a6f 100644
--- a/mi/migc.h
+++ b/mi/migc.h
@@ -26,31 +26,24 @@ from The Open Group.
*/
-extern _X_EXPORT void miChangeGC(GCPtr /*pGC */ ,
- unsigned long /*mask */
- );
-
-extern _X_EXPORT void miDestroyGC(GCPtr /*pGC */
- );
-
-extern _X_EXPORT void miDestroyClip(GCPtr /*pGC */
- );
-
-extern _X_EXPORT void miChangeClip(GCPtr /*pGC */ ,
- int /*type */ ,
- void */*pvalue */ ,
- int /*nrects */
- );
-
-extern _X_EXPORT void miCopyClip(GCPtr /*pgcDst */ ,
- GCPtr /*pgcSrc */
- );
-
-extern _X_EXPORT void miCopyGC(GCPtr /*pGCSrc */ ,
- unsigned long /*changes */ ,
- GCPtr /*pGCDst */
- );
-
-extern _X_EXPORT void miComputeCompositeClip(GCPtr /*pGC */ ,
- DrawablePtr /*pDrawable */
- );
+extern _X_EXPORT void miChangeGC(GCPtr pGC,
+ unsigned long mask);
+
+extern _X_EXPORT void miDestroyGC(GCPtr pGC);
+
+extern _X_EXPORT void miDestroyClip(GCPtr pGC);
+
+extern _X_EXPORT void miChangeClip(GCPtr pGC,
+ int type,
+ void *pvalue,
+ int nrects);
+
+extern _X_EXPORT void miCopyClip(GCPtr pgcDst,
+ GCPtr pgcSrc);
+
+extern _X_EXPORT void miCopyGC(GCPtr pGCSrc,
+ unsigned long changes,
+ GCPtr pGCDst);
+
+extern _X_EXPORT void miComputeCompositeClip(GCPtr pGC,
+ DrawablePtr pDrawable);
diff --git a/os/xdmcp.c b/os/xdmcp.c
index da509e4..fd8ae58 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -145,43 +145,46 @@ static void get_xdmcp_sock(void);
static void send_query_msg(void);
-static void recv_willing_msg(struct sockaddr * /*from */ ,
- int /*fromlen */ ,
- unsigned /*length */ );
+static void recv_willing_msg(struct sockaddr *from,
+ int fromlen,
+ unsigned length);
static void send_request_msg(void);
-static void recv_accept_msg(unsigned /*length */ );
+static void recv_accept_msg(unsigned length);
-static void recv_decline_msg(unsigned /*length */ );
+static void recv_decline_msg(unsigned length);
static void send_manage_msg(void);
-static void recv_refuse_msg(unsigned /*length */ );
+static void recv_refuse_msg(unsigned length);
-static void recv_failed_msg(unsigned /*length */ );
+static void recv_failed_msg(unsigned length);
static void send_keepalive_msg(void);
-static void recv_alive_msg(unsigned /*length */ );
+static void recv_alive_msg(unsigned length );
-static void XdmcpFatal(const char * /*type */ ,
- ARRAY8Ptr /*status */ );
+static void XdmcpFatal(const char *type,
+ ARRAY8Ptr status);
-static void XdmcpWarning(const char * /*str */ );
+static void XdmcpWarning(const char *str);
-static void get_manager_by_name(int /*argc */ ,
- char ** /*argv */ ,
- int /*i */ );
+static void get_manager_by_name(int argc,
+ char **argv,
+ int i);
-static void get_fromaddr_by_name(int /*argc */ , char ** /*argv */ ,
- int /*i */ );
+static void get_fromaddr_by_name(int argc,
+ char **argv,
+ int i);
#if defined(IPv6) && defined(AF_INET6)
-static int get_mcast_options(int /*argc */ , char ** /*argv */ , int /*i */ );
+static int get_mcast_options(int argc,
+ char **argv,
+ int i);
#endif
-static void receive_packet(int /*socketfd */ );
+static void receive_packet(int socketfd);
static void send_packet(void);
@@ -189,13 +192,13 @@ static void timeout(void);
static void restart(void);
-static void XdmcpBlockHandler(void */*data */ ,
- struct timeval ** /*wt */ ,
- void */*LastSelectMask */ );
+static void XdmcpBlockHandler(void *data ,
+ struct timeval **wt,
+ void *LastSelectMask);
-static void XdmcpWakeupHandler(void */*data */ ,
- int /*i */ ,
- void */*LastSelectMask */ );
+static void XdmcpWakeupHandler(void *data,
+ int i,
+ void *LastSelectMask);
/*
* Register the Manufacturer display ID
diff --git a/record/record.c b/record/record.c
index 8217a44..c900219 100644
--- a/record/record.c
+++ b/record/record.c
@@ -136,9 +136,8 @@ static int numEnabledRCAPs;
return rc; \
}
-static int RecordDeleteContext(void */*value */ ,
- XID /*id */
- );
+static int RecordDeleteContext(void *value,
+ XID id);
/***************************************************************************/
commit 60014a4a98ff924ae7f6840781f768c1cc93bbab
Author: Keith Packard <keithp at keithp.com>
Date: Sun Dec 15 01:05:51 2013 -0800
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
diff --git a/Xext/geext.c b/Xext/geext.c
index 1e5ae6f..aee68c4 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -150,7 +150,7 @@ SProcGEDispatch(ClientPtr client)
* used in the furture for versioning support.
*/
static void
-GEClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+GEClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
diff --git a/Xext/hashtable.c b/Xext/hashtable.c
index 76ebc6d..471ecca 100644
--- a/Xext/hashtable.c
+++ b/Xext/hashtable.c
@@ -23,7 +23,7 @@ struct HashTableRec {
HashFunc hash;
HashCompareFunc compare;
- pointer cdata;
+ void *cdata;
};
typedef struct {
@@ -37,7 +37,7 @@ ht_create(int keySize,
int dataSize,
HashFunc hash,
HashCompareFunc compare,
- pointer cdata)
+ void *cdata)
{
int c;
int numBuckets;
@@ -117,7 +117,7 @@ double_size(HashTable ht)
}
}
-pointer
+void *
ht_add(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
@@ -182,7 +182,7 @@ ht_remove(HashTable ht, const void *key)
}
}
-pointer
+void *
ht_find(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
diff --git a/Xext/hashtable.h b/Xext/hashtable.h
index 8a65732..a988af3 100644
--- a/Xext/hashtable.h
+++ b/Xext/hashtable.h
@@ -55,7 +55,7 @@ extern _X_EXPORT HashTable ht_create(int keySize,
int dataSize,
HashFunc hash,
HashCompareFunc compare,
- pointer cdata);
+ void *cdata);
/** @brief HtDestruct deinitializes the structure. It does not free the
memory allocated to HashTableRec
*/
@@ -75,7 +75,7 @@ extern _X_EXPORT void ht_destroy(HashTable ht);
to avoid returning NULL. Obviously the data pointed cannot be
modified, as implied by dataSize being 0.
*/
-extern _X_EXPORT pointer ht_add(HashTable ht, const void *key);
+extern _X_EXPORT void *ht_add(HashTable ht, const void *key);
/** @brief Removes a key from the hash table along with its
associated data, which will be free'd.
@@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, const void *key);
use HtMember instead to determine if a key has been
inserted.
*/
-extern _X_EXPORT pointer ht_find(HashTable ht, const void *key);
+extern _X_EXPORT void *ht_find(HashTable ht, const void *key);
/** @brief A generic hash function */
extern _X_EXPORT unsigned ht_generic_hash(void *cdata,
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 6f8939f..4d79c46 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -130,7 +130,7 @@ static void XineramaValidateGC(GCPtr, unsigned long, DrawablePtr);
static void XineramaChangeGC(GCPtr, unsigned long);
static void XineramaCopyGC(GCPtr, unsigned long, GCPtr);
static void XineramaDestroyGC(GCPtr);
-static void XineramaChangeClip(GCPtr, int, pointer, int);
+static void XineramaChangeClip(GCPtr, int, void *, int);
static void XineramaDestroyClip(GCPtr);
static void XineramaCopyClip(GCPtr, GCPtr);
@@ -160,7 +160,7 @@ XineramaCloseScreen(ScreenPtr pScreen)
if (pScreen->myNum == 0)
RegionUninit(&PanoramiXScreenRegion);
- free((pointer) pScreenPriv);
+ free(pScreenPriv);
return (*pScreen->CloseScreen) (pScreen);
}
@@ -294,7 +294,7 @@ XineramaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
}
static void
-XineramaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+XineramaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
Xinerama_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
@@ -318,7 +318,7 @@ XineramaDestroyClip(GCPtr pGC)
}
int
-XineramaDeleteResource(pointer data, XID id)
+XineramaDeleteResource(void *data, XID id)
{
free(data);
return 1;
@@ -330,7 +330,7 @@ typedef struct {
} PanoramiXSearchData;
static Bool
-XineramaFindIDByScrnum(pointer resource, XID id, pointer privdata)
+XineramaFindIDByScrnum(void *resource, XID id, void *privdata)
{
PanoramiXRes *res = (PanoramiXRes *) resource;
PanoramiXSearchData *data = (PanoramiXSearchData *) privdata;
@@ -342,7 +342,7 @@ PanoramiXRes *
PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen)
{
PanoramiXSearchData data;
- pointer val;
+ void *val;
if (!screen) {
dixLookupResourceByType(&val, id, type, serverClient, DixReadAccess);
@@ -691,9 +691,9 @@ PanoramiXCreateConnectionBlock(void)
root->mmHeight *= height_mult;
while (ConnectionCallbackList) {
- pointer tmp;
+ void *tmp;
- tmp = (pointer) ConnectionCallbackList;
+ tmp = (void *) ConnectionCallbackList;
(*ConnectionCallbackList->func) ();
ConnectionCallbackList = ConnectionCallbackList->next;
free(tmp);
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 576844c..83a2e08 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -72,7 +72,7 @@ PanoramiXCreateWindow(ClientPtr client)
if (Ones(stuff->mask) != len)
return BadLength;
- result = dixLookupResourceByType((pointer *) &parent, stuff->parent,
+ result = dixLookupResourceByType((void **) &parent, stuff->parent,
XRT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
@@ -87,7 +87,7 @@ PanoramiXCreateWindow(ClientPtr client)
pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) {
- result = dixLookupResourceByType((pointer *) &backPix, tmp,
+ result = dixLookupResourceByType((void **) &backPix, tmp,
XRT_PIXMAP, client, DixReadAccess);
if (result != Success)
return result;
@@ -97,7 +97,7 @@ PanoramiXCreateWindow(ClientPtr client)
pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) {
- result = dixLookupResourceByType((pointer *) &bordPix, tmp,
+ result = dixLookupResourceByType((void **) &bordPix, tmp,
XRT_PIXMAP, client, DixReadAccess);
if (result != Success)
return result;
@@ -107,7 +107,7 @@ PanoramiXCreateWindow(ClientPtr client)
cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) {
- result = dixLookupResourceByType((pointer *) &cmap, tmp,
+ result = dixLookupResourceByType((void **) &cmap, tmp,
XRT_COLORMAP, client,
DixReadAccess);
if (result != Success)
@@ -178,7 +178,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
if (Ones(stuff->valueMask) != len)
return BadLength;
- result = dixLookupResourceByType((pointer *) &win, stuff->window,
+ result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
@@ -191,7 +191,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
pback_offset = Ones((Mask) stuff->valueMask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) {
- result = dixLookupResourceByType((pointer *) &backPix, tmp,
+ result = dixLookupResourceByType((void **) &backPix, tmp,
XRT_PIXMAP, client, DixReadAccess);
if (result != Success)
return result;
@@ -201,7 +201,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
pbord_offset = Ones((Mask) stuff->valueMask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) {
- result = dixLookupResourceByType((pointer *) &bordPix, tmp,
+ result = dixLookupResourceByType((void **) &bordPix, tmp,
XRT_PIXMAP, client, DixReadAccess);
if (result != Success)
return result;
@@ -211,7 +211,7 @@ PanoramiXChangeWindowAttributes(ClientPtr client)
cmap_offset = Ones((Mask) stuff->valueMask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) {
- result = dixLookupResourceByType((pointer *) &cmap, tmp,
+ result = dixLookupResourceByType((void **) &cmap, tmp,
XRT_COLORMAP, client,
DixReadAccess);
if (result != Success)
@@ -243,7 +243,7 @@ PanoramiXDestroyWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->id, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW,
client, DixDestroyAccess);
if (result != Success)
return result;
@@ -271,7 +271,7 @@ PanoramiXDestroySubwindows(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->id, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &win, stuff->id, XRT_WINDOW,
client, DixDestroyAccess);
if (result != Success)
return result;
@@ -299,7 +299,7 @@ PanoramiXChangeSaveSet(ClientPtr client)
REQUEST_SIZE_MATCH(xChangeSaveSetReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->window,
+ result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixReadAccess);
if (result != Success)
return result;
@@ -326,12 +326,12 @@ PanoramiXReparentWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xReparentWindowReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->window,
+ result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &parent, stuff->parent,
+ result = dixLookupResourceByType((void **) &parent, stuff->parent,
XRT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
@@ -365,7 +365,7 @@ PanoramiXMapWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->id,
+ result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess);
if (result != Success)
return result;
@@ -390,7 +390,7 @@ PanoramiXMapSubwindows(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->id,
+ result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess);
if (result != Success)
return result;
@@ -415,7 +415,7 @@ PanoramiXUnmapWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->id,
+ result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess);
if (result != Success)
return result;
@@ -440,7 +440,7 @@ PanoramiXUnmapSubwindows(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->id,
+ result = dixLookupResourceByType((void **) &win, stuff->id,
XRT_WINDOW, client, DixReadAccess);
if (result != Success)
return result;
@@ -474,12 +474,12 @@ PanoramiXConfigureWindow(ClientPtr client)
return BadLength;
/* because we need the parent */
- result = dixLookupResourceByType((pointer *) &pWin, stuff->window,
+ result = dixLookupResourceByType((void **) &pWin, stuff->window,
RT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &win, stuff->window,
+ result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
@@ -489,7 +489,7 @@ PanoramiXConfigureWindow(ClientPtr client)
sib_offset = Ones((Mask) stuff->mask & (CWSibling - 1));
if ((tmp = *((CARD32 *) &stuff[1] + sib_offset))) {
- result = dixLookupResourceByType((pointer *) &sib, tmp, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &sib, tmp, XRT_WINDOW,
client, DixReadAccess);
if (result != Success)
return result;
@@ -537,7 +537,7 @@ PanoramiXCirculateWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xCirculateWindowReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->window,
+ result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
@@ -687,7 +687,7 @@ PanoramiXCreatePixmap(ClientPtr client)
REQUEST_SIZE_MATCH(xCreatePixmapReq);
client->errorValue = stuff->pid;
- result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable,
XRC_DRAWABLE, client, DixReadAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -727,7 +727,7 @@ PanoramiXFreePixmap(ClientPtr client)
client->errorValue = stuff->id;
- result = dixLookupResourceByType((pointer *) &pix, stuff->id, XRT_PIXMAP,
+ result = dixLookupResourceByType((void **) &pix, stuff->id, XRT_PIXMAP,
client, DixDestroyAccess);
if (result != Success)
return result;
@@ -766,7 +766,7 @@ PanoramiXCreateGC(ClientPtr client)
if (Ones(stuff->mask) != len)
return BadLength;
- result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable,
XRC_DRAWABLE, client, DixReadAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -774,7 +774,7 @@ PanoramiXCreateGC(ClientPtr client)
if ((Mask) stuff->mask & GCTile) {
tile_offset = Ones((Mask) stuff->mask & (GCTile - 1));
if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) {
- result = dixLookupResourceByType((pointer *) &tile, tmp, XRT_PIXMAP,
+ result = dixLookupResourceByType((void **) &tile, tmp, XRT_PIXMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -783,7 +783,7 @@ PanoramiXCreateGC(ClientPtr client)
if ((Mask) stuff->mask & GCStipple) {
stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1));
if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) {
- result = dixLookupResourceByType((pointer *) &stip, tmp, XRT_PIXMAP,
+ result = dixLookupResourceByType((void **) &stip, tmp, XRT_PIXMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -792,7 +792,7 @@ PanoramiXCreateGC(ClientPtr client)
if ((Mask) stuff->mask & GCClipMask) {
clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1));
if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) {
- result = dixLookupResourceByType((pointer *) &clip, tmp, XRT_PIXMAP,
+ result = dixLookupResourceByType((void **) &clip, tmp, XRT_PIXMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -846,7 +846,7 @@ PanoramiXChangeGC(ClientPtr client)
if (Ones(stuff->mask) != len)
return BadLength;
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -854,7 +854,7 @@ PanoramiXChangeGC(ClientPtr client)
if ((Mask) stuff->mask & GCTile) {
tile_offset = Ones((Mask) stuff->mask & (GCTile - 1));
if ((tmp = *((CARD32 *) &stuff[1] + tile_offset))) {
- result = dixLookupResourceByType((pointer *) &tile, tmp, XRT_PIXMAP,
+ result = dixLookupResourceByType((void **) &tile, tmp, XRT_PIXMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -863,7 +863,7 @@ PanoramiXChangeGC(ClientPtr client)
if ((Mask) stuff->mask & GCStipple) {
stip_offset = Ones((Mask) stuff->mask & (GCStipple - 1));
if ((tmp = *((CARD32 *) &stuff[1] + stip_offset))) {
- result = dixLookupResourceByType((pointer *) &stip, tmp, XRT_PIXMAP,
+ result = dixLookupResourceByType((void **) &stip, tmp, XRT_PIXMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -872,7 +872,7 @@ PanoramiXChangeGC(ClientPtr client)
if ((Mask) stuff->mask & GCClipMask) {
clip_offset = Ones((Mask) stuff->mask & (GCClipMask - 1));
if ((tmp = *((CARD32 *) &stuff[1] + clip_offset))) {
- result = dixLookupResourceByType((pointer *) &clip, tmp, XRT_PIXMAP,
+ result = dixLookupResourceByType((void **) &clip, tmp, XRT_PIXMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -905,12 +905,12 @@ PanoramiXCopyGC(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyGCReq);
- result = dixLookupResourceByType((pointer *) &srcGC, stuff->srcGC, XRT_GC,
+ result = dixLookupResourceByType((void **) &srcGC, stuff->srcGC, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &dstGC, stuff->dstGC, XRT_GC,
+ result = dixLookupResourceByType((void **) &dstGC, stuff->dstGC, XRT_GC,
client, DixWriteAccess);
if (result != Success)
return result;
@@ -936,7 +936,7 @@ PanoramiXSetDashes(ClientPtr client)
REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixWriteAccess);
if (result != Success)
return result;
@@ -961,7 +961,7 @@ PanoramiXSetClipRectangles(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixWriteAccess);
if (result != Success)
return result;
@@ -986,7 +986,7 @@ PanoramiXFreeGC(ClientPtr client)
REQUEST_SIZE_MATCH(xResourceReq);
- result = dixLookupResourceByType((pointer *) &gc, stuff->id, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->id, XRT_GC,
client, DixDestroyAccess);
if (result != Success)
return result;
@@ -1015,7 +1015,7 @@ PanoramiXClearToBackground(ClientPtr client)
REQUEST_SIZE_MATCH(xClearAreaReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->window,
+ result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixWriteAccess);
if (result != Success)
return result;
@@ -1060,14 +1060,14 @@ PanoramiXCopyArea(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyAreaReq);
- result = dixLookupResourceByClass((pointer *) &src, stuff->srcDrawable,
+ result = dixLookupResourceByClass((void **) &src, stuff->srcDrawable,
XRC_DRAWABLE, client, DixReadAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
srcShared = IS_SHARED_PIXMAP(src);
- result = dixLookupResourceByClass((pointer *) &dst, stuff->dstDrawable,
+ result = dixLookupResourceByClass((void **) &dst, stuff->dstDrawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1077,7 +1077,7 @@ PanoramiXCopyArea(ClientPtr client)
if (dstShared && srcShared)
return (*SavedProcVector[X_CopyArea]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1219,14 +1219,14 @@ PanoramiXCopyPlane(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyPlaneReq);
- rc = dixLookupResourceByClass((pointer *) &src, stuff->srcDrawable,
+ rc = dixLookupResourceByClass((void **) &src, stuff->srcDrawable,
XRC_DRAWABLE, client, DixReadAccess);
if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc;
srcShared = IS_SHARED_PIXMAP(src);
- rc = dixLookupResourceByClass((pointer *) &dst, stuff->dstDrawable,
+ rc = dixLookupResourceByClass((void **) &dst, stuff->dstDrawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc;
@@ -1236,7 +1236,7 @@ PanoramiXCopyPlane(ClientPtr client)
if (dstShared && srcShared)
return (*SavedProcVector[X_CopyPlane]) (client);
- rc = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ rc = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (rc != Success)
return rc;
@@ -1327,7 +1327,7 @@ PanoramiXPolyPoint(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyPointReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1335,7 +1335,7 @@ PanoramiXPolyPoint(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyPoint]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1392,7 +1392,7 @@ PanoramiXPolyLine(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyLineReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1400,7 +1400,7 @@ PanoramiXPolyLine(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyLine]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1457,7 +1457,7 @@ PanoramiXPolySegment(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolySegmentReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1465,7 +1465,7 @@ PanoramiXPolySegment(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolySegment]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1525,7 +1525,7 @@ PanoramiXPolyRectangle(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyRectangleReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1533,7 +1533,7 @@ PanoramiXPolyRectangle(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyRectangle]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1592,7 +1592,7 @@ PanoramiXPolyArc(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyArcReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1600,7 +1600,7 @@ PanoramiXPolyArc(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyArc]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1657,7 +1657,7 @@ PanoramiXFillPoly(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xFillPolyReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1665,7 +1665,7 @@ PanoramiXFillPoly(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_FillPoly]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1723,7 +1723,7 @@ PanoramiXPolyFillRectangle(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1731,7 +1731,7 @@ PanoramiXPolyFillRectangle(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyFillRectangle]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1790,7 +1790,7 @@ PanoramiXPolyFillArc(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyFillArcReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1798,7 +1798,7 @@ PanoramiXPolyFillArc(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyFillArc]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1855,7 +1855,7 @@ PanoramiXPutImage(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPutImageReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -1863,7 +1863,7 @@ PanoramiXPutImage(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PutImage]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -1909,7 +1909,7 @@ PanoramiXGetImage(ClientPtr client)
return BadValue;
}
- rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc;
@@ -2055,7 +2055,7 @@ PanoramiXPolyText8(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyTextReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -2063,7 +2063,7 @@ PanoramiXPolyText8(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyText8]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -2098,7 +2098,7 @@ PanoramiXPolyText16(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xPolyTextReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -2106,7 +2106,7 @@ PanoramiXPolyText16(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_PolyText16]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -2141,7 +2141,7 @@ PanoramiXImageText8(ClientPtr client)
REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -2149,7 +2149,7 @@ PanoramiXImageText8(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_ImageText8]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -2184,7 +2184,7 @@ PanoramiXImageText16(ClientPtr client)
REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
@@ -2192,7 +2192,7 @@ PanoramiXImageText16(ClientPtr client)
if (IS_SHARED_PIXMAP(draw))
return (*SavedProcVector[X_ImageText16]) (client);
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc, XRT_GC,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc, XRT_GC,
client, DixReadAccess);
if (result != Success)
return result;
@@ -2225,7 +2225,7 @@ PanoramiXCreateColormap(ClientPtr client)
REQUEST_SIZE_MATCH(xCreateColormapReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->window,
+ result = dixLookupResourceByType((void **) &win, stuff->window,
XRT_WINDOW, client, DixReadAccess);
if (result != Success)
return result;
@@ -2266,7 +2266,7 @@ PanoramiXFreeColormap(ClientPtr client)
client->errorValue = stuff->id;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP,
+ result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP,
client, DixDestroyAccess);
if (result != Success)
return result;
@@ -2296,7 +2296,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client)
client->errorValue = stuff->srcCmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->srcCmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->srcCmap,
XRT_COLORMAP, client,
DixReadAccess | DixWriteAccess);
if (result != Success)
@@ -2335,7 +2335,7 @@ PanoramiXInstallColormap(ClientPtr client)
client->errorValue = stuff->id;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP,
+ result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -2360,7 +2360,7 @@ PanoramiXUninstallColormap(ClientPtr client)
client->errorValue = stuff->id;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->id, XRT_COLORMAP,
+ result = dixLookupResourceByType((void **) &cmap, stuff->id, XRT_COLORMAP,
client, DixReadAccess);
if (result != Success)
return result;
@@ -2386,7 +2386,7 @@ PanoramiXAllocColor(ClientPtr client)
client->errorValue = stuff->cmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess);
if (result != Success)
return result;
@@ -2412,7 +2412,7 @@ PanoramiXAllocNamedColor(ClientPtr client)
client->errorValue = stuff->cmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess);
if (result != Success)
return result;
@@ -2438,7 +2438,7 @@ PanoramiXAllocColorCells(ClientPtr client)
client->errorValue = stuff->cmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess);
if (result != Success)
return result;
@@ -2464,7 +2464,7 @@ PanoramiXAllocColorPlanes(ClientPtr client)
client->errorValue = stuff->cmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess);
if (result != Success)
return result;
@@ -2490,7 +2490,7 @@ PanoramiXFreeColors(ClientPtr client)
client->errorValue = stuff->cmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess);
if (result != Success)
return result;
@@ -2514,7 +2514,7 @@ PanoramiXStoreColors(ClientPtr client)
client->errorValue = stuff->cmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess);
if (result != Success)
return result;
@@ -2540,7 +2540,7 @@ PanoramiXStoreNamedColor(ClientPtr client)
client->errorValue = stuff->cmap;
- result = dixLookupResourceByType((pointer *) &cmap, stuff->cmap,
+ result = dixLookupResourceByType((void **) &cmap, stuff->cmap,
XRT_COLORMAP, client, DixWriteAccess);
if (result != Success)
return result;
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index 0fcde4f..6d93eec 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -19,7 +19,7 @@ extern _X_EXPORT Bool PanoramiXCreateConnectionBlock(void);
extern _X_EXPORT PanoramiXRes *PanoramiXFindIDByScrnum(RESTYPE, XID, int);
extern _X_EXPORT Bool
XineramaRegisterConnectionBlockCallback(void (*func) (void));
-extern _X_EXPORT int XineramaDeleteResource(pointer, XID);
+extern _X_EXPORT int XineramaDeleteResource(void *, XID);
extern _X_EXPORT void XineramaReinitData(void);
diff --git a/Xext/saver.c b/Xext/saver.c
index e06f408..03f28bb 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -107,7 +107,7 @@ typedef struct _ScreenSaverSuspension {
int count;
} ScreenSaverSuspensionRec;
-static int ScreenSaverFreeSuspend(pointer /*value */ ,
+static int ScreenSaverFreeSuspend(void */*value */ ,
XID /* id */
);
@@ -131,7 +131,7 @@ typedef struct _ScreenSaverEvent {
CARD32 mask;
} ScreenSaverEventRec;
-static int ScreenSaverFreeEvents(pointer /* value */ ,
+static int ScreenSaverFreeEvents(void * /* value */ ,
XID /* id */
);
@@ -168,7 +168,7 @@ typedef struct _ScreenSaverAttr {
unsigned long *values;
} ScreenSaverAttrRec, *ScreenSaverAttrPtr;
-static int ScreenSaverFreeAttr(pointer /* value */ ,
+static int ScreenSaverFreeAttr(void */* value */ ,
XID /* id */
);
@@ -288,7 +288,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
pEv->client = client;
pEv->screen = pScreen;
pEv->resource = FakeClientID(client->index);
- if (!AddResource(pEv->resource, SaverEventType, (pointer) pEv))
+ if (!AddResource(pEv->resource, SaverEventType, (void *) pEv))
return FALSE;
}
pEv->mask = mask;
@@ -319,7 +319,7 @@ FreeScreenAttr(ScreenSaverAttrPtr pAttr)
}
static int
-ScreenSaverFreeEvents(pointer value, XID id)
+ScreenSaverFreeEvents(void *value, XID id)
{
ScreenSaverEventPtr pOld = (ScreenSaverEventPtr) value;
ScreenPtr pScreen = pOld->screen;
@@ -341,7 +341,7 @@ ScreenSaverFreeEvents(pointer value, XID id)
}
static int
-ScreenSaverFreeAttr(pointer value, XID id)
+ScreenSaverFreeAttr(void *value, XID id)
{
ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr) value;
ScreenPtr pScreen = pOldAttr->screen;
@@ -363,7 +363,7 @@ ScreenSaverFreeAttr(pointer value, XID id)
}
static int
-ScreenSaverFreeSuspend(pointer value, XID id)
+ScreenSaverFreeSuspend(void *value, XID id)
{
ScreenSaverSuspensionPtr data = (ScreenSaverSuspensionPtr) value;
ScreenSaverSuspensionPtr *prev, this;
@@ -460,7 +460,7 @@ UninstallSaverColormap(ScreenPtr pScreen)
int rc;
if (pPriv && pPriv->installedMap != None) {
- rc = dixLookupResourceByType((pointer *) &pCmap, pPriv->installedMap,
+ rc = dixLookupResourceByType((void **) &pCmap, pPriv->installedMap,
RT_COLORMAP, serverClient,
DixUninstallAccess);
if (rc == Success)
@@ -571,7 +571,7 @@ CreateSaverWindow(ScreenPtr pScreen)
if (i < numInstalled)
return TRUE;
- result = dixLookupResourceByType((pointer *) &pCmap, wantMap, RT_COLORMAP,
+ result = dixLookupResourceByType((void **) &pCmap, wantMap, RT_COLORMAP,
serverClient, DixInstallAccess);
if (result != Success)
return TRUE;
@@ -923,7 +923,7 @@ ScreenSaverSetAttributes(ClientPtr client)
}
else {
ret =
- dixLookupResourceByType((pointer *) &pPixmap, pixID,
+ dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess);
if (ret == Success) {
if ((pPixmap->drawable.depth != depth) ||
@@ -955,7 +955,7 @@ ScreenSaverSetAttributes(ClientPtr client)
}
else {
ret =
- dixLookupResourceByType((pointer *) &pPixmap, pixID,
+ dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess);
if (ret == Success) {
if ((pPixmap->drawable.depth != depth) ||
@@ -1039,7 +1039,7 @@ ScreenSaverSetAttributes(ClientPtr client)
break;
case CWColormap:
cmap = (Colormap) * pVlist;
- ret = dixLookupResourceByType((pointer *) &pCmap, cmap, RT_COLORMAP,
+ ret = dixLookupResourceByType((void **) &pCmap, cmap, RT_COLORMAP,
client, DixUseAccess);
if (ret != Success) {
client->errorValue = cmap;
@@ -1058,7 +1058,7 @@ ScreenSaverSetAttributes(ClientPtr client)
*values++ = None;
}
else {
- ret = dixLookupResourceByType((pointer *) &pCursor, cursorID,
+ ret = dixLookupResourceByType((void **) &pCursor, cursorID,
RT_CURSOR, client, DixUseAccess);
if (ret != Success) {
client->errorValue = cursorID;
@@ -1079,7 +1079,7 @@ ScreenSaverSetAttributes(ClientPtr client)
FreeScreenAttr(pPriv->attr);
pPriv->attr = pAttr;
pAttr->resource = FakeClientID(client->index);
- if (!AddResource(pAttr->resource, AttrType, (pointer) pAttr))
+ if (!AddResource(pAttr->resource, AttrType, (void *) pAttr))
return BadAlloc;
return Success;
PatchUp:
@@ -1131,7 +1131,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xScreenSaverSetAttributesReq);
- status = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ status = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (status != Success)
return (status == BadValue) ? BadDrawable : status;
@@ -1146,7 +1146,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
pback_offset = Ones((Mask) stuff->mask & (CWBackPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pback_offset);
if ((tmp != None) && (tmp != ParentRelative)) {
- status = dixLookupResourceByType((pointer *) &backPix, tmp,
+ status = dixLookupResourceByType((void **) &backPix, tmp,
XRT_PIXMAP, client,
DixReadAccess);
if (status != Success)
@@ -1158,7 +1158,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
pbord_offset = Ones((Mask) stuff->mask & (CWBorderPixmap - 1));
tmp = *((CARD32 *) &stuff[1] + pbord_offset);
if (tmp != CopyFromParent) {
- status = dixLookupResourceByType((pointer *) &bordPix, tmp,
+ status = dixLookupResourceByType((void **) &bordPix, tmp,
XRT_PIXMAP, client,
DixReadAccess);
if (status != Success)
@@ -1170,7 +1170,7 @@ ProcScreenSaverSetAttributes(ClientPtr client)
cmap_offset = Ones((Mask) stuff->mask & (CWColormap - 1));
tmp = *((CARD32 *) &stuff[1] + cmap_offset);
if ((tmp != CopyFromParent) && (tmp != None)) {
- status = dixLookupResourceByType((pointer *) &cmap, tmp,
+ status = dixLookupResourceByType((void **) &cmap, tmp,
XRT_COLORMAP, client,
DixReadAccess);
if (status != Success)
@@ -1211,7 +1211,7 @@ ProcScreenSaverUnsetAttributes(ClientPtr client)
PanoramiXRes *draw;
int rc, i;
- rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc;
@@ -1270,7 +1270,7 @@ ProcScreenSaverSuspend(ClientPtr client)
this->count = 1;
this->clientResource = FakeClientID(client->index);
- if (!AddResource(this->clientResource, SuspendType, (pointer) this)) {
+ if (!AddResource(this->clientResource, SuspendType, (void *) this)) {
free(this);
return BadAlloc;
}
diff --git a/Xext/security.c b/Xext/security.c
index 7bf6cc4..421b252 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -167,7 +167,7 @@ SecurityLookupRequestName(ClientPtr client)
*/
static int
-SecurityDeleteAuthorization(pointer value, XID id)
+SecurityDeleteAuthorization(void *value, XID id)
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
unsigned short name_len, data_len;
@@ -221,7 +221,7 @@ SecurityDeleteAuthorization(pointer value, XID id)
/* resource delete function for RTEventClient */
static int
-SecurityDeleteAuthorizationEventClient(pointer value, XID id)
+SecurityDeleteAuthorizationEventClient(void *value, XID id)
{
OtherClientsPtr pEventClient, prev = NULL;
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) value;
@@ -294,7 +294,7 @@ SecurityComputeAuthorizationTimeout(SecurityAuthorizationPtr pAuth,
*/
static CARD32
-SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, pointer pval)
+SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, void *pval)
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr) pval;
@@ -382,7 +382,7 @@ SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth,
pEventClient->mask = mask;
pEventClient->resource = FakeClientID(client->index);
pEventClient->next = pAuth->eventClients;
- if (!AddResource(pEventClient->resource, RTEventClient, (pointer) pAuth)) {
+ if (!AddResource(pEventClient->resource, RTEventClient, (void *) pAuth)) {
free(pEventClient);
return BadAlloc;
}
@@ -454,7 +454,7 @@ ProcSecurityGenerateAuthorization(ClientPtr client)
vgi.group = group;
vgi.valid = FALSE;
- CallCallbacks(&SecurityValidateGroupCallback, (pointer) &vgi);
+ CallCallbacks(&SecurityValidateGroupCallback, (void *) &vgi);
/* if nobody said they recognized it, it's an error */
@@ -575,7 +575,7 @@ ProcSecurityRevokeAuthorization(ClientPtr client)
REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq);
- rc = dixLookupResourceByType((pointer *) &pAuth, stuff->authId,
+ rc = dixLookupResourceByType((void **) &pAuth, stuff->authId,
SecurityAuthorizationResType, client,
DixDestroyAccess);
if (rc != Success)
@@ -693,7 +693,7 @@ SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent * from,
*/
static void
-SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityDevice(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceDeviceAccessRec *rec = calldata;
SecurityStateRec *subj, *obj;
@@ -737,7 +737,7 @@ SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
*/
static void
-SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityResource(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceResourceAccessRec *rec = calldata;
SecurityStateRec *subj, *obj;
@@ -785,7 +785,7 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityExtension(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceExtAccessRec *rec = calldata;
SecurityStateRec *subj;
@@ -808,7 +808,7 @@ SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityServer(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceServerAccessRec *rec = calldata;
SecurityStateRec *subj, *obj;
@@ -827,7 +827,7 @@ SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityClient(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceClientAccessRec *rec = calldata;
SecurityStateRec *subj, *obj;
@@ -846,7 +846,7 @@ SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XacePropertyAccessRec *rec = calldata;
SecurityStateRec *subj, *obj;
@@ -868,7 +868,7 @@ SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecuritySend(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceSendAccessRec *rec = calldata;
SecurityStateRec *subj, *obj;
@@ -900,7 +900,7 @@ SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityReceive(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceReceiveAccessRec *rec = calldata;
SecurityStateRec *subj, *obj;
@@ -941,7 +941,7 @@ SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
*/
static void
-SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SecurityClientState(CallbackListPtr *pcbl, void *unused, void *calldata)
{
NewClientInfoRec *pci = calldata;
SecurityStateRec *state;
@@ -960,7 +960,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
case ClientStateRunning:
state->authId = AuthorizationIDOfClient(pci->client);
- rc = dixLookupResourceByType((pointer *) &pAuth, state->authId,
+ rc = dixLookupResourceByType((void **) &pAuth, state->authId,
SecurityAuthorizationResType, serverClient,
DixGetAttrAccess);
if (rc == Success) {
@@ -976,7 +976,7 @@ SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
case ClientStateGone:
case ClientStateRetained:
- rc = dixLookupResourceByType((pointer *) &pAuth, state->authId,
+ rc = dixLookupResourceByType((void **) &pAuth, state->authId,
SecurityAuthorizationResType, serverClient,
DixGetAttrAccess);
if (rc == Success && state->live) {
diff --git a/Xext/shape.c b/Xext/shape.c
index d36867c..bb479b1 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -50,11 +50,11 @@ in this Software without prior written authorization from The Open Group.
typedef RegionPtr (*CreateDftPtr) (WindowPtr /* pWin */
);
-static int ShapeFreeClient(pointer /* data */ ,
- XID /* id */
+static int ShapeFreeClient(void * /* data */ ,
+ XID /* id */
);
-static int ShapeFreeEvents(pointer /* data */ ,
- XID /* id */
+static int ShapeFreeEvents(void * /* data */ ,
+ XID /* id */
);
static void SShapeNotifyEvent(xShapeNotifyEvent * /* from */ ,
xShapeNotifyEvent * /* to */
@@ -306,7 +306,7 @@ ProcPanoramiXShapeRectangles(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xShapeRectanglesReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess);
if (result != Success)
return result;
@@ -361,7 +361,7 @@ ProcShapeMask(ClientPtr client)
if (stuff->src == None)
srcRgn = 0;
else {
- rc = dixLookupResourceByType((pointer *) &pPixmap, stuff->src,
+ rc = dixLookupResourceByType((void **) &pPixmap, stuff->src,
RT_PIXMAP, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -404,13 +404,13 @@ ProcPanoramiXShapeMask(ClientPtr client)
REQUEST_SIZE_MATCH(xShapeMaskReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess);
if (result != Success)
return result;
if (stuff->src != None) {
- result = dixLookupResourceByType((pointer *) &pmap, stuff->src,
+ result = dixLookupResourceByType((void **) &pmap, stuff->src,
XRT_PIXMAP, client, DixReadAccess);
if (result != Success)
return result;
@@ -532,12 +532,12 @@ ProcPanoramiXShapeCombine(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xShapeCombineReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &win2, stuff->src, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &win2, stuff->src, XRT_WINDOW,
client, DixReadAccess);
if (result != Success)
return result;
@@ -603,7 +603,7 @@ ProcPanoramiXShapeOffset(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xShapeOffsetReq);
- result = dixLookupResourceByType((pointer *) &win, stuff->dest, XRT_WINDOW,
+ result = dixLookupResourceByType((void **) &win, stuff->dest, XRT_WINDOW,
client, DixWriteAccess);
if (result != Success)
return result;
@@ -686,7 +686,7 @@ ProcShapeQueryExtents(ClientPtr client)
}
/*ARGSUSED*/ static int
-ShapeFreeClient(pointer data, XID id)
+ShapeFreeClient(void *data, XID id)
{
ShapeEventPtr pShapeEvent;
WindowPtr pWin;
@@ -695,7 +695,7 @@ ShapeFreeClient(pointer data, XID id)
pShapeEvent = (ShapeEventPtr) data;
pWin = pShapeEvent->window;
- rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, serverClient, DixReadAccess);
if (rc == Success) {
pPrev = 0;
@@ -708,12 +708,12 @@ ShapeFreeClient(pointer data, XID id)
*pHead = pShapeEvent->next;
}
}
- free((pointer) pShapeEvent);
+ free((void *) pShapeEvent);
return 1;
}
/*ARGSUSED*/ static int
-ShapeFreeEvents(pointer data, XID id)
+ShapeFreeEvents(void *data, XID id)
{
ShapeEventPtr *pHead, pCur, pNext;
@@ -721,9 +721,9 @@ ShapeFreeEvents(pointer data, XID id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource(pCur->clientResource, ClientType);
- free((pointer) pCur);
+ free((void *) pCur);
}
- free((pointer) pHead);
+ free((void *) pHead);
return 1;
}
@@ -740,7 +740,7 @@ ProcShapeSelectInput(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
if (rc != Success)
return rc;
- rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, client, DixWriteAccess);
if (rc != Success && rc != BadValue)
return rc;
@@ -770,10 +770,10 @@ ProcShapeSelectInput(ClientPtr client)
*/
clientResource = FakeClientID(client->index);
pNewShapeEvent->clientResource = clientResource;
- if (!AddResource(clientResource, ClientType, (pointer) pNewShapeEvent))
+ if (!AddResource(clientResource, ClientType, (void *) pNewShapeEvent))
return BadAlloc;
/*
- * create a resource to contain a pointer to the list
+ * create a resource to contain a void *to the list
* of clients selecting input. This must be indirect as
* the list may be arbitrarily rearranged which cannot be
* done through the resource database.
@@ -782,7 +782,7 @@ ProcShapeSelectInput(ClientPtr client)
pHead = malloc(sizeof(ShapeEventPtr));
if (!pHead ||
!AddResource(pWin->drawable.id, ShapeEventType,
- (pointer) pHead)) {
+ (void *) pHead)) {
FreeResource(clientResource, RT_NONE);
return BadAlloc;
}
@@ -831,7 +831,7 @@ SendShapeNotify(WindowPtr pWin, int which)
BYTE shaped;
int rc;
- rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, serverClient, DixReadAccess);
if (rc != Success)
return;
@@ -910,7 +910,7 @@ ProcShapeInputSelected(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success)
return rc;
- rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
ShapeEventType, client, DixReadAccess);
if (rc != Success && rc != BadValue)
return rc;
diff --git a/Xext/shm.c b/Xext/shm.c
index 1957a95..34545ec 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -99,7 +99,7 @@ typedef struct _ShmScrPrivateRec {
} ShmScrPrivateRec;
static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
-static int ShmDetachSegment(pointer /* value */ ,
+static int ShmDetachSegment(void */* value */ ,
XID /* shmseg */
);
static void ShmResetProc(ExtensionEntry * /* extEntry */
@@ -130,7 +130,7 @@ static ShmFuncs fbFuncs = { fbShmCreatePixmap, NULL };
#define VERIFY_SHMSEG(shmseg,shmdesc,client) \
{ \
int tmprc; \
- tmprc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \
+ tmprc = dixLookupResourceByType((void **)&(shmdesc), shmseg, ShmSegType, \
client, DixReadAccess); \
if (tmprc != Success) \
return tmprc; \
@@ -260,7 +260,7 @@ ShmDestroyPixmap(PixmapPtr pPixmap)
shmdesc = (ShmDescPtr) dixLookupPrivate(&pPixmap->devPrivates,
shmPixmapPrivateKey);
if (shmdesc)
- ShmDetachSegment((pointer) shmdesc, pPixmap->drawable.id);
+ ShmDetachSegment((void *) shmdesc, pPixmap->drawable.id);
}
pScreen->DestroyPixmap = screen_priv->destroyPixmap;
@@ -425,13 +425,13 @@ ProcShmAttach(ClientPtr client)
shmdesc->next = Shmsegs;
Shmsegs = shmdesc;
}
- if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc))
+ if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc))
return BadAlloc;
return Success;
}
/*ARGSUSED*/ static int
-ShmDetachSegment(pointer value, /* must conform to DeleteType */
+ShmDetachSegment(void *value, /* must conform to DeleteType */
XID shmseg)
{
ShmDescPtr shmdesc = (ShmDescPtr) value;
@@ -729,12 +729,12 @@ ProcPanoramiXShmPutImage(ClientPtr client)
REQUEST(xShmPutImageReq);
REQUEST_SIZE_MATCH(xShmPutImageReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess);
if (result != Success)
return result;
@@ -783,7 +783,7 @@ ProcPanoramiXShmGetImage(ClientPtr client)
return BadValue;
}
- rc = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc;
@@ -980,7 +980,7 @@ ProcPanoramiXShmCreatePixmap(ClientPtr client)
shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = newPix->info[j].id;
- if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer) pMap)) {
+ if (!AddResource(newPix->info[j].id, RT_PIXMAP, (void *) pMap)) {
result = BadAlloc;
break;
}
@@ -1016,7 +1016,7 @@ fbShmCreatePixmap(ScreenPtr pScreen,
if (!(*pScreen->ModifyPixmapHeader) (pPixmap, width, height, depth,
BitsPerPixel(depth),
PixmapBytePad(width, depth),
- (pointer) addr)) {
+ (void *) addr)) {
(*pScreen->DestroyPixmap) (pPixmap);
return NullPixmap;
}
@@ -1095,7 +1095,7 @@ ProcShmCreatePixmap(ClientPtr client)
shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
pMap->drawable.id = stuff->pid;
- if (AddResource(stuff->pid, RT_PIXMAP, (pointer) pMap)) {
+ if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap)) {
return Success;
}
}
@@ -1172,7 +1172,7 @@ ProcShmAttachFd(ClientPtr client)
shmdesc->next = Shmsegs;
Shmsegs = shmdesc;
- if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc))
+ if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc))
return BadAlloc;
return Success;
}
@@ -1263,7 +1263,7 @@ ProcShmCreateSegment(ClientPtr client)
shmdesc->next = Shmsegs;
Shmsegs = shmdesc;
- if (!AddResource(stuff->shmseg, ShmSegType, (pointer) shmdesc)) {
+ if (!AddResource(stuff->shmseg, ShmSegType, (void *) shmdesc)) {
close(fd);
return BadAlloc;
}
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index 52e22b4..993c028 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -46,10 +46,10 @@ typedef struct _Sertafied {
ClientPtr pClient;
XID id;
void (*notifyFunc) (ClientPtr /* client */ ,
- pointer /* closure */
+ void * /* closure */
);
- pointer closure;
+ void *closure;
} SertafiedRec, *SertafiedPtr;
static SertafiedPtr pPending;
@@ -58,24 +58,24 @@ static Bool BlockHandlerRegistered;
static int SertafiedGeneration;
static void ClientAwaken(ClientPtr /* client */ ,
- pointer /* closure */
+ void * /* closure */
);
-static int SertafiedDelete(pointer /* value */ ,
- XID /* id */
+static int SertafiedDelete(void * /* value */ ,
+ XID /* id */
);
-static void SertafiedBlockHandler(pointer /* data */ ,
+static void SertafiedBlockHandler(void * /* data */ ,
OSTimePtr /* wt */ ,
- pointer /* LastSelectMask */
+ void * /* LastSelectMask */
);
-static void SertafiedWakeupHandler(pointer /* data */ ,
- int /* i */ ,
- pointer /* LastSelectMask */
+static void SertafiedWakeupHandler(void * /* data */ ,
+ int /* i */ ,
+ void * /* LastSelectMask */
);
int
ClientSleepUntil(ClientPtr client,
TimeStamp *revive,
- void (*notifyFunc) (ClientPtr, pointer), pointer closure)
+ void (*notifyFunc) (ClientPtr, void *), void *closure)
{
SertafiedPtr pRequest, pReq, pPrev;
@@ -97,14 +97,14 @@ ClientSleepUntil(ClientPtr client,
if (!BlockHandlerRegistered) {
if (!RegisterBlockAndWakeupHandlers(SertafiedBlockHandler,
SertafiedWakeupHandler,
- (pointer) 0)) {
+ (void *) 0)) {
free(pRequest);
return FALSE;
}
BlockHandlerRegistered = TRUE;
}
pRequest->notifyFunc = 0;
- if (!AddResource(pRequest->id, SertafiedResType, (pointer) pRequest))
+ if (!AddResource(pRequest->id, SertafiedResType, (void *) pRequest))
return FALSE;
if (!notifyFunc)
notifyFunc = ClientAwaken;
@@ -126,14 +126,14 @@ ClientSleepUntil(ClientPtr client,
}
static void
-ClientAwaken(ClientPtr client, pointer closure)
+ClientAwaken(ClientPtr client, void *closure)
{
if (!client->clientGone)
AttendClient(client);
}
static int
-SertafiedDelete(pointer value, XID id)
+SertafiedDelete(void *value, XID id)
{
SertafiedPtr pRequest = (SertafiedPtr) value;
SertafiedPtr pReq, pPrev;
@@ -154,7 +154,7 @@ SertafiedDelete(pointer value, XID id)
}
static void
-SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask)
+SertafiedBlockHandler(void *data, OSTimePtr wt, void *LastSelectMask)
{
SertafiedPtr pReq, pNext;
unsigned long delay;
@@ -186,7 +186,7 @@ SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask)
}
static void
-SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask)
+SertafiedWakeupHandler(void *data, int i, void *LastSelectMask)
{
SertafiedPtr pReq, pNext;
TimeStamp now;
@@ -203,7 +203,7 @@ SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask)
}
if (!pPending) {
RemoveBlockAndWakeupHandlers(SertafiedBlockHandler,
- SertafiedWakeupHandler, (pointer) 0);
+ SertafiedWakeupHandler, (void *) 0);
BlockHandlerRegistered = FALSE;
}
}
diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h
index 5c70848..e9b8388 100644
--- a/Xext/sleepuntil.h
+++ b/Xext/sleepuntil.h
@@ -36,7 +36,7 @@
extern int ClientSleepUntil(ClientPtr client,
TimeStamp *revive,
void (*notifyFunc) (ClientPtr /* client */ ,
- pointer /* closure */
- ), pointer Closure);
+ void * /* closure */
+ ), void *Closure);
#endif
diff --git a/Xext/sync.c b/Xext/sync.c
index 2d58ea1..97c9d51 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -324,7 +324,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
if (changes & XSyncCACounter) {
if (syncObject == None)
pSync = NULL;
- else if (Success != (rc = dixLookupResourceByType((pointer *) &pSync,
+ else if (Success != (rc = dixLookupResourceByType((void **) &pSync,
syncObject, resType,
client,
DixReadAccess))) {
@@ -344,7 +344,7 @@ SyncInitTrigger(ClientPtr client, SyncTrigger * pTrigger, XID syncObject,
pCounter = (SyncCounter *) pSync;
if (IsSystemCounter(pCounter)) {
- (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,
+ (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter,
&pCounter->value);
}
}
@@ -933,7 +933,7 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL
return status;
}
- if (!AddResource(id, RTFence, (pointer) pFence))
+ if (!AddResource(id, RTFence, (void *) pFence))
return BadAlloc;
return Success;
@@ -963,7 +963,7 @@ SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue)
pCounter->value = initialvalue;
pCounter->pSysCounterInfo = NULL;
- if (!AddResource(id, RTCounter, (pointer) pCounter))
+ if (!AddResource(id, RTCounter, (void *) pCounter))
return NULL;
return pCounter;
@@ -1023,7 +1023,7 @@ SyncCreateSystemCounter(const char *name,
}
void
-SyncDestroySystemCounter(pointer pSysCounter)
+SyncDestroySystemCounter(void *pSysCounter)
{
SyncCounter *pCounter = (SyncCounter *) pSysCounter;
@@ -1121,7 +1121,7 @@ SyncComputeBracketValues(SyncCounter * pCounter)
}
} /* end for each trigger */
- (*psci->BracketValues) ((pointer) pCounter, pnewltval, pnewgtval);
+ (*psci->BracketValues) ((void *) pCounter, pnewltval, pnewgtval);
}
@@ -1431,7 +1431,7 @@ ProcSyncSetCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncSetCounterReq);
- rc = dixLookupResourceByType((pointer *) &pCounter, stuff->cid, RTCounter,
+ rc = dixLookupResourceByType((void **) &pCounter, stuff->cid, RTCounter,
client, DixWriteAccess);
if (rc != Success)
return rc;
@@ -1460,7 +1460,7 @@ ProcSyncChangeCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncChangeCounterReq);
- rc = dixLookupResourceByType((pointer *) &pCounter, stuff->cid, RTCounter,
+ rc = dixLookupResourceByType((void **) &pCounter, stuff->cid, RTCounter,
client, DixWriteAccess);
if (rc != Success)
return rc;
@@ -1493,7 +1493,7 @@ ProcSyncDestroyCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncDestroyCounterReq);
- rc = dixLookupResourceByType((pointer *) &pCounter, stuff->counter,
+ rc = dixLookupResourceByType((void **) &pCounter, stuff->counter,
RTCounter, client, DixDestroyAccess);
if (rc != Success)
return rc;
@@ -1654,14 +1654,14 @@ ProcSyncQueryCounter(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncQueryCounterReq);
- rc = dixLookupResourceByType((pointer *) &pCounter, stuff->counter,
+ rc = dixLookupResourceByType((void **) &pCounter, stuff->counter,
RTCounter, client, DixReadAccess);
if (rc != Success)
return rc;
/* if system counter, ask it what the current value is */
if (IsSystemCounter(pCounter)) {
- (*pCounter->pSysCounterInfo->QueryValue) ((pointer) pCounter,
+ (*pCounter->pSysCounterInfo->QueryValue) ((void *) pCounter,
&pCounter->value);
}
@@ -1780,7 +1780,7 @@ ProcSyncChangeAlarm(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);
- status = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm,
+ status = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm,
client, DixWriteAccess);
if (status != Success)
return status;
@@ -1821,7 +1821,7 @@ ProcSyncQueryAlarm(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncQueryAlarmReq);
- rc = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm,
+ rc = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm,
client, DixReadAccess);
if (rc != Success)
return rc;
@@ -1879,7 +1879,7 @@ ProcSyncDestroyAlarm(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncDestroyAlarmReq);
- rc = dixLookupResourceByType((pointer *) &pAlarm, stuff->alarm, RTAlarm,
+ rc = dixLookupResourceByType((void **) &pAlarm, stuff->alarm, RTAlarm,
client, DixDestroyAccess);
if (rc != Success)
return rc;
@@ -1909,7 +1909,7 @@ ProcSyncCreateFence(ClientPtr client)
miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered);
- if (!AddResource(stuff->fid, RTFence, (pointer) pFence))
+ if (!AddResource(stuff->fid, RTFence, (void *) pFence))
return BadAlloc;
return client->noClientException;
@@ -1928,7 +1928,7 @@ FreeFence(void *obj, XID id)
int
SyncVerifyFence(SyncFence ** ppSyncFence, XID fid, ClientPtr client, Mask mode)
{
- int rc = dixLookupResourceByType((pointer *) ppSyncFence, fid, RTFence,
+ int rc = dixLookupResourceByType((void **) ppSyncFence, fid, RTFence,
client, mode);
if (rc != Success)
@@ -1946,7 +1946,7 @@ ProcSyncTriggerFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncTriggerFenceReq);
- rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence,
+ rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence,
client, DixWriteAccess);
if (rc != Success)
return rc;
@@ -1965,7 +1965,7 @@ ProcSyncResetFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncResetFenceReq);
- rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence,
+ rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence,
client, DixWriteAccess);
if (rc != Success)
return rc;
@@ -1987,7 +1987,7 @@ ProcSyncDestroyFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncDestroyFenceReq);
- rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid, RTFence,
+ rc = dixLookupResourceByType((void **) &pFence, stuff->fid, RTFence,
client, DixDestroyAccess);
if (rc != Success)
return rc;
@@ -2006,7 +2006,7 @@ ProcSyncQueryFence(ClientPtr client)
REQUEST_SIZE_MATCH(xSyncQueryFenceReq);
- rc = dixLookupResourceByType((pointer *) &pFence, stuff->fid,
+ rc = dixLookupResourceByType((void **) &pFence, stuff->fid,
RTFence, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -2555,7 +2555,7 @@ SyncExtensionInit(void)
* ***** SERVERTIME implementation - should go in its own file in OS directory?
*/
-static pointer ServertimeCounter;
+static void *ServertimeCounter;
static XSyncValue Now;
static XSyncValue *pnext_time;
@@ -2656,7 +2656,7 @@ typedef struct {
} IdleCounterPriv;
static void
-IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return)
+IdleTimeQueryValue(void *pCounter, CARD64 * pValue_return)
{
int deviceid;
CARD32 idle;
@@ -2673,7 +2673,7 @@ IdleTimeQueryValue(pointer pCounter, CARD64 * pValue_return)
}
static void
-IdleTimeBlockHandler(pointer pCounter, struct timeval **wt, pointer LastSelectMask)
+IdleTimeBlockHandler(void *pCounter, struct timeval **wt, void *LastSelectMask)
{
SyncCounter *counter = pCounter;
IdleCounterPriv *priv = SysCounterGetPrivate(counter);
@@ -2769,7 +2769,7 @@ IdleTimeCheckBrackets(SyncCounter *counter, XSyncValue idle, XSyncValue *less, X
}
static void
-IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask)
+IdleTimeWakeupHandler(void *pCounter, int rc, void *LastSelectMask)
{
SyncCounter *counter = pCounter;
IdleCounterPriv *priv = SysCounterGetPrivate(counter);
@@ -2803,7 +2803,7 @@ IdleTimeWakeupHandler(pointer pCounter, int rc, pointer LastSelectMask)
}
static void
-IdleTimeBracketValues(pointer pCounter, CARD64 * pbracket_less,
+IdleTimeBracketValues(void *pCounter, CARD64 * pbracket_less,
CARD64 * pbracket_greater)
{
SyncCounter *counter = pCounter;
diff --git a/Xext/syncsrv.h b/Xext/syncsrv.h
index 45fca04..8c2c00d 100644
--- a/Xext/syncsrv.h
+++ b/Xext/syncsrv.h
@@ -66,10 +66,10 @@ typedef enum {
XSyncCounterUnrestricted
} SyncCounterType;
-typedef void (*SyncSystemCounterQueryValue)(pointer counter,
+typedef void (*SyncSystemCounterQueryValue)(void *counter,
CARD64 *value_return
);
-typedef void (*SyncSystemCounterBracketValues)(pointer counter,
+typedef void (*SyncSystemCounterBracketValues)(void *counter,
CARD64 *pbracket_less,
CARD64 *pbracket_greater
);
@@ -132,7 +132,7 @@ extern void SyncChangeCounter(SyncCounter *pCounter,
CARD64 new_value
);
-extern void SyncDestroySystemCounter(pointer pCounter);
+extern void SyncDestroySystemCounter(void *pCounter);
extern SyncCounter *SyncInitDeviceIdleTime(DeviceIntPtr dev);
extern void SyncRemoveDeviceIdleTime(SyncCounter *counter);
diff --git a/Xext/xace.c b/Xext/xace.c
index 026d3c5..d77b312 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -122,9 +122,9 @@ XaceHook(int hook, ...)
u.res.client = va_arg(ap, ClientPtr);
u.res.id = va_arg(ap, XID);
u.res.rtype = va_arg(ap, RESTYPE);
- u.res.res = va_arg(ap, pointer);
+ u.res.res = va_arg(ap, void *);
u.res.ptype = va_arg(ap, RESTYPE);
- u.res.parent = va_arg(ap, pointer);
+ u.res.parent = va_arg(ap, void *);
u.res.access_mode = va_arg(ap, Mask);
u.res.status = Success; /* default allow */
@@ -288,7 +288,7 @@ XaceCensorImage(ClientPtr client,
pPix = GetScratchPixmapHeader(pDraw->pScreen, w, h,
depth, bitsPerPixel,
- widthBytesLine, (pointer) pBuf);
+ widthBytesLine, (void *) pBuf);
if (!pPix) {
failed = TRUE;
goto failSafe;
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 989b033..6fe8eec 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -40,9 +40,9 @@ typedef struct {
ClientPtr client;
XID id;
RESTYPE rtype;
- pointer res;
+ void *res;
RESTYPE ptype;
- pointer parent;
+ void *parent;
Mask access_mode;
int status;
} XaceResourceAccessRec;
diff --git a/Xext/xres.c b/Xext/xres.c
index bdd49eb..b26cbb5 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -267,7 +267,7 @@ ProcXResQueryClients(ClientPtr client)
}
static void
-ResFindAllRes(pointer value, XID id, RESTYPE type, pointer cdata)
+ResFindAllRes(void *value, XID id, RESTYPE type, void *cdata)
{
int *counts = (int *) cdata;
@@ -365,7 +365,7 @@ ResGetApproxPixmapBytes(PixmapPtr pix)
}
static void
-ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata)
+ResFindResourcePixmaps(void *value, XID id, RESTYPE type, void *cdata)
{
SizeType sizeFunc = GetResourceTypeSizeFunc(type);
ResourceSizeRec size = { 0, 0, 0 };
@@ -376,7 +376,7 @@ ResFindResourcePixmaps(pointer value, XID id, RESTYPE type, pointer cdata)
}
static void
-ResFindPixmaps(pointer value, XID id, pointer cdata)
+ResFindPixmaps(void *value, XID id, void *cdata)
{
unsigned long *bytes = (unsigned long *) cdata;
PixmapPtr pix = (PixmapPtr) value;
@@ -385,7 +385,7 @@ ResFindPixmaps(pointer value, XID id, pointer cdata)
}
static void
-ResFindWindowPixmaps(pointer value, XID id, pointer cdata)
+ResFindWindowPixmaps(void *value, XID id, void *cdata)
{
unsigned long *bytes = (unsigned long *) cdata;
WindowPtr pWin = (WindowPtr) value;
@@ -398,7 +398,7 @@ ResFindWindowPixmaps(pointer value, XID id, pointer cdata)
}
static void
-ResFindGCPixmaps(pointer value, XID id, pointer cdata)
+ResFindGCPixmaps(void *value, XID id, void *cdata)
{
unsigned long *bytes = (unsigned long *) cdata;
GCPtr pGC = (GCPtr) value;
@@ -411,7 +411,7 @@ ResFindGCPixmaps(pointer value, XID id, pointer cdata)
}
static void
-ResFindPicturePixmaps(pointer value, XID id, pointer cdata)
+ResFindPicturePixmaps(void *value, XID id, void *cdata)
{
#ifdef RENDER
ResFindResourcePixmaps(value, id, PictureType, cdata);
@@ -419,7 +419,7 @@ ResFindPicturePixmaps(pointer value, XID id, pointer cdata)
}
static void
-ResFindCompositeClientWindowPixmaps (pointer value, XID id, pointer cdata)
+ResFindCompositeClientWindowPixmaps (void *value, XID id, void *cdata)
{
#ifdef COMPOSITE
ResFindResourcePixmaps(value, id, CompositeClientWindowType, cdata);
@@ -446,32 +446,32 @@ ProcXResQueryClientPixmapBytes(ClientPtr client)
bytes = 0;
FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps,
- (pointer) (&bytes));
+ (void *) (&bytes));
/*
* Make sure win background pixmaps also held to account.
*/
FindClientResourcesByType(clients[clientID], RT_WINDOW,
- ResFindWindowPixmaps, (pointer) (&bytes));
+ ResFindWindowPixmaps, (void *) (&bytes));
/*
* GC Tile & Stipple pixmaps too.
*/
FindClientResourcesByType(clients[clientID], RT_GC,
- ResFindGCPixmaps, (pointer) (&bytes));
+ ResFindGCPixmaps, (void *) (&bytes));
#ifdef RENDER
/* Render extension picture pixmaps. */
FindClientResourcesByType(clients[clientID], PictureType,
ResFindPicturePixmaps,
- (pointer)(&bytes));
+ (void *)(&bytes));
#endif
#ifdef COMPOSITE
/* Composite extension client window pixmaps. */
FindClientResourcesByType(clients[clientID], CompositeClientWindowType,
ResFindCompositeClientWindowPixmaps,
- (pointer)(&bytes));
+ (void *)(&bytes));
#endif
rep = (xXResQueryClientPixmapBytesReply) {
@@ -753,10 +753,10 @@ SwapXResQueryResourceBytes(struct xorg_list *response)
FindRes
*/
static void
-AddSubResourceSizeSpec(pointer value,
+AddSubResourceSizeSpec(void *value,
XID id,
RESTYPE type,
- pointer cdata)
+ void *cdata)
{
ConstructResourceBytesCtx *ctx = cdata;
@@ -818,7 +818,7 @@ AddSubResourceSizeSpec(pointer value,
FindRes
*/
static void
-AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata)
+AddResourceSizeValue(void *ptr, XID id, RESTYPE type, void *cdata)
{
ConstructResourceBytesCtx *ctx = cdata;
if (ctx->status == Success &&
@@ -888,7 +888,7 @@ AddResourceSizeValue(pointer ptr, XID id, RESTYPE type, pointer cdata)
@param[in/out] cdata The context object that contains the resource type
*/
static void
-AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata)
+AddResourceSizeValueWithResType(void *ptr, XID id, void *cdata)
{
ConstructResourceBytesCtx *ctx = cdata;
AddResourceSizeValue(ptr, id, ctx->resType, cdata);
@@ -906,7 +906,7 @@ AddResourceSizeValueWithResType(pointer ptr, XID id, pointer cdata)
type FindAllRes
*/
static void
-AddResourceSizeValueByResource(pointer ptr, XID id, RESTYPE type, pointer cdata)
+AddResourceSizeValueByResource(void *ptr, XID id, RESTYPE type, void *cdata)
{
ConstructResourceBytesCtx *ctx = cdata;
xXResResourceIdSpec *spec = ctx->curSpec;
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 3115f03..fb7b2d5 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -245,7 +245,7 @@ ProcSELinuxGetDrawableContext(ClientPtr client)
}
static int
-ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
+ProcSELinuxGetPropertyContext(ClientPtr client, void *privKey)
{
WindowPtr pWin;
PropertyPtr pProp;
@@ -269,7 +269,7 @@ ProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
}
static int
-ProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey)
+ProcSELinuxGetSelectionContext(ClientPtr client, void *privKey)
{
Selection *pSel;
SELinuxObjectRec *obj;
@@ -576,7 +576,7 @@ SProcSELinuxGetDrawableContext(ClientPtr client)
}
static int
-SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
+SProcSELinuxGetPropertyContext(ClientPtr client, void *privKey)
{
REQUEST(SELinuxGetPropertyContextReq);
@@ -587,7 +587,7 @@ SProcSELinuxGetPropertyContext(ClientPtr client, pointer privKey)
}
static int
-SProcSELinuxGetSelectionContext(ClientPtr client, pointer privKey)
+SProcSELinuxGetSelectionContext(ClientPtr client, void *privKey)
{
REQUEST(SELinuxGetContextReq);
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index e9c7e93..376d575 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -74,10 +74,10 @@ static Atom atom_client_ctx;
static security_id_t unlabeled_sid;
/* forward declarations */
-static void SELinuxScreen(CallbackListPtr *, pointer, pointer);
+static void SELinuxScreen(CallbackListPtr *, void *, void *);
/* "true" pointer value for use as callback data */
-static pointer truep = (pointer) 1;
+static void *truep = (void *) 1;
/*
* Performs an SELinux permission check.
@@ -147,7 +147,7 @@ SELinuxLabelClient(ClientPtr client)
strncpy(subj->command, cmdname, COMMAND_LEN - 1);
if (!cached)
- free((void *) cmdname); /* const char * */
+ free(cmdname); /* const char * */
}
finish:
@@ -171,7 +171,7 @@ SELinuxLabelInitial(void)
SELinuxSubjectRec *subj;
SELinuxObjectRec *obj;
security_context_t ctx;
- pointer unused;
+ void *unused;
/* Do the serverClient */
subj = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
@@ -326,7 +326,7 @@ SELinuxLog(int type, const char *fmt, ...)
*/
static void
-SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxDevice(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceDeviceAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -363,7 +363,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxSend(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceSendAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -405,7 +405,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxReceive(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceReceiveAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -443,7 +443,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxExtension(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceExtAccessRec *rec = calldata;
SELinuxSubjectRec *subj, *serv;
@@ -484,7 +484,7 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxSelection(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceSelectionAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -544,7 +544,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxProperty(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XacePropertyAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -608,7 +608,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxResource(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceResourceAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -667,7 +667,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
+SELinuxScreen(CallbackListPtr *pcbl, void *is_saver, void *calldata)
{
XaceScreenAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -699,7 +699,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
}
static void
-SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxClient(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceClientAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -717,7 +717,7 @@ SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxServer(CallbackListPtr *pcbl, void *unused, void *calldata)
{
XaceServerAccessRec *rec = calldata;
SELinuxSubjectRec *subj;
@@ -739,7 +739,7 @@ SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
*/
static void
-SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxClientState(CallbackListPtr *pcbl, void *unused, void *calldata)
{
NewClientInfoRec *pci = calldata;
@@ -754,7 +754,7 @@ SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
static void
-SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxResourceState(CallbackListPtr *pcbl, void *unused, void *calldata)
{
ResourceStateInfoRec *rec = calldata;
SELinuxSubjectRec *subj;
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 0a854f3..88df443 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -127,7 +127,7 @@ ProcXTestCompareCursor(ClientPtr client)
else if (stuff->cursor == XTestCurrentCursor)
pCursor = GetSpriteCursor(ptr);
else {
- rc = dixLookupResourceByType((pointer *) &pCursor, stuff->cursor,
+ rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor,
RT_CURSOR, client, DixReadAccess);
if (rc != Success) {
client->errorValue = stuff->cursor;
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 613867a..f2d49a2 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -994,7 +994,7 @@ ProcXvShmPutImage(ClientPtr client)
if (!pImage)
return BadMatch;
- status = dixLookupResourceByType((pointer *) &shmdesc, stuff->shmseg,
+ status = dixLookupResourceByType((void **) &shmdesc, stuff->shmseg,
ShmSegType, serverClient, DixReadAccess);
if (status != Success)
return status;
@@ -1512,12 +1512,12 @@ XineramaXvStopVideo(ClientPtr client)
REQUEST(xvStopVideoReq);
REQUEST_SIZE_MATCH(xvStopVideoReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
- result = dixLookupResourceByType((pointer *) &port, stuff->port,
+ result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess);
if (result != Success)
return result;
@@ -1542,7 +1542,7 @@ XineramaXvSetPortAttribute(ClientPtr client)
REQUEST_SIZE_MATCH(xvSetPortAttributeReq);
- result = dixLookupResourceByType((pointer *) &port, stuff->port,
+ result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess);
if (result != Success)
return result;
@@ -1568,17 +1568,17 @@ XineramaXvShmPutImage(ClientPtr client)
REQUEST_SIZE_MATCH(xvShmPutImageReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &port, stuff->port,
+ result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess);
if (result != Success)
return result;
@@ -1620,17 +1620,17 @@ XineramaXvPutImage(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xvPutImageReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &port, stuff->port,
+ result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess);
if (result != Success)
return result;
@@ -1668,17 +1668,17 @@ XineramaXvPutVideo(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xvPutVideoReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &port, stuff->port,
+ result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess);
if (result != Success)
return result;
@@ -1716,17 +1716,17 @@ XineramaXvPutStill(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xvPutImageReq);
- result = dixLookupResourceByClass((pointer *) &draw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &draw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
- result = dixLookupResourceByType((pointer *) &gc, stuff->gc,
+ result = dixLookupResourceByType((void **) &gc, stuff->gc,
XRT_GC, client, DixReadAccess);
if (result != Success)
return result;
- result = dixLookupResourceByType((pointer *) &port, stuff->port,
+ result = dixLookupResourceByType((void **) &port, stuff->port,
XvXRTPort, client, DixReadAccess);
if (result != Success)
return result;
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 9c6160c..bb08cf4 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -200,7 +200,7 @@ typedef struct _XvPortRec {
#define VALIDATE_XV_PORT(portID, pPort, mode)\
{\
- int rc = dixLookupResourceByType((pointer *)&(pPort), portID,\
+ int rc = dixLookupResourceByType((void **)&(pPort), portID,\
XvRTPort, client, mode);\
if (rc != Success)\
return rc;\
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 0c5dc9b..00b5179 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -134,12 +134,12 @@ static Bool XvCloseScreen(ScreenPtr);
static Bool XvDestroyPixmap(PixmapPtr);
static Bool XvDestroyWindow(WindowPtr);
static void XvResetProc(ExtensionEntry *);
-static int XvdiDestroyGrab(pointer, XID);
-static int XvdiDestroyEncoding(pointer, XID);
-static int XvdiDestroyVideoNotify(pointer, XID);
-static int XvdiDestroyPortNotify(pointer, XID);
-static int XvdiDestroyVideoNotifyList(pointer, XID);
-static int XvdiDestroyPort(pointer, XID);
+static int XvdiDestroyGrab(void *, XID);
+static int XvdiDestroyEncoding(void *, XID);
+static int XvdiDestroyVideoNotify(void *, XID);
+static int XvdiDestroyPortNotify(void *, XID);
+static int XvdiDestroyVideoNotifyList(void *, XID);
+static int XvdiDestroyPort(void *, XID);
static int XvdiSendVideoNotify(XvPortPtr, DrawablePtr, int);
/*
@@ -450,20 +450,20 @@ XvdiVideoStopped(XvPortPtr pPort, int reason)
}
static int
-XvdiDestroyPort(pointer pPort, XID id)
+XvdiDestroyPort(void *pPort, XID id)
{
return (*((XvPortPtr) pPort)->pAdaptor->ddFreePort) (pPort);
}
static int
-XvdiDestroyGrab(pointer pGrab, XID id)
+XvdiDestroyGrab(void *pGrab, XID id)
{
((XvGrabPtr) pGrab)->client = NULL;
return Success;
}
static int
-XvdiDestroyVideoNotify(pointer pn, XID id)
+XvdiDestroyVideoNotify(void *pn, XID id)
{
/* JUST CLEAR OUT THE client POINTER FIELD */
@@ -472,7 +472,7 @@ XvdiDestroyVideoNotify(pointer pn, XID id)
}
static int
-XvdiDestroyPortNotify(pointer pn, XID id)
+XvdiDestroyPortNotify(void *pn, XID id)
{
/* JUST CLEAR OUT THE client POINTER FIELD */
@@ -481,7 +481,7 @@ XvdiDestroyPortNotify(pointer pn, XID id)
}
static int
-XvdiDestroyVideoNotifyList(pointer pn, XID id)
+XvdiDestroyVideoNotifyList(void *pn, XID id)
{
XvVideoNotifyPtr npn, cpn;
@@ -500,7 +500,7 @@ XvdiDestroyVideoNotifyList(pointer pn, XID id)
}
static int
-XvdiDestroyEncoding(pointer value, XID id)
+XvdiDestroyEncoding(void *value, XID id)
{
return Success;
}
@@ -510,7 +510,7 @@ XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason)
{
XvVideoNotifyPtr pn;
- dixLookupResourceByType((pointer *) &pn, pDraw->id, XvRTVideoNotifyList,
+ dixLookupResourceByType((void **) &pn, pDraw->id, XvRTVideoNotifyList,
serverClient, DixReadAccess);
while (pn) {
@@ -843,7 +843,7 @@ XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff)
/* FIND VideoNotify LIST */
- rc = dixLookupResourceByType((pointer *) &pn, pDraw->id,
+ rc = dixLookupResourceByType((void **) &pn, pDraw->id,
XvRTVideoNotifyList, client, DixWriteAccess);
if (rc != Success && rc != BadValue)
return rc;
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 2235fd5..64eda92 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -61,7 +61,7 @@ typedef struct {
(XvMCScreenPtr)(dixLookupPrivate(&(pScreen)->devPrivates, XvMCScreenKey))
static int
-XvMCDestroyContextRes(pointer data, XID id)
+XvMCDestroyContextRes(void *data, XID id)
{
XvMCContextPtr pContext = (XvMCContextPtr) data;
@@ -78,7 +78,7 @@ XvMCDestroyContextRes(pointer data, XID id)
}
static int
-XvMCDestroySurfaceRes(pointer data, XID id)
+XvMCDestroySurfaceRes(void *data, XID id)
{
XvMCSurfacePtr pSurface = (XvMCSurfacePtr) data;
XvMCContextPtr pContext = pSurface->context;
@@ -87,13 +87,13 @@ XvMCDestroySurfaceRes(pointer data, XID id)
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySurface) (pSurface);
free(pSurface);
- XvMCDestroyContextRes((pointer) pContext, pContext->context_id);
+ XvMCDestroyContextRes((void *) pContext, pContext->context_id);
return Success;
}
static int
-XvMCDestroySubpictureRes(pointer data, XID id)
+XvMCDestroySubpictureRes(void *data, XID id)
{
XvMCSubpicturePtr pSubpict = (XvMCSubpicturePtr) data;
XvMCContextPtr pContext = pSubpict->context;
@@ -102,7 +102,7 @@ XvMCDestroySubpictureRes(pointer data, XID id)
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySubpicture) (pSubpict);
free(pSubpict);
- XvMCDestroyContextRes((pointer) pContext, pContext->context_id);
+ XvMCDestroyContextRes((void *) pContext, pContext->context_id);
return Success;
}
@@ -276,7 +276,7 @@ ProcXvMCCreateContext(ClientPtr client)
static int
ProcXvMCDestroyContext(ClientPtr client)
{
- pointer val;
+ void *val;
int rc;
REQUEST(xvmcDestroyContextReq);
@@ -306,7 +306,7 @@ ProcXvMCCreateSurface(ClientPtr client)
REQUEST(xvmcCreateSurfaceReq);
REQUEST_SIZE_MATCH(xvmcCreateSurfaceReq);
- result = dixLookupResourceByType((pointer *) &pContext, stuff->context_id,
+ result = dixLookupResourceByType((void **) &pContext, stuff->context_id,
XvMCRTContext, client, DixUseAccess);
if (result != Success)
return result;
@@ -350,7 +350,7 @@ ProcXvMCCreateSurface(ClientPtr client)
static int
ProcXvMCDestroySurface(ClientPtr client)
{
- pointer val;
+ void *val;
int rc;
REQUEST(xvmcDestroySurfaceReq);
@@ -382,7 +382,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
REQUEST(xvmcCreateSubpictureReq);
REQUEST_SIZE_MATCH(xvmcCreateSubpictureReq);
- result = dixLookupResourceByType((pointer *) &pContext, stuff->context_id,
+ result = dixLookupResourceByType((void **) &pContext, stuff->context_id,
XvMCRTContext, client, DixUseAccess);
if (result != Success)
return result;
@@ -474,7 +474,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
static int
ProcXvMCDestroySubpicture(ClientPtr client)
{
- pointer val;
+ void *val;
int rc;
REQUEST(xvmcDestroySubpictureReq);
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index 832e443..e8a6dae 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -31,15 +31,15 @@ typedef struct {
unsigned short height;
CARD32 flags;
int refcnt;
- pointer port_priv;
- pointer driver_priv;
+ void *port_priv;
+ void *driver_priv;
} XvMCContextRec, *XvMCContextPtr;
typedef struct {
XID surface_id;
int surface_type_id;
XvMCContextPtr context;
- pointer driver_priv;
+ void *driver_priv;
} XvMCSurfaceRec, *XvMCSurfacePtr;
typedef struct {
@@ -51,7 +51,7 @@ typedef struct {
int entry_bytes;
char component_order[4];
XvMCContextPtr context;
- pointer driver_priv;
+ void *driver_priv;
} XvMCSubpictureRec, *XvMCSubpicturePtr;
typedef int (*XvMCCreateContextProcPtr) (XvPortPtr port,
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 202c8de..07865d2 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -91,7 +91,7 @@ ProcXDeviceBell(ClientPtr client)
int rc, base;
int newpercent;
CARD8 class;
- pointer ctrl;
+ void *ctrl;
BellProcPtr proc;
REQUEST(xDeviceBellReq);
@@ -117,7 +117,7 @@ ProcXDeviceBell(ClientPtr client)
}
base = k->ctrl.bell;
proc = k->BellProc;
- ctrl = (pointer) &(k->ctrl);
+ ctrl = (void *) &(k->ctrl);
class = KbdFeedbackClass;
}
else if (stuff->feedbackclass == BellFeedbackClass) {
@@ -130,7 +130,7 @@ ProcXDeviceBell(ClientPtr client)
}
base = b->ctrl.percent;
proc = b->BellProc;
- ctrl = (pointer) &(b->ctrl);
+ ctrl = (void *) &(b->ctrl);
class = BellFeedbackClass;
}
else {
diff --git a/Xi/exevents.c b/Xi/exevents.c
index dff0a92..9d8416b 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1302,7 +1302,7 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti,
*mask = (*grab)->xi2mask;
}
else {
- rc = dixLookupResourceByType((pointer *) win, listener->listener,
+ rc = dixLookupResourceByType((void **) win, listener->listener,
listener->resource_type,
serverClient, DixSendAccess);
if (rc != Success)
@@ -1735,7 +1735,7 @@ ProcessDeviceEvent(InternalEvent *ev, DeviceIntPtr device)
eventinfo.device = device;
eventinfo.event = ev;
- CallCallbacks(&DeviceEventCallback, (pointer) &eventinfo);
+ CallCallbacks(&DeviceEventCallback, (void *) &eventinfo);
}
grab = device->deviceGrab.grab;
@@ -2204,7 +2204,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
if (param->cursor == None)
cursor = NullCursor;
else {
- rc = dixLookupResourceByType((pointer *) &cursor, param->cursor,
+ rc = dixLookupResourceByType((void **) &cursor, param->cursor,
RT_CURSOR, client, DixUseAccess);
if (rc != Success) {
client->errorValue = param->cursor;
@@ -2303,7 +2303,7 @@ GrabWindow(ClientPtr client, DeviceIntPtr dev, int type,
if (param->cursor == None)
cursor = NullCursor;
else {
- rc = dixLookupResourceByType((pointer *) &cursor, param->cursor,
+ rc = dixLookupResourceByType((void **) &cursor, param->cursor,
RT_CURSOR, client, DixUseAccess);
if (rc != Success) {
client->errorValue = param->cursor;
@@ -2446,7 +2446,7 @@ AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
others->resource = FakeClientID(client->index);
others->next = pWin->optional->inputMasks->inputClients;
pWin->optional->inputMasks->inputClients = others;
- if (!AddResource(others->resource, RT_INPUTCLIENT, (pointer) pWin))
+ if (!AddResource(others->resource, RT_INPUTCLIENT, (void *) pWin))
goto bail;
return Success;
@@ -2548,7 +2548,7 @@ InputClientGone(WindowPtr pWin, XID id)
else {
other->resource = FakeClientID(0);
if (!AddResource(other->resource, RT_INPUTCLIENT,
- (pointer) pWin))
+ (void *) pWin))
return BadAlloc;
}
}
diff --git a/Xi/extinit.c b/Xi/extinit.c
index c13bc47..9ebd733 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -381,7 +381,7 @@ DevPrivateKeyRec XIClientPrivateKeyRec;
*/
static void
-XIClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+XIClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 6732ce9..a8b92cc 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -695,7 +695,7 @@ BarrierFreeBarrier(void *data, XID id)
return Success;
}
-static void add_master_func(pointer res, XID id, pointer devid)
+static void add_master_func(void *res, XID id, void *devid)
{
struct PointerBarrier *b;
struct PointerBarrierClient *barrier;
@@ -712,7 +712,7 @@ static void add_master_func(pointer res, XID id, pointer devid)
xorg_list_add(&pbd->entry, &barrier->per_device);
}
-static void remove_master_func(pointer res, XID id, pointer devid)
+static void remove_master_func(void *res, XID id, void *devid)
{
struct PointerBarrierDevice *pbd;
struct PointerBarrierClient *barrier;
diff --git a/Xi/xichangecursor.c b/Xi/xichangecursor.c
index 0be6bc0..7a1bb7a 100644
--- a/Xi/xichangecursor.c
+++ b/Xi/xichangecursor.c
@@ -96,7 +96,7 @@ ProcXIChangeCursor(ClientPtr client)
pCursor = (CursorPtr) None;
}
else {
- rc = dixLookupResourceByType((pointer *) &pCursor, stuff->cursor,
+ rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor,
RT_CURSOR, client, DixUseAccess);
if (rc != Success)
return rc;
diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 796ba09..463607d 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -723,10 +723,10 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
total_len = prop_value->size + len;
if (mode == PropModeReplace || len > 0) {
- pointer new_data = NULL, old_data = NULL;
+ void *new_data = NULL, *old_data = NULL;
total_size = total_len * size_in_bytes;
- new_value.data = (pointer) malloc(total_size);
+ new_value.data = (void *) malloc(total_size);
if (!new_value.data && total_size) {
if (add)
XIDestroyDeviceProperty(prop);
@@ -742,13 +742,13 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
old_data = NULL;
break;
case PropModeAppend:
- new_data = (pointer) (((char *) new_value.data) +
+ new_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
old_data = new_value.data;
break;
case PropModePrepend:
new_data = new_value.data;
- old_data = (pointer) (((char *) new_value.data) +
+ old_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
break;
}
diff --git a/composite/compalloc.c b/composite/compalloc.c
index b7d731e..dfbff06 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -55,7 +55,7 @@ compScreenUpdate(ScreenPtr pScreen)
}
static void
-compBlockHandler(ScreenPtr pScreen, pointer pTimeout, pointer pReadmask)
+compBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
{
CompScreenPtr cs = GetCompScreen(pScreen);
diff --git a/composite/compext.c b/composite/compext.c
index e253f3c..a945f72 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -67,7 +67,7 @@ typedef struct _CompositeClient {
dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey))
static void
-CompositeClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+CompositeClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -78,7 +78,7 @@ CompositeClientCallback(CallbackListPtr *list, pointer closure, pointer data)
}
static int
-FreeCompositeClientWindow(pointer value, XID ccwid)
+FreeCompositeClientWindow(void *value, XID ccwid)
{
WindowPtr pWin = value;
@@ -87,7 +87,7 @@ FreeCompositeClientWindow(pointer value, XID ccwid)
}
static int
-FreeCompositeClientSubwindows(pointer value, XID ccwid)
+FreeCompositeClientSubwindows(void *value, XID ccwid)
{
WindowPtr pWin = value;
@@ -96,7 +96,7 @@ FreeCompositeClientSubwindows(pointer value, XID ccwid)
}
static int
-FreeCompositeClientOverlay(pointer value, XID ccwid)
+FreeCompositeClientOverlay(void *value, XID ccwid)
{
CompOverlayClientPtr pOc = (CompOverlayClientPtr) value;
@@ -140,7 +140,7 @@ ProcCompositeQueryVersion(ClientPtr client)
#define VERIFY_WINDOW(pWindow, wid, client, mode) \
do { \
int err; \
- err = dixLookupResourceByType((pointer *) &pWindow, wid, \
+ err = dixLookupResourceByType((void **) &pWindow, wid, \
RT_WINDOW, client, mode); \
if (err != Success) { \
client->errorValue = wid; \
@@ -227,7 +227,7 @@ ProcCompositeCreateRegionFromBorderClip(ClientPtr client)
return BadAlloc;
RegionTranslate(pRegion, -pWin->drawable.x, -pWin->drawable.y);
- if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@@ -267,7 +267,7 @@ ProcCompositeNameWindowPixmap(ClientPtr client)
++pPixmap->refcnt;
- if (!AddResource(stuff->pixmap, RT_PIXMAP, (pointer) pPixmap))
+ if (!AddResource(stuff->pixmap, RT_PIXMAP, (void *) pPixmap))
return BadAlloc;
return Success;
@@ -500,7 +500,7 @@ SProcCompositeDispatch(ClientPtr client)
/** @see GetDefaultBytes */
static void
-GetCompositeClientWindowBytes(pointer value, XID id, ResourceSizePtr size)
+GetCompositeClientWindowBytes(void *value, XID id, ResourceSizePtr size)
{
WindowPtr window = value;
@@ -754,13 +754,13 @@ PanoramiXCompositeNameWindowPixmap(ClientPtr client)
return BadMatch;
}
- if (!AddResource(newPix->info[i].id, RT_PIXMAP, (pointer) pPixmap))
+ if (!AddResource(newPix->info[i].id, RT_PIXMAP, (void *) pPixmap))
return BadAlloc;
++pPixmap->refcnt;
}
- if (!AddResource(stuff->pixmap, XRT_PIXMAP, (pointer) newPix))
+ if (!AddResource(stuff->pixmap, XRT_PIXMAP, (void *) newPix))
return BadAlloc;
return Success;
@@ -797,7 +797,7 @@ PanoramiXCompositeGetOverlayWindow(ClientPtr client)
}
FOR_NSCREENS_BACKWARD(i) {
- rc = dixLookupResourceByType((pointer *) &pWin, win->info[i].id,
+ rc = dixLookupResourceByType((void **) &pWin, win->info[i].id,
RT_WINDOW, client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->window;
diff --git a/composite/compinit.c b/composite/compinit.c
index 3c91091..1db9e0b 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -119,7 +119,7 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
pScreen->backingStoreSupport != NotUseful) {
if (pWin->backingStore != NotUseful && !pWin->backStorage) {
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
- pWin->backStorage = (pointer) (intptr_t) 1;
+ pWin->backStorage = (void *) (intptr_t) 1;
}
else if (pWin->backingStore == NotUseful && pWin->backStorage) {
compUnredirectWindow(serverClient, pWin,
diff --git a/composite/compint.h b/composite/compint.h
index 45b5824..12dc8b3 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -319,7 +319,7 @@ WindowPtr
CompositeRealChildHead(WindowPtr pWin);
int
- DeleteWindowNoInputDevices(pointer value, XID wid);
+ DeleteWindowNoInputDevices(void *value, XID wid);
int
diff --git a/composite/compoverlay.c b/composite/compoverlay.c
index bf5434c..7932dda 100644
--- a/composite/compoverlay.c
+++ b/composite/compoverlay.c
@@ -114,7 +114,7 @@ compCreateOverlayClient(ScreenPtr pScreen, ClientPtr pClient)
* Create a resource for this element so it can be deleted
* when the client goes away.
*/
- if (!AddResource(pOc->resource, CompositeClientOverlayType, (pointer) pOc))
+ if (!AddResource(pOc->resource, CompositeClientOverlayType, (void *) pOc))
return NULL;
return pOc;
@@ -152,7 +152,7 @@ compCreateOverlayWindow(ScreenPtr pScreen)
if (pWin == NULL)
return FALSE;
- if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer) pWin))
+ if (!AddResource(pWin->drawable.id, RT_WINDOW, (void *) pWin))
return FALSE;
MapWindow(pWin, serverClient);
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 0be7a1b..8dce21d 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -53,7 +53,7 @@
#ifdef COMPOSITE_DEBUG
static int
-compCheckWindow(WindowPtr pWin, pointer data)
+compCheckWindow(WindowPtr pWin, void *data)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
PixmapPtr pWinPixmap = (*pScreen->GetWindowPixmap) (pWin);
@@ -92,7 +92,7 @@ typedef struct _compPixmapVisit {
} CompPixmapVisitRec, *CompPixmapVisitPtr;
static Bool
-compRepaintBorder(ClientPtr pClient, pointer closure)
+compRepaintBorder(ClientPtr pClient, void *closure)
{
WindowPtr pWindow;
int rc =
@@ -111,7 +111,7 @@ compRepaintBorder(ClientPtr pClient, pointer closure)
}
static int
-compSetPixmapVisitWindow(WindowPtr pWindow, pointer data)
+compSetPixmapVisitWindow(WindowPtr pWindow, void *data)
{
CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data;
ScreenPtr pScreen = pWindow->drawable.pScreen;
@@ -128,7 +128,7 @@ compSetPixmapVisitWindow(WindowPtr pWindow, pointer data)
SetBorderSize(pWindow);
if (HasBorder(pWindow))
QueueWorkProc(compRepaintBorder, serverClient,
- (pointer) (intptr_t) pWindow->drawable.id);
+ (void *) (intptr_t) pWindow->drawable.id);
return WT_WALKCHILDREN;
}
@@ -139,7 +139,7 @@ compSetPixmap(WindowPtr pWindow, PixmapPtr pPixmap)
visitRec.pWindow = pWindow;
visitRec.pPixmap = pPixmap;
- TraverseTree(pWindow, compSetPixmapVisitWindow, (pointer) &visitRec);
+ TraverseTree(pWindow, compSetPixmapVisitWindow, (void *) &visitRec);
compCheckTree(pWindow->drawable.pScreen);
}
diff --git a/config/dbus-core.c b/config/dbus-core.c
index 3242587..768a984 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -45,10 +45,10 @@ struct dbus_core_info {
};
static struct dbus_core_info bus_info;
-static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg);
+static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg);
static void
-wakeup_handler(pointer data, int err, pointer read_mask)
+wakeup_handler(void *data, int err, void *read_mask)
{
struct dbus_core_info *info = data;
@@ -63,7 +63,7 @@ wakeup_handler(pointer data, int err, pointer read_mask)
}
static void
-block_handler(pointer data, struct timeval **tv, pointer read_mask)
+block_handler(void *data, struct timeval **tv, void *read_mask)
{
}
@@ -185,7 +185,7 @@ connect_to_bus(void)
}
static CARD32
-reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg)
+reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg)
{
if (connect_to_bus()) {
TimerFree(bus_info.timer);
diff --git a/config/udev.c b/config/udev.c
index 23a53f4..436b8f0 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -291,7 +291,7 @@ device_removed(struct udev_device *device)
}
static void
-wakeup_handler(pointer data, int err, pointer read_mask)
+wakeup_handler(void *data, int err, void *read_mask)
{
int udev_fd = udev_monitor_get_fd(udev_monitor);
struct udev_device *udev_device;
@@ -324,7 +324,7 @@ wakeup_handler(pointer data, int err, pointer read_mask)
}
static void
-block_handler(pointer data, struct timeval **tv, pointer read_mask)
+block_handler(void *data, struct timeval **tv, void *read_mask)
{
}
diff --git a/damageext/damageext.c b/damageext/damageext.c
index 5650953..886f56d 100644
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -245,7 +245,7 @@ DamageExtCreate(DrawablePtr pDrawable, DamageReportLevel level,
return NULL;
}
- if (!AddResource(id, DamageExtType, (pointer) pDamageExt))
+ if (!AddResource(id, DamageExtType, (void *) pDamageExt))
return NULL;
DamageExtRegister(pDrawable, pDamageExt->pDamage,
@@ -569,7 +569,7 @@ SProcDamageDispatch(ClientPtr client)
}
static void
-DamageClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+DamageClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -587,7 +587,7 @@ DamageResetProc(ExtensionEntry * extEntry)
}
static int
-FreeDamageExt(pointer value, XID did)
+FreeDamageExt(void *value, XID did)
{
DamageExtPtr pDamageExt = (DamageExtPtr) value;
diff --git a/damageext/damageextint.h b/damageext/damageextint.h
index e501495..7a7096d 100644
--- a/damageext/damageextint.h
+++ b/damageext/damageextint.h
@@ -58,7 +58,7 @@ typedef struct _DamageExt {
} DamageExtRec, *DamageExtPtr;
#define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \
- int rc = dixLookupResourceByType((pointer *)&(pDamageExt), rid, \
+ int rc = dixLookupResourceByType((void **)&(pDamageExt), rid, \
DamageExtType, client, mode); \
if (rc != Success) \
return rc; \
diff --git a/dbe/dbe.c b/dbe/dbe.c
index 5524615..8896720 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -322,7 +322,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
if (status == Success) {
pDbeWindowPriv->IDs[add_index] = stuff->buffer;
if (!AddResource(stuff->buffer, dbeWindowPrivResType,
- (pointer) pDbeWindowPriv)) {
+ (void *) pDbeWindowPriv)) {
pDbeWindowPriv->IDs[add_index] = DBE_FREE_ID_ELEMENT;
if (pDbeWindowPriv->nBufferIDs == 0) {
@@ -378,12 +378,12 @@ ProcDbeDeallocateBackBufferName(ClientPtr client)
REQUEST(xDbeDeallocateBackBufferNameReq);
DbeWindowPrivPtr pDbeWindowPriv;
int rc, i;
- pointer val;
+ void *val;
REQUEST_SIZE_MATCH(xDbeDeallocateBackBufferNameReq);
/* Buffer name must be valid */
- rc = dixLookupResourceByType((pointer *) &pDbeWindowPriv, stuff->buffer,
+ rc = dixLookupResourceByType((void **) &pDbeWindowPriv, stuff->buffer,
dbeWindowPrivResType, client,
DixDestroyAccess);
if (rc != Success)
@@ -726,7 +726,7 @@ ProcDbeGetBackBufferAttributes(ClientPtr client)
REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq);
- rc = dixLookupResourceByType((pointer *) &pDbeWindowPriv, stuff->buffer,
+ rc = dixLookupResourceByType((void **) &pDbeWindowPriv, stuff->buffer,
dbeWindowPrivResType, client,
DixGetAttrAccess);
if (rc == Success) {
@@ -1125,7 +1125,7 @@ DbeSetupBackgroundPainter(WindowPtr pWin, GCPtr pGC)
*
*****************************************************************************/
static int
-DbeDrawableDelete(pointer pDrawable, XID id)
+DbeDrawableDelete(void *pDrawable, XID id)
{
return Success;
@@ -1143,7 +1143,7 @@ DbeDrawableDelete(pointer pDrawable, XID id)
*
*****************************************************************************/
static int
-DbeWindowPrivDelete(pointer pDbeWinPriv, XID id)
+DbeWindowPrivDelete(void *pDbeWinPriv, XID id)
{
DbeScreenPrivPtr pDbeScreenPriv;
DbeWindowPrivPtr pDbeWindowPriv = (DbeWindowPrivPtr) pDbeWinPriv;
diff --git a/dbe/midbe.c b/dbe/midbe.c
index 3663fdd..0479ecc 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -202,7 +202,7 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
/* Associate the new ID with an existing pixmap. */
if (!AddResource(bufId, dbeDrawableResType,
- (pointer) pDbeWindowPriv->pBackBuffer)) {
+ (void *) pDbeWindowPriv->pBackBuffer)) {
return BadAlloc;
}
@@ -230,7 +230,7 @@ miDbeAliasBuffers(DbeWindowPrivPtr pDbeWindowPriv)
for (i = 0; i < pDbeWindowPriv->nBufferIDs; i++) {
ChangeResourceValue(pDbeWindowPriv->IDs[i], dbeDrawableResType,
- (pointer) pDbeWindowPriv->pBackBuffer);
+ (void *) pDbeWindowPriv->pBackBuffer);
}
} /* miDbeAliasBuffers() */
diff --git a/dix/colormap.c b/dix/colormap.c
index 39fddc9..c1ff88e 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -367,7 +367,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
}
pmap->flags |= BeingCreated;
- if (!AddResource(mid, RT_COLORMAP, (pointer) pmap))
+ if (!AddResource(mid, RT_COLORMAP, (void *) pmap))
return BadAlloc;
/*
@@ -397,7 +397,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
* \param value must conform to DeleteType
*/
int
-FreeColormap(pointer value, XID mid)
+FreeColormap(void *value, XID mid)
{
int i;
EntryPtr pent;
@@ -405,7 +405,7 @@ FreeColormap(pointer value, XID mid)
if (CLIENT_ID(mid) != SERVER_ID) {
(*pmap->pScreen->UninstallColormap) (pmap);
- WalkTree(pmap->pScreen, (VisitWindowProcPtr) TellNoMap, (pointer) &mid);
+ WalkTree(pmap->pScreen, (VisitWindowProcPtr) TellNoMap, (void *) &mid);
}
/* This is the device's chance to undo anything it needs to, especially
@@ -474,7 +474,7 @@ TellNoMap(WindowPtr pwin, Colormap * pmid)
/* Tell window that pmid got uninstalled */
int
-TellLostMap(WindowPtr pwin, pointer value)
+TellLostMap(WindowPtr pwin, void *value)
{
Colormap *pmid = (Colormap *) value;
@@ -499,7 +499,7 @@ TellLostMap(WindowPtr pwin, pointer value)
/* Tell window that pmid got installed */
int
-TellGainedMap(WindowPtr pwin, pointer value)
+TellGainedMap(WindowPtr pwin, void *value)
{
Colormap *pmid = (Colormap *) value;
@@ -845,7 +845,7 @@ AllocColor(ColormapPtr pmap,
pmap->pVisual->vid == pmap->pScreen->rootVisual) {
ColormapPtr prootmap;
- dixLookupResourceByType((pointer *) &prootmap,
+ dixLookupResourceByType((void **) &prootmap,
pmap->pScreen->defColormap, RT_COLORMAP,
clients[client], DixReadAccess);
@@ -863,7 +863,7 @@ AllocColor(ColormapPtr pmap,
pmap->pVisual->vid == pmap->pScreen->rootVisual) {
ColormapPtr prootmap;
- dixLookupResourceByType((pointer *) &prootmap,
+ dixLookupResourceByType((void **) &prootmap,
pmap->pScreen->defColormap, RT_COLORMAP,
clients[client], DixReadAccess);
@@ -917,7 +917,7 @@ AllocColor(ColormapPtr pmap,
}
pcr->mid = pmap->mid;
pcr->client = client;
- if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer) pcr))
+ if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *) pcr))
return BadAlloc;
}
return Success;
@@ -1463,9 +1463,9 @@ FreePixels(ColormapPtr pmap, int client)
* \unused fakeid
*/
int
-FreeClientPixels(pointer value, XID fakeid)
+FreeClientPixels(void *value, XID fakeid)
{
- pointer pmap;
+ void *pmap;
colorResource *pcr = value;
int rc;
@@ -1532,7 +1532,7 @@ AllocColorCells(int client, ColormapPtr pmap, int colors, int planes,
if ((ok == Success) && pcr) {
pcr->mid = pmap->mid;
pcr->client = client;
- if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer) pcr))
+ if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *) pcr))
ok = BadAlloc;
}
else
@@ -1614,7 +1614,7 @@ AllocColorPlanes(int client, ColormapPtr pmap, int colors,
if ((ok == Success) && pcr) {
pcr->mid = pmap->mid;
pcr->client = client;
- if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (pointer) pcr))
+ if (!AddResource(FakeClientID(client), RT_CMAPENTRY, (void *) pcr))
ok = BadAlloc;
}
else
@@ -2492,7 +2492,7 @@ struct colormap_lookup_data {
};
static void
-_colormap_find_resource(pointer value, XID id, pointer cdata)
+_colormap_find_resource(void *value, XID id, void *cdata)
{
struct colormap_lookup_data *cmap_data = cdata;
VisualPtr visuals = cmap_data->visuals;
diff --git a/dix/cursor.c b/dix/cursor.c
index 8cc54bd..56c5606 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -104,7 +104,7 @@ FreeCursorBits(CursorBitsPtr bits)
* \param value must conform to DeleteType
*/
int
-FreeCursor(pointer value, XID cid)
+FreeCursor(void *value, XID cid)
{
int nscr;
CursorPtr pCurs = (CursorPtr) value;
@@ -319,13 +319,13 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
CursorPtr pCurs;
GlyphSharePtr pShare;
- rc = dixLookupResourceByType((pointer *) &sourcefont, source, RT_FONT,
+ rc = dixLookupResourceByType((void **) &sourcefont, source, RT_FONT,
client, DixUseAccess);
if (rc != Success) {
client->errorValue = source;
return rc;
}
- rc = dixLookupResourceByType((pointer *) &maskfont, mask, RT_FONT, client,
+ rc = dixLookupResourceByType((void **) &maskfont, mask, RT_FONT, client,
DixUseAccess);
if (rc != Success && mask != None) {
client->errorValue = mask;
@@ -486,7 +486,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
if (err != Success)
return NullCursor;
- err = dixLookupResourceByType((pointer *) &cursorfont, fontID, RT_FONT,
+ err = dixLookupResourceByType((void **) &cursorfont, fontID, RT_FONT,
serverClient, DixReadAccess);
if (err != Success)
return NullCursor;
@@ -494,7 +494,7 @@ CreateRootCursor(char *unused1, unsigned int unused2)
&curs, serverClient, (XID) 0) != Success)
return NullCursor;
- if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer) curs))
+ if (!AddResource(FakeClientID(0), RT_CURSOR, (void *) curs))
return NullCursor;
return curs;
diff --git a/dix/devices.c b/dix/devices.c
index 3aecd1b..45de713 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -386,7 +386,7 @@ EnableDevice(DeviceIntPtr dev, BOOL sendevent)
}
else {
if (dev->coreEvents)
- other = (IsPointerDevice(dev)) ? inputInfo.pointer :
+ other = (IsPointerDevice(dev)) ? inputInfo.pointer:
inputInfo.keyboard;
else
other = NULL; /* auto-float non-core devices */
@@ -586,7 +586,7 @@ ActivateDevice(DeviceIntPtr dev, BOOL sendevent)
* The actual task of ringing the bell is the job of the DDX.
*/
static void
-CoreKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
+CoreKeyboardBell(int volume, DeviceIntPtr pDev, void *arg, int something)
{
KeybdCtrl *ctrl = arg;
@@ -750,7 +750,7 @@ InitAndStartDevices(void)
* Free the given device class and reset the pointer to NULL.
*/
static void
-FreeDeviceClass(int type, pointer *class)
+FreeDeviceClass(int type, void **class)
{
if (!(*class))
return;
@@ -818,7 +818,7 @@ FreeDeviceClass(int type, pointer *class)
}
static void
-FreeFeedbackClass(int type, pointer *class)
+FreeFeedbackClass(int type, void **class)
{
if (!(*class))
return;
@@ -906,19 +906,19 @@ FreeAllDeviceClasses(ClassesPtr classes)
if (!classes)
return;
- FreeDeviceClass(KeyClass, (pointer) &classes->key);
- FreeDeviceClass(ValuatorClass, (pointer) &classes->valuator);
- FreeDeviceClass(XITouchClass, (pointer) &classes->touch);
- FreeDeviceClass(ButtonClass, (pointer) &classes->button);
- FreeDeviceClass(FocusClass, (pointer) &classes->focus);
- FreeDeviceClass(ProximityClass, (pointer) &classes->proximity);
-
- FreeFeedbackClass(KbdFeedbackClass, (pointer) &classes->kbdfeed);
- FreeFeedbackClass(PtrFeedbackClass, (pointer) &classes->ptrfeed);
- FreeFeedbackClass(IntegerFeedbackClass, (pointer) &classes->intfeed);
- FreeFeedbackClass(StringFeedbackClass, (pointer) &classes->stringfeed);
- FreeFeedbackClass(BellFeedbackClass, (pointer) &classes->bell);
- FreeFeedbackClass(LedFeedbackClass, (pointer) &classes->leds);
+ FreeDeviceClass(KeyClass, (void *) &classes->key);
+ FreeDeviceClass(ValuatorClass, (void *) &classes->valuator);
+ FreeDeviceClass(XITouchClass, (void *) &classes->touch);
+ FreeDeviceClass(ButtonClass, (void *) &classes->button);
+ FreeDeviceClass(FocusClass, (void *) &classes->focus);
+ FreeDeviceClass(ProximityClass, (void *) &classes->proximity);
+
+ FreeFeedbackClass(KbdFeedbackClass, (void *) &classes->kbdfeed);
+ FreeFeedbackClass(PtrFeedbackClass, (void *) &classes->ptrfeed);
+ FreeFeedbackClass(IntegerFeedbackClass, (void *) &classes->intfeed);
+ FreeFeedbackClass(StringFeedbackClass, (void *) &classes->stringfeed);
+ FreeFeedbackClass(BellFeedbackClass, (void *) &classes->bell);
+ FreeFeedbackClass(LedFeedbackClass, (void *) &classes->leds);
}
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 64f8ef9..e28270c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -652,7 +652,7 @@ ProcCreateWindow(ClientPtr client)
Mask mask = pWin->eventMask;
pWin->eventMask = 0; /* subterfuge in case AddResource fails */
- if (!AddResource(stuff->wid, RT_WINDOW, (pointer) pWin))
+ if (!AddResource(stuff->wid, RT_WINDOW, (void *) pWin))
return BadAlloc;
pWin->eventMask = mask;
}
@@ -1069,7 +1069,7 @@ ProcGrabServer(ClientPtr client)
grabinfo.client = client;
grabinfo.grabstate = SERVER_GRABBED;
- CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo);
+ CallCallbacks(&ServerGrabCallback, (void *) &grabinfo);
}
return Success;
@@ -1096,7 +1096,7 @@ UngrabServer(ClientPtr client)
grabinfo.client = client;
grabinfo.grabstate = SERVER_UNGRABBED;
- CallCallbacks(&ServerGrabCallback, (pointer) &grabinfo);
+ CallCallbacks(&ServerGrabCallback, (void *) &grabinfo);
}
}
@@ -1208,7 +1208,7 @@ ProcCloseFont(ClientPtr client)
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResourceByType((pointer *) &pFont, stuff->id, RT_FONT,
+ rc = dixLookupResourceByType((void **) &pFont, stuff->id, RT_FONT,
client, DixDestroyAccess);
if (rc == Success) {
FreeResource(stuff->id, RT_NONE);
@@ -1335,7 +1335,7 @@ ProcListFontsWithInfo(ClientPtr client)
* \param value must conform to DeleteType
*/
int
-dixDestroyPixmap(pointer value, XID pid)
+dixDestroyPixmap(void *value, XID pid)
{
PixmapPtr pPixmap = (PixmapPtr) value;
@@ -1402,7 +1402,7 @@ ProcCreatePixmap(ClientPtr client)
(*pDraw->pScreen->DestroyPixmap) (pMap);
return rc;
}
- if (AddResource(stuff->pid, RT_PIXMAP, (pointer) pMap))
+ if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap))
return Success;
}
return BadAlloc;
@@ -1417,7 +1417,7 @@ ProcFreePixmap(ClientPtr client)
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResourceByType((pointer *) &pMap, stuff->id, RT_PIXMAP,
+ rc = dixLookupResourceByType((void **) &pMap, stuff->id, RT_PIXMAP,
client, DixDestroyAccess);
if (rc == Success) {
FreeResource(stuff->id, RT_NONE);
@@ -1454,7 +1454,7 @@ ProcCreateGC(ClientPtr client)
stuff->gc, client);
if (error != Success)
return error;
- if (!AddResource(stuff->gc, RT_GC, (pointer) pGC))
+ if (!AddResource(stuff->gc, RT_GC, (void *) pGC))
return BadAlloc;
return Success;
}
@@ -2121,7 +2121,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
y + linesDone,
width,
nlines,
- format, planemask, (pointer) pBuf);
+ format, planemask, (void *) pBuf);
if (pVisibleRegion)
XaceCensorImage(client, pVisibleRegion, widthBytesLine,
pDraw, x, y + linesDone, width,
@@ -2148,7 +2148,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
y + linesDone,
width,
nlines,
- format, plane, (pointer) pBuf);
+ format, plane, (void *) pBuf);
if (pVisibleRegion)
XaceCensorImage(client, pVisibleRegion,
widthBytesLine,
@@ -2308,7 +2308,7 @@ ProcFreeColormap(ClientPtr client)
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResourceByType((pointer *) &pmap, stuff->id, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pmap, stuff->id, RT_COLORMAP,
client, DixDestroyAccess);
if (rc == Success) {
/* Freeing a default colormap is a no-op */
@@ -2334,7 +2334,7 @@ ProcCopyColormapAndFree(ClientPtr client)
REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq);
mid = stuff->mid;
LEGAL_NEW_RESOURCE(mid, client);
- rc = dixLookupResourceByType((pointer *) &pSrcMap, stuff->srcCmap,
+ rc = dixLookupResourceByType((void **) &pSrcMap, stuff->srcCmap,
RT_COLORMAP, client,
DixReadAccess | DixRemoveAccess);
if (rc == Success)
@@ -2352,7 +2352,7 @@ ProcInstallColormap(ClientPtr client)
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP,
client, DixInstallAccess);
if (rc != Success)
goto out;
@@ -2381,7 +2381,7 @@ ProcUninstallColormap(ClientPtr client)
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP,
client, DixUninstallAccess);
if (rc != Success)
goto out;
@@ -2449,7 +2449,7 @@ ProcAllocColor(ClientPtr client)
REQUEST(xAllocColorReq);
REQUEST_SIZE_MATCH(xAllocColorReq);
- rc = dixLookupResourceByType((pointer *) &pmap, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pmap, stuff->cmap, RT_COLORMAP,
client, DixAddAccess);
if (rc == Success) {
xAllocColorReply acr = {
@@ -2486,7 +2486,7 @@ ProcAllocNamedColor(ClientPtr client)
REQUEST(xAllocNamedColorReq);
REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixAddAccess);
if (rc == Success) {
xAllocNamedColorReply ancr = {
@@ -2531,7 +2531,7 @@ ProcAllocColorCells(ClientPtr client)
REQUEST(xAllocColorCellsReq);
REQUEST_SIZE_MATCH(xAllocColorCellsReq);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixAddAccess);
if (rc == Success) {
int npixels, nmasks;
@@ -2592,7 +2592,7 @@ ProcAllocColorPlanes(ClientPtr client)
REQUEST(xAllocColorPlanesReq);
REQUEST_SIZE_MATCH(xAllocColorPlanesReq);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixAddAccess);
if (rc == Success) {
xAllocColorPlanesReply acpr;
@@ -2654,7 +2654,7 @@ ProcFreeColors(ClientPtr client)
REQUEST(xFreeColorsReq);
REQUEST_AT_LEAST_SIZE(xFreeColorsReq);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixRemoveAccess);
if (rc == Success) {
int count;
@@ -2680,7 +2680,7 @@ ProcStoreColors(ClientPtr client)
REQUEST(xStoreColorsReq);
REQUEST_AT_LEAST_SIZE(xStoreColorsReq);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixWriteAccess);
if (rc == Success) {
int count;
@@ -2706,7 +2706,7 @@ ProcStoreNamedColor(ClientPtr client)
REQUEST(xStoreNamedColorReq);
REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixWriteAccess);
if (rc == Success) {
xColorItem def;
@@ -2734,7 +2734,7 @@ ProcQueryColors(ClientPtr client)
REQUEST(xQueryColorsReq);
REQUEST_AT_LEAST_SIZE(xQueryColorsReq);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixReadAccess);
if (rc == Success) {
int count;
@@ -2781,7 +2781,7 @@ ProcLookupColor(ClientPtr client)
REQUEST(xLookupColorReq);
REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP,
client, DixReadAccess);
if (rc == Success) {
CARD16 exactRed, exactGreen, exactBlue;
@@ -2832,7 +2832,7 @@ ProcCreateCursor(ClientPtr client)
REQUEST_SIZE_MATCH(xCreateCursorReq);
LEGAL_NEW_RESOURCE(stuff->cid, client);
- rc = dixLookupResourceByType((pointer *) &src, stuff->source, RT_PIXMAP,
+ rc = dixLookupResourceByType((void **) &src, stuff->source, RT_PIXMAP,
client, DixReadAccess);
if (rc != Success) {
client->errorValue = stuff->source;
@@ -2844,7 +2844,7 @@ ProcCreateCursor(ClientPtr client)
/* Find and validate cursor mask pixmap, if one is provided */
if (stuff->mask != None) {
- rc = dixLookupResourceByType((pointer *) &msk, stuff->mask, RT_PIXMAP,
+ rc = dixLookupResourceByType((void **) &msk, stuff->mask, RT_PIXMAP,
client, DixReadAccess);
if (rc != Success) {
client->errorValue = stuff->mask;
@@ -2876,7 +2876,7 @@ ProcCreateCursor(ClientPtr client)
}
(*src->drawable.pScreen->GetImage) ((DrawablePtr) src, 0, 0, width, height,
- XYPixmap, 1, (pointer) srcbits);
+ XYPixmap, 1, (void *) srcbits);
if (msk == (PixmapPtr) NULL) {
unsigned char *bits = mskbits;
@@ -2888,7 +2888,7 @@ ProcCreateCursor(ClientPtr client)
memset((char *) mskbits, 0, n);
(*msk->drawable.pScreen->GetImage) ((DrawablePtr) msk, 0, 0, width,
height, XYPixmap, 1,
- (pointer) mskbits);
+ (void *) mskbits);
}
cm.width = width;
cm.height = height;
@@ -2901,7 +2901,7 @@ ProcCreateCursor(ClientPtr client)
if (rc != Success)
goto bail;
- if (!AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor)) {
+ if (!AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) {
rc = BadAlloc;
goto bail;
}
@@ -2931,7 +2931,7 @@ ProcCreateGlyphCursor(ClientPtr client)
&pCursor, client, stuff->cid);
if (res != Success)
return res;
- if (AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor))
+ if (AddResource(stuff->cid, RT_CURSOR, (void *) pCursor))
return Success;
return BadAlloc;
}
@@ -2945,7 +2945,7 @@ ProcFreeCursor(ClientPtr client)
REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq);
- rc = dixLookupResourceByType((pointer *) &pCursor, stuff->id, RT_CURSOR,
+ rc = dixLookupResourceByType((void **) &pCursor, stuff->id, RT_CURSOR,
client, DixDestroyAccess);
if (rc == Success) {
FreeResource(stuff->id, RT_NONE);
@@ -3094,10 +3094,10 @@ ProcChangeHosts(ClientPtr client)
if (stuff->mode == HostInsert)
return AddHost(client, (int) stuff->hostFamily,
- stuff->hostLength, (pointer) &stuff[1]);
+ stuff->hostLength, (void *) &stuff[1]);
if (stuff->mode == HostDelete)
return RemoveHost(client, (int) stuff->hostFamily,
- stuff->hostLength, (pointer) &stuff[1]);
+ stuff->hostLength, (void *) &stuff[1]);
client->errorValue = stuff->mode;
return BadValue;
}
@@ -3108,7 +3108,7 @@ ProcListHosts(ClientPtr client)
xListHostsReply reply;
int len, nHosts, result;
BOOL enabled;
- pointer pdata;
+ void *pdata;
/* REQUEST(xListHostsReq); */
@@ -3349,7 +3349,7 @@ CloseDownClient(ClientPtr client)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *) NULL;
clientinfo.setup = (xConnSetup *) NULL;
- CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
+ CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
}
}
client->clientGone = TRUE; /* so events aren't sent to client */
@@ -3379,7 +3379,7 @@ CloseDownClient(ClientPtr client)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *) NULL;
clientinfo.setup = (xConnSetup *) NULL;
- CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
+ CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
}
TouchListenerGone(client->clientAsMask);
FreeClientResources(client);
@@ -3414,7 +3414,7 @@ KillAllClients(void)
}
void
-InitClient(ClientPtr client, int i, pointer ospriv)
+InitClient(ClientPtr client, int i, void *ospriv)
{
client->index = i;
client->clientAsMask = ((Mask) i) << CLIENTOFFSET;
@@ -3436,7 +3436,7 @@ InitClient(ClientPtr client, int i, pointer ospriv)
*************************/
ClientPtr
-NextAvailableClient(pointer ospriv)
+NextAvailableClient(void *ospriv)
{
int i;
ClientPtr client;
@@ -3476,7 +3476,7 @@ NextAvailableClient(pointer ospriv)
clientinfo.client = client;
clientinfo.prefix = (xConnSetupPrefix *) NULL;
clientinfo.setup = (xConnSetup *) NULL;
- CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
+ CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
}
return client;
}
@@ -3596,7 +3596,7 @@ SendConnSetup(ClientPtr client, const char *reason)
clientinfo.client = client;
clientinfo.prefix = lconnSetupPrefix;
clientinfo.setup = (xConnSetup *) lConnectionInfo;
- CallCallbacks((&ClientStateCallback), (pointer) &clientinfo);
+ CallCallbacks((&ClientStateCallback), (void *) &clientinfo);
}
return Success;
}
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 57177ac..341ca3f 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -70,7 +70,7 @@ Equipment Corporation.
#include "xf86bigfontsrv.h"
#endif
-extern pointer fosNaturalParams;
+extern void *fosNaturalParams;
extern FontPtr defaultFont;
static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0;
@@ -139,7 +139,7 @@ SetDefaultFont(const char *defaultfontname)
(unsigned) strlen(defaultfontname), defaultfontname);
if (err != Success)
return FALSE;
- err = dixLookupResourceByType((pointer *) &pf, fid, RT_FONT, serverClient,
+ err = dixLookupResourceByType((void **) &pf, fid, RT_FONT, serverClient,
DixReadAccess);
if (err != Success)
return FALSE;
@@ -197,7 +197,7 @@ RemoveFontWakeup(FontPathElementPtr fpe)
}
void
-FontWakeup(pointer data, int count, pointer LastSelectMask)
+FontWakeup(void *data, int count, void *LastSelectMask)
{
int i;
FontPathElementPtr fpe;
@@ -267,7 +267,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (client->clientGone) {
if (c->current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current_fpe];
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
err = Successful;
goto bail;
@@ -275,7 +275,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
while (c->current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current_fpe];
err = (*fpe_functions[fpe->type].open_font)
- ((pointer) client, fpe, c->flags,
+ ((void *) client, fpe, c->flags,
c->fontname, c->fnamelen, FontFormat,
BitmapFormatMaskByte |
BitmapFormatMaskBit |
@@ -350,7 +350,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
}
}
}
- if (!AddResource(c->fontid, RT_FONT, (pointer) pfont)) {
+ if (!AddResource(c->fontid, RT_FONT, (void *) pfont)) {
err = AllocError;
goto bail;
}
@@ -404,7 +404,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
cached = FindCachedFontPattern(patternCache, pfontname, lenfname);
if (cached && cached->info.cachable) {
- if (!AddResource(fid, RT_FONT, (pointer) cached))
+ if (!AddResource(fid, RT_FONT, (void *) cached))
return BadAlloc;
cached->refcnt++;
return Success;
@@ -453,7 +453,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
* \param value must conform to DeleteType
*/
int
-CloseFont(pointer value, XID fid)
+CloseFont(void *value, XID fid)
{
int nscr;
ScreenPtr pscr;
@@ -571,7 +571,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (client->clientGone) {
if (c->current.current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current.current_fpe];
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
err = Successful;
goto bail;
@@ -588,7 +588,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
/* This FPE doesn't support/require list_fonts_and_aliases */
err = (*fpe_functions[fpe->type].list_fonts)
- ((pointer) c->client, fpe, c->current.pattern,
+ ((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
c->names);
@@ -615,7 +615,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (!c->current.list_started) {
err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
- ((pointer) c->client, fpe, c->current.pattern,
+ ((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
&c->current.private);
if (err == Suspended) {
@@ -635,7 +635,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
name = 0;
err = (*fpe_functions[fpe->type].list_next_font_or_alias)
- ((pointer) c->client, fpe, &name, &namelen, &tmpname,
+ ((void *) c->client, fpe, &name, &namelen, &tmpname,
&resolvedlen, c->current.private);
if (err == Suspended) {
if (!ClientIsAsleep(client))
@@ -687,7 +687,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
tmpname = 0;
(void) (*fpe_functions[fpe->type].list_next_font_or_alias)
- ((pointer) c->client, fpe, &tmpname, &tmpnamelen,
+ ((void *) c->client, fpe, &tmpname, &tmpnamelen,
&tmpname, &tmpnamelen, c->current.private);
if (--aliascount <= 0) {
err = BadFontName;
@@ -869,7 +869,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
if (client->clientGone) {
if (c->current.current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current.current_fpe];
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
err = Successful;
goto bail;
@@ -1118,12 +1118,12 @@ doPolyText(ClientPtr client, PTclosurePtr c)
if (client->clientGone) {
fpe = c->pGC->font->fpe;
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
if (ClientIsAsleep(client)) {
/* Client has died, but we cannot bail out right now. We
need to clean up after the work we did when going to
- sleep. Setting the drawable pointer to 0 makes this
+ sleep. Setting the drawable poiner to 0 makes this
happen without any attempts to render or perform other
unnecessary activities. */
c->pDraw = (DrawablePtr) 0;
@@ -1144,7 +1144,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
the FPE code to clean up after client and avoid further
rendering while we clean up after ourself. */
fpe = c->pGC->font->fpe;
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
c->pDraw = (DrawablePtr) 0;
}
}
@@ -1165,7 +1165,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
fid = ((Font) *(c->pElt + 4)) /* big-endian */
|((Font) *(c->pElt + 3)) << 8
| ((Font) *(c->pElt + 2)) << 16 | ((Font) *(c->pElt + 1)) << 24;
- err = dixLookupResourceByType((pointer *) &pFont, fid, RT_FONT,
+ err = dixLookupResourceByType((void **) &pFont, fid, RT_FONT,
client, DixUseAccess);
if (err != Success) {
/* restore pFont for step 4 (described below) */
@@ -1399,7 +1399,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
if (client->clientGone) {
fpe = c->pGC->font->fpe;
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
err = Success;
goto bail;
}
@@ -1413,7 +1413,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
/* Our drawable has disappeared. Treat like client died... ask
the FPE code to clean up after client. */
fpe = c->pGC->font->fpe;
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
err = Success;
goto bail;
}
@@ -1819,7 +1819,7 @@ DeleteClientFontStuff(ClientPtr client)
for (i = 0; i < num_fpes; i++) {
fpe = font_path_elements[i];
if (fpe_functions[fpe->type].client_died)
- (*fpe_functions[fpe->type].client_died) ((pointer) client, fpe);
+ (*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
}
}
@@ -1937,7 +1937,7 @@ FreeFonts(void)
FontPtr
find_old_font(XID id)
{
- pointer pFont;
+ void *pFont;
dixLookupResourceByType(&pFont, id, RT_NONE, serverClient, DixReadAccess);
return (FontPtr) pFont;
@@ -1954,7 +1954,7 @@ _X_EXPORT
int
StoreFontClientFont(FontPtr pfont, Font id)
{
- return AddResource(id, RT_NONE, (pointer) pfont);
+ return AddResource(id, RT_NONE, (void *) pfont);
}
_X_EXPORT
@@ -1985,7 +1985,7 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
}
if (fs_handlers_installed == 0) {
if (!RegisterBlockAndWakeupHandlers(block_handler,
- FontWakeup, (pointer) 0))
+ FontWakeup, (void *) 0))
return AllocError;
fs_handlers_installed++;
}
@@ -2002,7 +2002,7 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler,
/* remove the handlers if no one else is using them */
if (--fs_handlers_installed == 0) {
RemoveBlockAndWakeupHandlers(block_handler, FontWakeup,
- (pointer) 0);
+ (void *) 0);
}
}
RemoveFontWakeup(fpe);
diff --git a/dix/dixutils.c b/dix/dixutils.c
index c250bb1..220040f 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -199,7 +199,7 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
*pDraw = NULL;
- rc = dixLookupResourceByClass((pointer *) &pTmp, id, RC_DRAWABLE, client,
+ rc = dixLookupResourceByClass((void **) &pTmp, id, RC_DRAWABLE, client,
access);
if (rc != Success)
@@ -236,7 +236,7 @@ dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access)
int
dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access)
{
- return dixLookupResourceByType((pointer *) pGC, id, RT_GC, client, access);
+ return dixLookupResourceByType((void **) pGC, id, RT_GC, client, access);
}
int
@@ -246,11 +246,11 @@ dixLookupFontable(FontPtr *pFont, XID id, ClientPtr client, Mask access)
GC *pGC;
client->errorValue = id; /* EITHER font or gc */
- rc = dixLookupResourceByType((pointer *) pFont, id, RT_FONT, client,
+ rc = dixLookupResourceByType((void **) pFont, id, RT_FONT, client,
access);
if (rc != BadFont)
return rc;
- rc = dixLookupResourceByType((pointer *) &pGC, id, RT_GC, client, access);
+ rc = dixLookupResourceByType((void **) &pGC, id, RT_GC, client, access);
if (rc == BadGC)
return BadFont;
if (rc == Success)
@@ -261,7 +261,7 @@ dixLookupFontable(FontPtr *pFont, XID id, ClientPtr client, Mask access)
int
dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
{
- pointer pRes;
+ void *pRes;
int rc = BadValue, clientIndex = CLIENT_ID(rid);
if (!clientIndex || !clients[clientIndex] || (rid & SERVER_BIT))
@@ -296,7 +296,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
j = 0;
if (numnow) {
pTmp = client->saveSet;
- while ((j < numnow) && (SaveSetWindow(pTmp[j]) != (pointer) pWin))
+ while ((j < numnow) && (SaveSetWindow(pTmp[j]) != (void *) pWin))
j++;
}
if (mode == SetModeInsert) {
@@ -362,7 +362,7 @@ NoopDDA(void)
typedef struct _BlockHandler {
BlockHandlerProcPtr BlockHandler;
WakeupHandlerProcPtr WakeupHandler;
- pointer blockData;
+ void *blockData;
Bool deleted;
} BlockHandlerRec, *BlockHandlerPtr;
@@ -378,7 +378,7 @@ static Bool handlerDeleted;
* \param pReadMask nor how it represents the det of descriptors
*/
void
-BlockHandler(pointer pTimeout, pointer pReadmask)
+BlockHandler(void *pTimeout, void *pReadmask)
{
int i, j;
@@ -413,7 +413,7 @@ BlockHandler(pointer pTimeout, pointer pReadmask)
* \param pReadmask the resulting descriptor mask
*/
void
-WakeupHandler(int result, pointer pReadmask)
+WakeupHandler(int result, void *pReadmask)
{
int i, j;
@@ -449,7 +449,7 @@ WakeupHandler(int result, pointer pReadmask)
Bool
RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler,
- pointer blockData)
+ void *blockData)
{
BlockHandlerPtr new;
@@ -472,7 +472,7 @@ RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
void
RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr blockHandler,
WakeupHandlerProcPtr wakeupHandler,
- pointer blockData)
+ void *blockData)
{
int i;
@@ -557,8 +557,8 @@ ProcessWorkQueueZombies(void)
Bool
QueueWorkProc(Bool (*function)
- (ClientPtr /* pClient */ , pointer /* closure */ ),
- ClientPtr client, pointer closure)
+ (ClientPtr /* pClient */ , void */* closure */ ),
+ ClientPtr client, void *closure)
{
WorkQueuePtr q;
@@ -586,13 +586,13 @@ typedef struct _SleepQueue {
struct _SleepQueue *next;
ClientPtr client;
ClientSleepProcPtr function;
- pointer closure;
+ void *closure;
} SleepQueueRec, *SleepQueuePtr;
static SleepQueuePtr sleepQueue = NULL;
Bool
-ClientSleep(ClientPtr client, ClientSleepProcPtr function, pointer closure)
+ClientSleep(ClientPtr client, ClientSleepProcPtr function, void *closure)
{
SleepQueuePtr q;
@@ -666,7 +666,7 @@ static int numCallbackListsToCleanup = 0;
static CallbackListPtr **listsToCleanup = NULL;
static Bool
-_AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
+_AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{
CallbackPtr cbr;
@@ -682,7 +682,7 @@ _AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
}
static Bool
-_DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
+_DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{
CallbackListPtr cbl = *pcbl;
CallbackPtr cbr, pcbr;
@@ -709,7 +709,7 @@ _DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
}
void
-_CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
+_CallCallbacks(CallbackListPtr *pcbl, void *call_data)
{
CallbackListPtr cbl = *pcbl;
CallbackPtr cbr, pcbr;
@@ -821,7 +821,7 @@ CreateCallbackList(CallbackListPtr *pcbl)
/* ===== Public Procedures ===== */
Bool
-AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
+AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{
if (!pcbl)
return FALSE;
@@ -833,7 +833,7 @@ AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
}
Bool
-DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
+DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, void *data)
{
if (!pcbl || !*pcbl)
return FALSE;
diff --git a/dix/events.c b/dix/events.c
index e198112..ddbd4d2 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -580,7 +580,7 @@ XineramaSetWindowPntrs(DeviceIntPtr pDev, WindowPtr pWin)
PanoramiXRes *win;
int rc, i;
- rc = dixLookupResourceByType((pointer *) &win, pWin->drawable.id,
+ rc = dixLookupResourceByType((void **) &win, pWin->drawable.id,
XRT_WINDOW, serverClient, DixReadAccess);
if (rc != Success)
return FALSE;
@@ -1162,7 +1162,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device)
eventinfo.event = ev;
eventinfo.device = device;
- CallCallbacks(&DeviceEventCallback, (pointer) &eventinfo);
+ CallCallbacks(&DeviceEventCallback, (void *) &eventinfo);
}
if (event->type == ET_Motion) {
@@ -4417,7 +4417,7 @@ RecalculateDeliverableEvents(WindowPtr pWin)
* \param value must conform to DeleteType
*/
int
-OtherClientGone(pointer value, XID id)
+OtherClientGone(void *value, XID id)
{
OtherClientsPtr other, prev;
WindowPtr pWin = (WindowPtr) value;
@@ -4498,7 +4498,7 @@ EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
others->resource = FakeClientID(client->index);
others->next = pWin->optional->otherClients;
pWin->optional->otherClients = others;
- if (!AddResource(others->resource, RT_OTHERCLIENT, (pointer) pWin))
+ if (!AddResource(others->resource, RT_OTHERCLIENT, (void *) pWin))
return BadAlloc;
}
maskSet:
@@ -4985,7 +4985,7 @@ ProcChangeActivePointerGrab(ClientPtr client)
if (stuff->cursor == None)
newCursor = NullCursor;
else {
- int rc = dixLookupResourceByType((pointer *) &newCursor, stuff->cursor,
+ int rc = dixLookupResourceByType((void **) &newCursor, stuff->cursor,
RT_CURSOR, client, DixUseAccess);
if (rc != Success) {
@@ -5102,7 +5102,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
if (curs == None)
cursor = NullCursor;
else {
- rc = dixLookupResourceByType((pointer *) &cursor, curs, RT_CURSOR,
+ rc = dixLookupResourceByType((void **) &cursor, curs, RT_CURSOR,
client, DixUseAccess);
if (rc != Success) {
client->errorValue = curs;
@@ -5628,7 +5628,7 @@ ProcGrabButton(ClientPtr client)
if (stuff->cursor == None)
cursor = NullCursor;
else {
- rc = dixLookupResourceByType((pointer *) &cursor, stuff->cursor,
+ rc = dixLookupResourceByType((void **) &cursor, stuff->cursor,
RT_CURSOR, client, DixUseAccess);
if (rc != Success) {
client->errorValue = stuff->cursor;
@@ -5882,7 +5882,7 @@ ProcRecolorCursor(ClientPtr client)
REQUEST(xRecolorCursorReq);
REQUEST_SIZE_MATCH(xRecolorCursorReq);
- rc = dixLookupResourceByType((pointer *) &pCursor, stuff->cursor, RT_CURSOR,
+ rc = dixLookupResourceByType((void **) &pCursor, stuff->cursor, RT_CURSOR,
client, DixWriteAccess);
if (rc != Success) {
client->errorValue = stuff->cursor;
@@ -5983,7 +5983,7 @@ WriteEventsToClient(ClientPtr pClient, int count, xEvent *events)
eventinfo.client = pClient;
eventinfo.events = events;
eventinfo.count = count;
- CallCallbacks(&EventCallback, (pointer) &eventinfo);
+ CallCallbacks(&EventCallback, (void *) &eventinfo);
}
#ifdef XSERVER_DTRACE
if (XSERVER_SEND_EVENT_ENABLED()) {
diff --git a/dix/gc.c b/dix/gc.c
index f46e0dd..efe6d60 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -339,7 +339,7 @@ ChangeGC(ClientPtr client, GC * pGC, BITS32 mask, ChangeGCValPtr pUnion)
pPixmap->refcnt++;
}
(*pGC->funcs->ChangeClip) (pGC, pPixmap ? CT_PIXMAP : CT_NONE,
- (pointer) pPixmap, 0);
+ (void *) pPixmap, 0);
break;
case GCDashOffset:
NEXTVAL(INT16, pGC->dashOffset);
@@ -494,7 +494,7 @@ NewGCObject(ScreenPtr pScreen, int depth)
pGC->clipOrg.x = 0;
pGC->clipOrg.y = 0;
pGC->clientClipType = CT_NONE;
- pGC->clientClip = (pointer) NULL;
+ pGC->clientClip = (void *) NULL;
pGC->numInDashList = 2;
pGC->dash = DefaultDash;
pGC->dashOffset = 0;
@@ -764,7 +764,7 @@ CopyGC(GC * pgcSrc, GC * pgcDst, BITS32 mask)
* \param value must conform to DeleteType
*/
int
-FreeGC(pointer value, XID gid)
+FreeGC(void *value, XID gid)
{
GCPtr pGC = (GCPtr) value;
@@ -1023,7 +1023,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
if (size)
memmove((char *) prectsNew, (char *) prects, size);
- (*pGC->funcs->ChangeClip) (pGC, newct, (pointer) prectsNew, nrects);
+ (*pGC->funcs->ChangeClip) (pGC, newct, (void *) prectsNew, nrects);
if (pGC->funcs->ChangeGC)
(*pGC->funcs->ChangeGC) (pGC,
GCClipXOrigin | GCClipYOrigin | GCClipMask);
diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c
index 9004cb1..5404025 100644
--- a/dix/glyphcurs.c
+++ b/dix/glyphcurs.c
@@ -114,7 +114,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm,
/* fill the pixmap with 0 */
gcval[0].val = GXcopy;
gcval[1].val = 0;
- gcval[2].ptr = (pointer) pfont;
+ gcval[2].ptr = (void *) pfont;
ChangeGC(NullClient, pGC, GCFunction | GCForeground | GCFont, gcval);
ValidateGC((DrawablePtr) ppix, pGC);
(*pGC->ops->PolyFillRect) ((DrawablePtr) ppix, pGC, 1, &rect);
diff --git a/dix/grabs.c b/dix/grabs.c
index a03897a..5fd6820 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -317,7 +317,7 @@ CopyGrab(GrabPtr dst, const GrabPtr src)
}
int
-DeletePassiveGrab(pointer value, XID id)
+DeletePassiveGrab(void *value, XID id)
{
GrabPtr g, prev;
GrabPtr pGrab = (GrabPtr) value;
@@ -564,7 +564,7 @@ AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
pGrab->next = pGrab->window->optional->passiveGrabs;
pGrab->window->optional->passiveGrabs = pGrab;
- if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (pointer) pGrab))
+ if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (void *) pGrab))
return Success;
return BadAlloc;
}
@@ -662,7 +662,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
ok = FALSE;
}
else if (!AddResource(pNewGrab->resource, RT_PASSIVEGRAB,
- (pointer) pNewGrab))
+ (void *) pNewGrab))
ok = FALSE;
else
adds[nadds++] = pNewGrab;
diff --git a/dix/main.c b/dix/main.c
index 05dcbed..fcc1ad3 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -168,7 +168,7 @@ dix_main(int argc, char *argv[], char *envp[])
serverClient = calloc(sizeof(ClientRec), 1);
if (!serverClient)
FatalError("couldn't create server client");
- InitClient(serverClient, 0, (pointer) NULL);
+ InitClient(serverClient, 0, (void *) NULL);
}
else
ResetWellKnownSockets();
diff --git a/dix/pixmap.c b/dix/pixmap.c
index d5dc383..4b880af 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -49,7 +49,7 @@ from The Open Group.
/* callable by ddx */
PixmapPtr
GetScratchPixmapHeader(ScreenPtr pScreen, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
PixmapPtr pPixmap = pScreen->pScratchPixmap;
diff --git a/dix/privates.c b/dix/privates.c
index 41b1a76..e03b225 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -259,7 +259,7 @@ fixupDefaultColormaps(FixupFunc fixup, unsigned bytes)
for (s = 0; s < screenInfo.numScreens; s++) {
ColormapPtr cmap;
- dixLookupResourceByType((pointer *) &cmap,
+ dixLookupResourceByType((void **) &cmap,
screenInfo.screens[s]->defColormap, RT_COLORMAP,
serverClient, DixCreateAccess);
if (cmap &&
@@ -348,7 +348,7 @@ dixRegisterPrivateKey(DevPrivateKey key, DevPrivateType type, unsigned size)
if (size == 0)
bytes = sizeof(void *);
- /* align to void * size */
+ /* align to pointer size */
bytes = (bytes + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
/* Update offsets for all affected keys */
@@ -697,7 +697,7 @@ _dixAllocateScreenObjectWithPrivates(ScreenPtr pScreen,
privates_size = pScreen->screenSpecificPrivates[type].offset;
else
privates_size = global_keys[type].offset;
- /* round up so that void * is aligned */
+ /* round up so that pointer is aligned */
baseSize = (baseSize + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
totalSize = baseSize + privates_size;
object = malloc(totalSize);
diff --git a/dix/property.c b/dix/property.c
index dec4090..9f51cd0 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -242,7 +242,7 @@ ProcChangeProperty(ClientPtr client)
int
dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
Atom type, int format, int mode, unsigned long len,
- pointer value, Bool sendevent)
+ void *value, Bool sendevent)
{
PropertyPtr pProp;
PropertyRec savedProp;
@@ -356,7 +356,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
int
ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
- int mode, unsigned long len, pointer value, Bool sendevent)
+ int mode, unsigned long len, void *value, Bool sendevent)
{
return dixChangeWindowProperty(serverClient, pWin, property, type, format,
mode, len, value, sendevent);
diff --git a/dix/resource.c b/dix/resource.c
index 2aafa34..623d862 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -165,7 +165,7 @@ typedef struct _Resource {
struct _Resource *next;
XID id;
RESTYPE type;
- pointer value;
+ void *value;
} ResourceRec, *ResourcePtr;
typedef struct _ClientResource {
@@ -203,7 +203,7 @@ struct ResourceType {
* resource can't be determined.
*/
static void
-GetDefaultBytes(pointer value, XID id, ResourceSizePtr size)
+GetDefaultBytes(void *value, XID id, ResourceSizePtr size)
{
size->resourceSize = 0;
size->pixmapRefSize = 0;
@@ -224,7 +224,7 @@ GetDefaultBytes(pointer value, XID id, ResourceSizePtr size)
* @param[out] cdata Pointer to opaque data.
*/
static void
-DefaultFindSubRes(pointer value, FindAllRes func, pointer cdata)
+DefaultFindSubRes(void *value, FindAllRes func, void *cdata)
{
/* do nothing */
}
@@ -268,7 +268,7 @@ GetDrawableBytes(DrawablePtr drawable)
* pixmap reference.
*/
static void
-GetPixmapBytes(pointer value, XID id, ResourceSizePtr size)
+GetPixmapBytes(void *value, XID id, ResourceSizePtr size)
{
PixmapPtr pixmap = value;
@@ -297,7 +297,7 @@ GetPixmapBytes(pointer value, XID id, ResourceSizePtr size)
* pixmap references of a window.
*/
static void
-GetWindowBytes(pointer value, XID id, ResourceSizePtr size)
+GetWindowBytes(void *value, XID id, ResourceSizePtr size)
{
SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP);
ResourceSizeRec pixmapSize = { 0, 0, 0 };
@@ -339,7 +339,7 @@ GetWindowBytes(pointer value, XID id, ResourceSizePtr size)
* @param[out] cdata Pointer to opaque data
*/
static void
-FindWindowSubRes(pointer value, FindAllRes func, pointer cdata)
+FindWindowSubRes(void *value, FindAllRes func, void *cdata)
{
WindowPtr window = value;
@@ -370,7 +370,7 @@ FindWindowSubRes(pointer value, FindAllRes func, pointer cdata)
* pixmap references of a graphics context.
*/
static void
-GetGcBytes(pointer value, XID id, ResourceSizePtr size)
+GetGcBytes(void *value, XID id, ResourceSizePtr size)
{
SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP);
ResourceSizeRec pixmapSize = { 0, 0, 0 };
@@ -411,7 +411,7 @@ GetGcBytes(pointer value, XID id, ResourceSizePtr size)
* @param[out] cdata Pointer to opaque data
*/
static void
-FindGCSubRes(pointer value, FindAllRes func, pointer cdata)
+FindGCSubRes(void *value, FindAllRes func, void *cdata)
{
GCPtr gc = value;
@@ -743,7 +743,7 @@ GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
unsigned int found = 0;
XID rc, id = pClient->clientAsMask;
XID maxid;
- pointer val;
+ void *val;
maxid = id | RESOURCE_ID_MASK;
while ((found < count) && (id <= maxid)) {
@@ -787,7 +787,7 @@ FakeClientID(int client)
}
Bool
-AddResource(XID id, RESTYPE type, pointer value)
+AddResource(XID id, RESTYPE type, void *value)
{
int client;
ClientResourceRec *rrec;
@@ -948,7 +948,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
*/
Bool
-ChangeResourceValue(XID id, RESTYPE rtype, pointer value)
+ChangeResourceValue(XID id, RESTYPE rtype, void *value)
{
int cid;
ResourcePtr res;
@@ -973,7 +973,7 @@ ChangeResourceValue(XID id, RESTYPE rtype, pointer value)
void
FindClientResourcesByType(ClientPtr client,
- RESTYPE type, FindResType func, pointer cdata)
+ RESTYPE type, FindResType func, void *cdata)
{
ResourcePtr *resources;
ResourcePtr this, next;
@@ -998,17 +998,17 @@ FindClientResourcesByType(ClientPtr client,
}
}
-void FindSubResources(pointer resource,
+void FindSubResources(void *resource,
RESTYPE type,
FindAllRes func,
- pointer cdata)
+ void *cdata)
{
struct ResourceType rtype = resourceTypes[type & TypeMask];
rtype.findSubResFunc(resource, func, cdata);
}
void
-FindAllClientResources(ClientPtr client, FindAllRes func, pointer cdata)
+FindAllClientResources(ClientPtr client, FindAllRes func, void *cdata)
{
ResourcePtr *resources;
ResourcePtr this, next;
@@ -1031,14 +1031,14 @@ FindAllClientResources(ClientPtr client, FindAllRes func, pointer cdata)
}
}
-pointer
+void *
LookupClientResourceComplex(ClientPtr client,
RESTYPE type,
- FindComplexResType func, pointer cdata)
+ FindComplexResType func, void *cdata)
{
ResourcePtr *resources;
ResourcePtr this, next;
- pointer value;
+ void *value;
int i;
if (!client)
@@ -1158,7 +1158,7 @@ FreeAllResources(void)
Bool
LegalNewID(XID id, ClientPtr client)
{
- pointer val;
+ void *val;
int rc;
#ifdef PANORAMIX
@@ -1181,7 +1181,7 @@ LegalNewID(XID id, ClientPtr client)
}
int
-dixLookupResourceByType(pointer *result, XID id, RESTYPE rtype,
+dixLookupResourceByType(void **result, XID id, RESTYPE rtype,
ClientPtr client, Mask mode)
{
int cid = CLIENT_ID(id);
@@ -1216,7 +1216,7 @@ dixLookupResourceByType(pointer *result, XID id, RESTYPE rtype,
}
int
-dixLookupResourceByClass(pointer *result, XID id, RESTYPE rclass,
+dixLookupResourceByClass(void **result, XID id, RESTYPE rclass,
ClientPtr client, Mask mode)
{
int cid = CLIENT_ID(id);
diff --git a/dix/touch.c b/dix/touch.c
index a7ea213..1eeed78 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -75,7 +75,7 @@ static unsigned char resize_waiting[(MAXDEVICES + 7) / 8];
* anyway and re-executing this won't help.
*/
static Bool
-TouchResizeQueue(ClientPtr client, pointer closure)
+TouchResizeQueue(ClientPtr client, void *closure)
{
int i;
diff --git a/dix/window.c b/dix/window.c
index fad57fa..f4acdc8 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -305,7 +305,7 @@ PrintWindowTree(void)
}
int
-TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data)
+TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, void *data)
{
int result;
WindowPtr pChild;
@@ -338,7 +338,7 @@ TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data)
*****/
int
-WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, pointer data)
+WalkTree(ScreenPtr pScreen, VisitWindowProcPtr func, void *data)
{
return (TraverseTree(pScreen->root, func, data));
}
@@ -363,7 +363,7 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->backingStore = NotUseful;
pWin->DIXsaveUnder = FALSE;
- pWin->backStorage = (pointer) NULL;
+ pWin->backStorage = (void *) NULL;
pWin->mapped = FALSE; /* off */
pWin->realized = FALSE; /* off */
@@ -524,7 +524,7 @@ CreateRootWindow(ScreenPtr pScreen)
RT_WINDOW, pWin, RT_NONE, NULL, DixCreateAccess))
return FALSE;
- if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer) pWin))
+ if (!AddResource(pWin->drawable.id, RT_WINDOW, (void *) pWin))
return FALSE;
if (disableBackingStore)
@@ -959,7 +959,7 @@ CrushTree(WindowPtr pWin)
*****/
int
-DeleteWindow(pointer value, XID wid)
+DeleteWindow(void *value, XID wid)
{
WindowPtr pParent;
WindowPtr pWin = (WindowPtr) value;
@@ -1107,7 +1107,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
* incremented. */
}
else {
- rc = dixLookupResourceByType((pointer *) &pPixmap, pixID,
+ rc = dixLookupResourceByType((void **) &pPixmap, pixID,
RT_PIXMAP, client, DixReadAccess);
if (rc == Success) {
if ((pPixmap->drawable.depth != pWin->drawable.depth) ||
@@ -1161,7 +1161,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
pixID = pWin->parent->border.pixmap->drawable.id;
}
}
- rc = dixLookupResourceByType((pointer *) &pPixmap, pixID, RT_PIXMAP,
+ rc = dixLookupResourceByType((void **) &pPixmap, pixID, RT_PIXMAP,
client, DixReadAccess);
if (rc == Success) {
if ((pPixmap->drawable.depth != pWin->drawable.depth) ||
@@ -1308,7 +1308,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
error = BadMatch;
goto PatchUp;
}
- rc = dixLookupResourceByType((pointer *) &pCmap, cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pCmap, cmap, RT_COLORMAP,
client, DixUseAccess);
if (rc != Success) {
error = rc;
@@ -1378,7 +1378,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
pCursor = (CursorPtr) None;
}
else {
- rc = dixLookupResourceByType((pointer *) &pCursor, cursorID,
+ rc = dixLookupResourceByType((void **) &pCursor, cursorID,
RT_CURSOR, client, DixUseAccess);
if (rc != Success) {
error = rc;
@@ -2377,7 +2377,7 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
}
static int
-CompareWIDs(WindowPtr pWin, pointer value)
+CompareWIDs(WindowPtr pWin, void *value)
{ /* must conform to VisitWindowProcPtr */
Window *wid = (Window *) value;
@@ -2402,7 +2402,7 @@ ReparentWindow(WindowPtr pWin, WindowPtr pParent,
ScreenPtr pScreen;
pScreen = pWin->drawable.pScreen;
- if (TraverseTree(pWin, CompareWIDs, (pointer) &pParent->drawable.id) ==
+ if (TraverseTree(pWin, CompareWIDs, (void *) &pParent->drawable.id) ==
WT_STOPWALKING)
return BadMatch;
if (!MakeWindowOptional(pWin))
@@ -2688,7 +2688,7 @@ UnrealizeTree(WindowPtr pWin, Bool fromConfigure)
#ifdef PANORAMIX
if (!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
PanoramiXRes *win;
- int rc = dixLookupResourceByType((pointer *) &win,
+ int rc = dixLookupResourceByType((void **) &win,
pChild->drawable.id,
XRT_WINDOW,
serverClient, DixWriteAccess);
@@ -3167,7 +3167,7 @@ TileScreenSaver(ScreenPtr pScreen, int kind)
&cursor, serverClient, (XID) 0);
if (cursor) {
cursorID = FakeClientID(0);
- if (AddResource(cursorID, RT_CURSOR, (pointer) cursor)) {
+ if (AddResource(cursorID, RT_CURSOR, (void *) cursor)) {
attributes[attri] = cursorID;
mask |= CWCursor;
}
@@ -3196,7 +3196,7 @@ TileScreenSaver(ScreenPtr pScreen, int kind)
return FALSE;
if (!AddResource(pWin->drawable.id, RT_WINDOW,
- (pointer) pScreen->screensaver.pWindow))
+ (void *) pScreen->screensaver.pWindow))
return FALSE;
if (mask & CWBackPixmap) {
diff --git a/dri3/dri3_event.c b/dri3/dri3_event.c
index 02f0f65..cb509a2 100644
--- a/dri3/dri3_event.c
+++ b/dri3/dri3_event.c
@@ -29,7 +29,7 @@
RESTYPE dri3_event_type;
static int
-dri3_free_event(pointer data, XID id)
+dri3_free_event(void *data, XID id)
{
dri3_event_ptr dri3_event = (dri3_event_ptr) data;
dri3_window_priv_ptr window_priv = dri3_window_priv(dri3_event->window);
@@ -41,7 +41,7 @@ dri3_free_event(pointer data, XID id)
break;
}
}
- free((pointer) dri3_event);
+ free((void *) dri3_event);
return 1;
}
@@ -145,7 +145,7 @@ dri3_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask)
event->next = window_priv->events;
window_priv->events = event;
- if (!AddResource(event->id, dri3_event_type, (pointer) event))
+ if (!AddResource(event->id, dri3_event_type, (void *) event))
return BadAlloc;
return Success;
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 4e1408f..31dce83 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -168,7 +168,7 @@ proc_dri3_pixmap_from_buffer(ClientPtr client)
(*drawable->pScreen->DestroyPixmap) (pixmap);
return rc;
}
- if (AddResource(stuff->pixmap, RT_PIXMAP, (pointer) pixmap))
+ if (AddResource(stuff->pixmap, RT_PIXMAP, (void *) pixmap))
return Success;
return Success;
@@ -189,7 +189,7 @@ proc_dri3_buffer_from_pixmap(ClientPtr client)
PixmapPtr pixmap;
REQUEST_SIZE_MATCH(xDRI3BufferFromPixmapReq);
- rc = dixLookupResourceByType((pointer *) &pixmap, stuff->pixmap, RT_PIXMAP,
+ rc = dixLookupResourceByType((void **) &pixmap, stuff->pixmap, RT_PIXMAP,
client, DixWriteAccess);
if (rc != Success) {
client->errorValue = stuff->pixmap;
diff --git a/exa/exa.c b/exa/exa.c
index e961733..a2995db 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -475,7 +475,7 @@ static void
exaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void
- exaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects);
+ exaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects);
static void
exaCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
@@ -579,7 +579,7 @@ exaCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
}
static void
-exaChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+exaChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
ExaGCPriv(pGC);
swap(pExaGC, pGC, funcs);
@@ -702,8 +702,8 @@ exaCreateScreenResources(ScreenPtr pScreen)
}
static void
-ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout,
- pointer pReadmask)
+ExaBlockHandler(ScreenPtr pScreen, void *pTimeout,
+ void *pReadmask)
{
ExaScreenPriv(pScreen);
@@ -733,7 +733,7 @@ ExaBlockHandler(ScreenPtr pScreen, pointer pTimeout,
static void
ExaWakeupHandler(ScreenPtr pScreen, unsigned long result,
- pointer pReadmask)
+ void *pReadmask)
{
ExaScreenPriv(pScreen);
diff --git a/exa/exa.h b/exa/exa.h
index be022b2..98d094d 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -58,7 +58,7 @@ struct _ExaOffscreenArea {
int offset; /* aligned offset */
int size; /* total allocation size */
unsigned last_use;
- pointer privData;
+ void *privData;
ExaOffscreenSaveProc save;
@@ -685,7 +685,7 @@ typedef struct _ExaDriver {
*/
Bool (*ModifyPixmapHeader) (PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData);
+ void *pPixData);
/* hooks for drivers with tiling support:
* driver MUST fill out new_fb_pitch with valid pitch of pixmap
@@ -784,7 +784,7 @@ extern _X_EXPORT ExaOffscreenArea *exaOffscreenAlloc(ScreenPtr pScreen,
int size, int align,
Bool locked,
ExaOffscreenSaveProc save,
- pointer privData);
+ void *privData);
extern _X_EXPORT ExaOffscreenArea *exaOffscreenFree(ScreenPtr pScreen,
ExaOffscreenArea * area);
diff --git a/exa/exa_classic.c b/exa/exa_classic.c
index 0fa422f..a6a60e5 100644
--- a/exa/exa_classic.c
+++ b/exa/exa_classic.c
@@ -147,7 +147,7 @@ exaCreatePixmap_classic(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData)
+ void *pPixData)
{
ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
diff --git a/exa/exa_driver.c b/exa/exa_driver.c
index d467ca9..8799a79 100644
--- a/exa/exa_driver.c
+++ b/exa/exa_driver.c
@@ -130,7 +130,7 @@ exaCreatePixmap_driver(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData)
+ void *pPixData)
{
ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
@@ -218,7 +218,7 @@ exaPixmapHasGpuCopy_driver(PixmapPtr pPixmap)
ScreenPtr pScreen = pPixmap->drawable.pScreen;
ExaScreenPriv(pScreen);
- pointer saved_ptr;
+ void *saved_ptr;
Bool ret;
saved_ptr = pPixmap->devPrivate.ptr;
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
index 71f750f..aa71b21 100644
--- a/exa/exa_glyphs.c
+++ b/exa/exa_glyphs.c
@@ -127,7 +127,7 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen, unsigned int format)
continue;
if (cache->picture) {
- FreePicture((pointer) cache->picture, (XID) 0);
+ FreePicture((void *) cache->picture, (XID) 0);
cache->picture = NULL;
}
@@ -225,7 +225,7 @@ exaRealizeGlyphCaches(ScreenPtr pScreen, unsigned int format)
}
/* Each cache references the picture individually */
- FreePicture((pointer) pPicture, (XID) 0);
+ FreePicture((void *) pPicture, (XID) 0);
return TRUE;
bail:
@@ -737,7 +737,7 @@ exaGlyphs(CARD8 op,
/* The driver can't seem to composite to a8, let's try argb (but
* without component-alpha) */
- FreePicture((pointer) pMask, (XID) 0);
+ FreePicture((void *) pMask, (XID) 0);
argbFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8);
@@ -833,7 +833,7 @@ exaGlyphs(CARD8 op,
pDst,
xSrc + x - first_xOff,
ySrc + y - first_yOff, 0, 0, x, y, width, height);
- FreePicture((pointer) pMask, (XID) 0);
+ FreePicture((void *) pMask, (XID) 0);
(*pScreen->DestroyPixmap) (pMaskPixmap);
}
}
diff --git a/exa/exa_migration_classic.c b/exa/exa_migration_classic.c
index e890f67..f712e19 100644
--- a/exa/exa_migration_classic.c
+++ b/exa/exa_migration_classic.c
@@ -350,7 +350,7 @@ exaDoMoveInPixmap(ExaMigrationPtr migrate)
pExaPixmap->area =
exaOffscreenAlloc(pScreen, pExaPixmap->fb_size,
pExaScr->info->pixmapOffsetAlign, FALSE,
- exaPixmapSave, (pointer) pPixmap);
+ exaPixmapSave, (void *) pPixmap);
if (pExaPixmap->area == NULL)
return;
@@ -465,12 +465,12 @@ exaMigrateTowardFb(ExaMigrationPtr migrate)
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED) {
DBG_MIGRATE(("UseScreen: not migrating pinned pixmap %p\n",
- (pointer) pPixmap));
+ (void *) pPixmap));
return;
}
DBG_MIGRATE(("UseScreen %p score %d\n",
- (pointer) pPixmap, pExaPixmap->score));
+ (void *) pPixmap, pExaPixmap->score));
if (pExaPixmap->score == EXA_PIXMAP_SCORE_INIT) {
exaDoMoveInPixmap(migrate);
@@ -504,7 +504,7 @@ exaMigrateTowardSys(ExaMigrationPtr migrate)
ExaPixmapPriv(pPixmap);
- DBG_MIGRATE(("UseMem: %p score %d\n", (pointer) pPixmap,
+ DBG_MIGRATE(("UseMem: %p score %d\n", (void *) pPixmap,
pExaPixmap->score));
if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index b43dfec..f618a1e 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -125,7 +125,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
ScreenPtr pScreen;
ExaScreenPrivPtr pExaScr;
@@ -282,7 +282,7 @@ exaPixmapHasGpuCopy_mixed(PixmapPtr pPixmap)
ExaScreenPriv(pScreen);
ExaPixmapPriv(pPixmap);
- pointer saved_ptr;
+ void *saved_ptr;
Bool ret;
if (!pExaPixmap->driverPriv)
diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c
index 1f571cf..e287348 100644
--- a/exa/exa_offscreen.c
+++ b/exa/exa_offscreen.c
@@ -160,7 +160,7 @@ exaFindAreaToEvict(ExaScreenPrivPtr pExaScr, int size, int align)
*/
ExaOffscreenArea *
exaOffscreenAlloc(ScreenPtr pScreen, int size, int align,
- Bool locked, ExaOffscreenSaveProc save, pointer privData)
+ Bool locked, ExaOffscreenSaveProc save, void *privData)
{
ExaOffscreenArea *area;
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index aba3934..61a1f4c 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -430,13 +430,13 @@ void
ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
void
ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
void
@@ -609,7 +609,7 @@ Bool
exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData);
+ void *pPixData);
Bool
exaDestroyPixmap_classic(PixmapPtr pPixmap);
@@ -627,7 +627,7 @@ Bool
exaModifyPixmapHeader_driver(PixmapPtr pPixmap, int width, int height,
int depth, int bitsPerPixel, int devKind,
- pointer pPixData);
+ void *pPixData);
Bool
exaDestroyPixmap_driver(PixmapPtr pPixmap);
@@ -644,7 +644,7 @@ exaCreatePixmap_mixed(ScreenPtr pScreen, int w, int h, int depth,
Bool
exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData);
+ int bitsPerPixel, int devKind, void *pPixData);
Bool
exaDestroyPixmap_mixed(PixmapPtr pPixmap);
diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
index b0a0011..58262e0 100644
--- a/exa/exa_unaccel.c
+++ b/exa/exa_unaccel.c
@@ -319,7 +319,7 @@ ExaCheckPolyFillRect(DrawablePtr pDrawable, GCPtr pGC,
void
ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
EXA_PRE_FALLBACK_GC(pGC);
EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable)));
@@ -334,7 +334,7 @@ ExaCheckImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
void
ExaCheckPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
EXA_PRE_FALLBACK_GC(pGC);
EXA_FALLBACK(("to %p (%c), style %d alu %d\n", pDrawable,
diff --git a/fb/fb.h b/fb/fb.h
index 26957df..9057767 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -776,7 +776,7 @@ fb24_32ModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
int depth,
- int bitsPerPixel, int devKind, pointer pPixData);
+ int bitsPerPixel, int devKind, void *pPixData);
/*
* fballpriv.c
@@ -1229,7 +1229,7 @@ fbPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase);
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
extern _X_EXPORT void
@@ -1237,7 +1237,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase);
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase);
/*
* fbimage.c
@@ -1409,7 +1409,7 @@ extern _X_EXPORT void
_fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap);
extern _X_EXPORT Bool
- fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
+ fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize, int dpix, /* dots per inch */
int dpiy, int width, /* pixel width of frame buffer */
@@ -1418,7 +1418,7 @@ extern _X_EXPORT Bool
extern _X_EXPORT Bool
wfbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -1430,7 +1430,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool
wfbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -1442,14 +1442,14 @@ wfbScreenInit(ScreenPtr pScreen,
extern _X_EXPORT Bool
fbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize, int dpix, int dpiy, int width, int bpp);
extern _X_EXPORT Bool
fbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp);
/*
diff --git a/fb/fb24_32.c b/fb/fb24_32.c
index 5eb81e8..ecb3951 100644
--- a/fb/fb24_32.c
+++ b/fb/fb24_32.c
@@ -495,7 +495,7 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
}
typedef struct {
- pointer pbits;
+ void *pbits;
int width;
} miScreenInitParmsRec, *miScreenInitParmsPtr;
@@ -526,7 +526,7 @@ fb24_32ModifyPixmapHeader(PixmapPtr pPixmap,
int width,
int height,
int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
int bpp, w;
diff --git a/fb/fb24_32.h b/fb/fb24_32.h
index 1bec00b..b357edf 100644
--- a/fb/fb24_32.h
+++ b/fb/fb24_32.h
@@ -31,14 +31,14 @@
Bool
fb24_32FinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize, int dpix, int dpiy, int width, int bpp);
Bool
fb24_32ScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp);
#endif
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 3080a77..4f2904c 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -241,7 +241,7 @@ fbPolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase)
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr pci;
@@ -309,7 +309,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppciInit, pointer pglyphBase)
+ unsigned int nglyph, CharInfoPtr * ppciInit, void *pglyphBase)
{
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
CharInfoPtr *ppci;
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index c6802e4..935bf1b 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -104,7 +104,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
for (i = 0; i < pScrPriv->nlayers; i++)
if (dixLookupPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin)) ==
- (pointer) pScrPriv->layer[i].u.run.pixmap)
+ (void *) pScrPriv->layer[i].u.run.pixmap)
return i;
return 0;
}
@@ -115,7 +115,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
int i;
FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
PixmapPtr pPixmap;
- pointer pbits;
+ void *pbits;
int width;
int depth;
BoxRec box;
@@ -250,8 +250,8 @@ fbOverlayWindowExposures(WindowPtr pWin,
Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
@@ -287,8 +287,8 @@ fb24_32OverlayCreateScreenResources(ScreenPtr pScreen)
Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
diff --git a/fb/fboverlay.h b/fb/fboverlay.h
index 9a93457..57c9873 100644
--- a/fb/fboverlay.h
+++ b/fb/fboverlay.h
@@ -38,7 +38,7 @@ typedef void (*fbOverlayPaintKeyProc) (DrawablePtr, RegionPtr, CARD32, int);
typedef struct _fbOverlayLayer {
union {
struct {
- pointer pbits;
+ void *pbits;
int width;
int depth;
} init;
@@ -89,8 +89,8 @@ fbOverlayWindowExposures(WindowPtr pWin,
extern _X_EXPORT Bool
fbOverlaySetupScreen(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
@@ -99,8 +99,8 @@ fbOverlaySetupScreen(ScreenPtr pScreen,
extern _X_EXPORT Bool
fbOverlayFinishScreenInit(ScreenPtr pScreen,
- pointer pbits1,
- pointer pbits2,
+ void *pbits1,
+ void *pbits2,
int xsize,
int ysize,
int dpix,
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 0824b64..677f28a 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -66,7 +66,7 @@ fbCreatePixmapBpp(ScreenPtr pScreen, int width, int height, int depth, int bpp,
pPixmap->drawable.height = height;
pPixmap->devKind = paddedWidth;
pPixmap->refcnt = 1;
- pPixmap->devPrivate.ptr = (pointer) ((char *) pPixmap + base + adjust);
+ pPixmap->devPrivate.ptr = (void *) ((char *) pPixmap + base + adjust);
pPixmap->master_pixmap = NULL;
#ifdef FB_DEBUG
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index f9080a4..b2b9739 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -90,7 +90,7 @@ _fbSetWindowPixmap(WindowPtr pWindow, PixmapPtr pPixmap)
}
Bool
-fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
+fbSetupScreen(ScreenPtr pScreen, void *pbits, /* pointer to screen bitmap */
int xsize, /* in pixels */
int ysize, int dpix, /* dots per inch */
int dpiy, int width, /* pixel width of frame buffer */
@@ -135,7 +135,7 @@ fbSetupScreen(ScreenPtr pScreen, pointer pbits, /* pointer to screen bitmap */
#ifdef FB_ACCESS_WRAPPER
Bool
wfbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -146,7 +146,7 @@ wfbFinishScreenInit(ScreenPtr pScreen,
#else
Bool
fbFinishScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp)
#endif
{
@@ -224,7 +224,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
#ifdef FB_ACCESS_WRAPPER
Bool
wfbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize,
int ysize,
int dpix,
@@ -242,7 +242,7 @@ wfbScreenInit(ScreenPtr pScreen,
#else
Bool
fbScreenInit(ScreenPtr pScreen,
- pointer pbits,
+ void *pbits,
int xsize, int ysize, int dpix, int dpiy, int width, int bpp)
{
if (!fbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp))
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index b8da048..187e426 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -133,7 +133,7 @@ _X_HIDDEN int
validGlxContext(ClientPtr client, XID id, int access_mode,
__GLXcontext ** context, int *err)
{
- *err = dixLookupResourceByType((pointer *) context, id,
+ *err = dixLookupResourceByType((void **) context, id,
__glXContextRes, client, access_mode);
if (*err != Success || (*context)->idExists == GL_FALSE) {
client->errorValue = id;
@@ -151,7 +151,7 @@ validGlxDrawable(ClientPtr client, XID id, int type, int access_mode,
{
int rc;
- rc = dixLookupResourceByType((pointer *) drawable, id,
+ rc = dixLookupResourceByType((void **) drawable, id,
__glXDrawableRes, client, access_mode);
if (rc != Success && rc != BadValue) {
*err = rc;
@@ -2507,7 +2507,7 @@ __glXpresentCompleteNotify(WindowPtr window, CARD8 present_mode, CARD32 serial,
int glx_type;
int rc;
- rc = dixLookupResourceByType((pointer *) &drawable, window->drawable.id,
+ rc = dixLookupResourceByType((void **) &drawable, window->drawable.id,
__glXDrawableRes, serverClient, DixGetAttrAccess);
if (rc != Success)
diff --git a/glx/glxext.c b/glx/glxext.c
index 316b4f6..6a34ac2 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -164,7 +164,7 @@ __glXAddContext(__GLXcontext * cx)
{
/* Register this context as a resource.
*/
- if (!AddResource(cx->id, __glXContextRes, (pointer)cx)) {
+ if (!AddResource(cx->id, __glXContextRes, (void *)cx)) {
return False;
}
@@ -278,7 +278,7 @@ glxGetClient(ClientPtr pClient)
}
static void
-glxClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+glxClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 0f7cb5c..99e970c 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -268,7 +268,7 @@ ProcDMXForceWindowCreation(ClientPtr client)
PanoramiXRes *win;
int i;
- if (Success != dixLookupResourceByType((pointer *) &win,
+ if (Success != dixLookupResourceByType((void **) &win,
stuff->window, XRT_WINDOW,
client, DixReadAccess))
return -1; /* BadWindow */
@@ -556,7 +556,7 @@ dmxPopulatePanoramiX(ClientPtr client, Window window,
int count = 0;
DMXWindowAttributesRec attr;
- if (Success != dixLookupResourceByType((pointer *) &win,
+ if (Success != dixLookupResourceByType((void **) &win,
window, XRT_WINDOW,
client, DixReadAccess))
return -1; /* BadWindow */
diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index c6c6a8e..fcc97e3 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -728,7 +728,7 @@ static Bool FoundPixImage;
* another screen with the same image. If so, copy the pixmap image
* from the existing screen to the newly created pixmap. */
static void
-dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type, pointer p)
+dmxBERestorePixmapImage(void *value, XID id, RESTYPE type, void *p)
{
if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
PixmapPtr pDst = (PixmapPtr) p;
@@ -737,7 +737,7 @@ dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type, pointer p)
PixmapPtr pPix;
int i;
- dixLookupResourceByType((pointer *) &pPix, pXinPix->info[idx].id,
+ dixLookupResourceByType((void **) &pPix, pXinPix->info[idx].id,
RT_PIXMAP, NullClient, DixUnknownAccess);
if (pPix != pDst)
return; /* Not a match.... Next! */
@@ -749,7 +749,7 @@ dmxBERestorePixmapImage(pointer value, XID id, RESTYPE type, pointer p)
if (i == idx)
continue; /* Self replication is bad */
- dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id,
+ dixLookupResourceByType((void **) &pSrc, pXinPix->info[i].id,
RT_PIXMAP, NullClient, DixUnknownAccess);
pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
if (pSrcPriv->pixmap) {
@@ -828,7 +828,7 @@ dmxBERestorePixmap(PixmapPtr pPixmap)
for (i = currentMaxClients; --i >= 0;)
if (clients[i])
FindAllClientResources(clients[i], dmxBERestorePixmapImage,
- (pointer) pPixmap);
+ (void *) pPixmap);
/* No corresponding pixmap image was found on other screens, so we
* need to copy it from the saved image when the screen was detached
@@ -895,7 +895,7 @@ dmxBERestorePixmap(PixmapPtr pPixmap)
* number passed in as \a n and calls the appropriate DMX function to
* create the associated resource on the back-end server. */
static void
-dmxBECreateResources(pointer value, XID id, RESTYPE type, pointer n)
+dmxBECreateResources(void *value, XID id, RESTYPE type, void *n)
{
int scrnNum = (uintptr_t) n;
ScreenPtr pScreen = screenInfo.screens[scrnNum];
@@ -1121,7 +1121,7 @@ dmxCompareScreens(DMXScreenInfo * new, DMXScreenInfo * old)
/** Restore Render's picture */
static void
-dmxBERestoreRenderPict(pointer value, XID id, pointer n)
+dmxBERestoreRenderPict(void *value, XID id, void *n)
{
PicturePtr pPicture = value; /* The picture */
DrawablePtr pDraw = pPicture->pDrawable; /* The picture's drawable */
@@ -1145,7 +1145,7 @@ dmxBERestoreRenderPict(pointer value, XID id, pointer n)
/** Restore Render's glyphs */
static void
-dmxBERestoreRenderGlyph(pointer value, XID id, pointer n)
+dmxBERestoreRenderGlyph(void *value, XID id, void *n)
{
GlyphSetPtr glyphSet = value;
int scrnNum = (uintptr_t) n;
@@ -1340,7 +1340,7 @@ dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
for (i = currentMaxClients; --i >= 0;)
if (clients[i])
FindAllClientResources(clients[i], dmxBECreateResources,
- (pointer) (uintptr_t) idx);
+ (void *) (uintptr_t) idx);
/* Create window hierarchy (top down) */
dmxBECreateWindowTree(idx);
@@ -1350,14 +1350,14 @@ dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
if (clients[i])
FindClientResourcesByType(clients[i], PictureType,
dmxBERestoreRenderPict,
- (pointer) (uintptr_t) idx);
+ (void *) (uintptr_t) idx);
/* Restore the glyph state for RENDER */
for (i = currentMaxClients; --i >= 0;)
if (clients[i])
FindClientResourcesByType(clients[i], GlyphSetType,
dmxBERestoreRenderGlyph,
- (pointer) (uintptr_t) idx);
+ (void *) (uintptr_t) idx);
/* Refresh screen by generating exposure events for all windows */
dmxForceExposures(idx);
@@ -1425,7 +1425,7 @@ dmxAttachScreen(int idx, DMXScreenAttributesPtr attr)
/** Search the Xinerama XRT_PIXMAP resources for the pixmap that needs
* to have its image saved. */
static void
-dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type, pointer p)
+dmxBEFindPixmapImage(void *value, XID id, RESTYPE type, void *p)
{
if ((type & TypeMask) == (XRT_PIXMAP & TypeMask)) {
PixmapPtr pDst = (PixmapPtr) p;
@@ -1434,7 +1434,7 @@ dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type, pointer p)
PixmapPtr pPix;
int i;
- dixLookupResourceByType((pointer *) &pPix, pXinPix->info[idx].id,
+ dixLookupResourceByType((void **) &pPix, pXinPix->info[idx].id,
RT_PIXMAP, NullClient, DixUnknownAccess);
if (pPix != pDst)
return; /* Not a match.... Next! */
@@ -1446,7 +1446,7 @@ dmxBEFindPixmapImage(pointer value, XID id, RESTYPE type, pointer p)
if (i == idx)
continue; /* Self replication is bad */
- dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id,
+ dixLookupResourceByType((void **) &pSrc, pXinPix->info[i].id,
RT_PIXMAP, NullClient, DixUnknownAccess);
pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
if (pSrcPriv->pixmap) {
@@ -1482,7 +1482,7 @@ dmxBESavePixmap(PixmapPtr pPixmap)
for (i = currentMaxClients; --i >= 0;)
if (clients[i])
FindAllClientResources(clients[i], dmxBEFindPixmapImage,
- (pointer) pPixmap);
+ (void *) pPixmap);
/* Save the image only if there is no other screens that have a
* pixmap that corresponds to the one we are trying to save. */
@@ -1522,7 +1522,7 @@ dmxBESavePixmap(PixmapPtr pPixmap)
* number passed in as \a n and calls the appropriate DMX function to
* free the associated resource on the back-end server. */
static void
-dmxBEDestroyResources(pointer value, XID id, RESTYPE type, pointer n)
+dmxBEDestroyResources(void *value, XID id, RESTYPE type, void *n)
{
int scrnNum = (uintptr_t) n;
ScreenPtr pScreen = screenInfo.screens[scrnNum];
@@ -1683,7 +1683,7 @@ dmxDetachScreen(int idx)
for (i = currentMaxClients; --i >= 0;)
if (clients[i])
FindAllClientResources(clients[i], dmxBEDestroyResources,
- (pointer) (uintptr_t) idx);
+ (void *) (uintptr_t) idx);
/* Free scratch GCs */
dmxBEDestroyScratchGCs(idx);
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index 7ef7ad9..6b81826 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -460,7 +460,7 @@ dmxRealizeFont(ScreenPtr pScreen, FontPtr pFont)
pFontPriv->refcnt = 0;
}
- FontSetPrivate(pFont, dmxFontPrivateIndex, (pointer) pFontPriv);
+ FontSetPrivate(pFont, dmxFontPrivateIndex, (void *) pFontPriv);
if (dmxScreen->beDisplay) {
if (!dmxBELoadFont(pScreen, pFont))
diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c
index 703aeb3..2d61ea2 100644
--- a/hw/dmx/dmxgc.c
+++ b/hw/dmx/dmxgc.c
@@ -378,7 +378,7 @@ dmxDestroyGC(GCPtr pGC)
/** Change the clip rects for a GC. */
void
-dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+dmxChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
ScreenPtr pScreen = pGC->pScreen;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
diff --git a/hw/dmx/dmxgc.h b/hw/dmx/dmxgc.h
index 7b99d88..c8ecb53 100644
--- a/hw/dmx/dmxgc.h
+++ b/hw/dmx/dmxgc.h
@@ -55,7 +55,7 @@ extern void dmxValidateGC(GCPtr pGC, unsigned long changes,
extern void dmxChangeGC(GCPtr pGC, unsigned long mask);
extern void dmxCopyGC(GCPtr pGCSrc, unsigned long changes, GCPtr pGCDst);
extern void dmxDestroyGC(GCPtr pGC);
-extern void dmxChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects);
+extern void dmxChangeClip(GCPtr pGC, int type, void *pvalue, int nrects);
extern void dmxDestroyClip(GCPtr pGC);
extern void dmxCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c
index 1933066..aa7c8eb 100644
--- a/hw/dmx/dmxgcops.c
+++ b/hw/dmx/dmxgcops.c
@@ -508,7 +508,7 @@ dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
void
dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
/* Error -- this should never happen! */
}
@@ -517,7 +517,7 @@ dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
void
dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
/* Error -- this should never happen! */
}
@@ -551,7 +551,7 @@ dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
if (pDrawable->type != DRAWABLE_PIXMAP)
return NULL;
- if (Success != dixLookupResourceByType((pointer *) &pXinPix,
+ if (Success != dixLookupResourceByType((void **) &pXinPix,
pDrawable->id, XRT_PIXMAP,
NullClient, DixUnknownAccess))
return NULL;
@@ -562,7 +562,7 @@ dmxFindAlternatePixmap(DrawablePtr pDrawable, XID *draw)
PixmapPtr pSrc;
dmxPixPrivPtr pSrcPriv;
- dixLookupResourceByType((pointer *) &pSrc, pXinPix->info[i].id,
+ dixLookupResourceByType((void **) &pSrc, pXinPix->info[i].id,
RT_PIXMAP, NullClient, DixUnknownAccess);
pSrcPriv = DMX_GET_PIXMAP_PRIV(pSrc);
if (pSrcPriv->pixmap) {
diff --git a/hw/dmx/dmxgcops.h b/hw/dmx/dmxgcops.h
index 4ba0ad5..529b6ff 100644
--- a/hw/dmx/dmxgcops.h
+++ b/hw/dmx/dmxgcops.h
@@ -78,10 +78,10 @@ extern void dmxImageText16(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, int count, unsigned short *chars);
extern void dmxImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
extern void dmxPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
extern void dmxPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
int w, int h, int x, int y);
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index c9762c2..64d0ae1 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -285,7 +285,7 @@ dmxProcRenderCreateGlyphSet(ClientPtr client)
/* Store glyphsets from backends in glyphSet->devPrivate ????? */
/* Make sure we handle all errors here!! */
- dixLookupResourceByType((pointer *) &glyphSet,
+ dixLookupResourceByType((void **) &glyphSet,
stuff->gsid, GlyphSetType,
client, DixDestroyAccess);
@@ -332,7 +332,7 @@ dmxProcRenderFreeGlyphSet(ClientPtr client)
REQUEST(xRenderFreeGlyphSetReq);
REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
- dixLookupResourceByType((pointer *) &glyphSet,
+ dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType,
client, DixDestroyAccess);
@@ -378,7 +378,7 @@ dmxProcRenderAddGlyphs(ClientPtr client)
CARD8 *bits;
int nbytes;
- dixLookupResourceByType((pointer *) &glyphSet,
+ dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType,
client, DixReadAccess);
glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
@@ -423,7 +423,7 @@ dmxProcRenderFreeGlyphs(ClientPtr client)
REQUEST(xRenderFreeGlyphsReq);
REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
- dixLookupResourceByType((pointer *) &glyphSet,
+ dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType,
client, DixWriteAccess);
@@ -498,14 +498,14 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
GlyphSetPtr glyphSet;
dmxGlyphPrivPtr glyphPriv;
- dixLookupResourceByType((pointer *) &pSrc,
+ dixLookupResourceByType((void **) &pSrc,
stuff->src, PictureType, client, DixReadAccess);
pSrcPriv = DMX_GET_PICT_PRIV(pSrc);
if (!pSrcPriv->pict)
return ret;
- dixLookupResourceByType((pointer *) &pDst,
+ dixLookupResourceByType((void **) &pDst,
stuff->dst, PictureType,
client, DixWriteAccess);
@@ -524,7 +524,7 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
return ret;
if (stuff->maskFormat)
- dixLookupResourceByType((pointer *) &pFmt,
+ dixLookupResourceByType((void **) &pFmt,
stuff->maskFormat, PictFormatType,
client, DixReadAccess);
else
@@ -585,7 +585,7 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
curGlyph = glyphs;
curElt = elts;
- dixLookupResourceByType((pointer *) &glyphSet,
+ dixLookupResourceByType((void **) &glyphSet,
stuff->glyphset, GlyphSetType,
client, DixReadAccess);
glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
@@ -595,7 +595,7 @@ dmxProcRenderCompositeGlyphs(ClientPtr client)
buffer += sizeof(xGlyphElt);
if (elt->len == 0xff) {
- dixLookupResourceByType((pointer *) &glyphSet,
+ dixLookupResourceByType((void **) &glyphSet,
*((CARD32 *) buffer),
GlyphSetType, client, DixReadAccess);
glyphPriv = DMX_GET_GLYPH_PRIV(glyphSet);
@@ -894,7 +894,7 @@ dmxDestroyPicture(PicturePtr pPicture)
/** Change the picture's list of clip rectangles. */
int
-dmxChangePictureClip(PicturePtr pPicture, int clipType, pointer value, int n)
+dmxChangePictureClip(PicturePtr pPicture, int clipType, void *value, int n)
{
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
DMXScreenInfo *dmxScreen = &dmxScreens[pScreen->myNum];
diff --git a/hw/dmx/dmxpict.h b/hw/dmx/dmxpict.h
index 6c37be9..080da3b 100644
--- a/hw/dmx/dmxpict.h
+++ b/hw/dmx/dmxpict.h
@@ -65,7 +65,7 @@ extern Bool dmxDestroyPictureList(WindowPtr pWindow);
extern int dmxCreatePicture(PicturePtr pPicture);
extern void dmxDestroyPicture(PicturePtr pPicture);
extern int dmxChangePictureClip(PicturePtr pPicture, int clipType,
- pointer value, int n);
+ void *value, int n);
extern void dmxDestroyPictureClip(PicturePtr pPicture);
extern void dmxChangePicture(PicturePtr pPicture, Mask mask);
extern void dmxValidatePicture(PicturePtr pPicture, Mask mask);
diff --git a/hw/dmx/dmxstat.c b/hw/dmx/dmxstat.c
index 0d8c22a..0ae5107 100644
--- a/hw/dmx/dmxstat.c
+++ b/hw/dmx/dmxstat.c
@@ -175,7 +175,7 @@ dmxStatSync(DMXScreenInfo * dmxScreen,
/* Actually do the work of printing out the human-readable message. */
static CARD32
-dmxStatCallback(OsTimerPtr timer, CARD32 t, pointer arg)
+dmxStatCallback(OsTimerPtr timer, CARD32 t, void *arg)
{
int i, j;
static int header = 0;
diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c
index bf28584..81dbbc6 100644
--- a/hw/dmx/dmxsync.c
+++ b/hw/dmx/dmxsync.c
@@ -82,7 +82,7 @@ dmxDoSync(DMXScreenInfo * dmxScreen)
}
static CARD32
-dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)
+dmxSyncCallback(OsTimerPtr timer, CARD32 time, void *arg)
{
int i;
@@ -99,13 +99,13 @@ dmxSyncCallback(OsTimerPtr timer, CARD32 time, pointer arg)
}
static void
-dmxSyncBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
+dmxSyncBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadMask)
{
TimerForce(dmxSyncTimer);
}
static void
-dmxSyncWakeupHandler(pointer blockData, int result, pointer pReadMask)
+dmxSyncWakeupHandler(void *blockData, int result, void *pReadMask)
{
}
diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index 9b8a384..1c23527 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -86,7 +86,7 @@ dmxCreateRootWindow(WindowPtr pWindow)
parent = dmxScreen->scrnWin; /* This is our "Screen" window */
visual = dmxScreen->beVisuals[dmxScreen->beDefVisualIndex].visual;
- dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow),
+ dixLookupResourceByType((void **) &pCmap, wColormap(pWindow),
RT_COLORMAP, NullClient, DixUnknownAccess);
pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
@@ -192,7 +192,7 @@ dmxGetDefaultWindowAttributes(WindowPtr pWindow,
ColormapPtr pCmap;
dmxColormapPrivPtr pCmapPriv;
- dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow),
+ dixLookupResourceByType((void **) &pCmap, wColormap(pWindow),
RT_COLORMAP, NullClient, DixUnknownAccess);
pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
*cmap = pCmapPriv->cmap;
@@ -561,7 +561,7 @@ dmxDoChangeWindowAttributes(WindowPtr pWindow,
ColormapPtr pCmap;
dmxColormapPrivPtr pCmapPriv;
- dixLookupResourceByType((pointer *) &pCmap, wColormap(pWindow),
+ dixLookupResourceByType((void **) &pCmap, wColormap(pWindow),
RT_COLORMAP, NullClient, DixUnknownAccess);
pCmapPriv = DMX_GET_COLORMAP_PRIV(pCmap);
attribs->colormap = pCmapPriv->cmap;
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index 190eeef..964db40 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -195,7 +195,7 @@ CreateContext(__GLXclientState * cl,
shareglxc = NULL;
}
else {
- dixLookupResourceByType((pointer *) &shareglxc, shareList,
+ dixLookupResourceByType((void **) &shareglxc, shareList,
__glXContextRes, NullClient, DixUnknownAccess);
if (!shareglxc) {
client->errorValue = shareList;
@@ -425,7 +425,7 @@ CreateContext(__GLXclientState * cl,
/*
** Register this context as a resource.
*/
- if (!AddResource(gcId, __glXContextRes, (pointer) glxc)) {
+ if (!AddResource(gcId, __glXContextRes, (void *) glxc)) {
free(glxc->real_ids);
free(glxc->real_vids);
free(glxc);
@@ -511,14 +511,14 @@ __glXBindSwapBarrierSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixGetAttrAccess);
if (rc != Success) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable,
+ dixLookupResourceByType((void **) &pGlxPixmap, req->drawable,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap)
pDraw = pGlxPixmap->pDraw;
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable,
+ dixLookupResourceByType((void **) &pGlxWindow, req->drawable,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow)
pDraw = pGlxWindow->pDraw;
@@ -544,14 +544,14 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pDraw, req->drawable, client, 0, DixManageAccess);
if (rc != Success) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, req->drawable,
+ dixLookupResourceByType((void **) &pGlxPixmap, req->drawable,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap)
pDraw = pGlxPixmap->pDraw;
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, req->drawable,
+ dixLookupResourceByType((void **) &pGlxWindow, req->drawable,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow)
pDraw = pGlxWindow->pDraw;
@@ -566,7 +566,7 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
rc = dixLookupDrawable(&pMember, req->member, client, 0,
DixGetAttrAccess);
if (rc != Success) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, req->member,
+ dixLookupResourceByType((void **) &pGlxPixmap, req->member,
__glXPixmapRes, NullClient,
DixUnknownAccess);
if (pGlxPixmap)
@@ -574,7 +574,7 @@ __glXJoinSwapGroupSGIX(__GLXclientState * cl, GLbyte * pc)
}
if (!pMember && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, req->member,
+ dixLookupResourceByType((void **) &pGlxWindow, req->member,
__glXWindowRes, NullClient,
DixUnknownAccess);
if (pGlxWindow)
@@ -605,7 +605,7 @@ __glXDestroyContext(__GLXclientState * cl, GLbyte * pc)
int to_screen = 0;
int s;
- dixLookupResourceByType((pointer *) &glxc, gcId, __glXContextRes,
+ dixLookupResourceByType((void **) &glxc, gcId, __glXContextRes,
NullClient, DixUnknownAccess);
if (glxc) {
/*
@@ -880,7 +880,7 @@ MakeCurrent(__GLXclientState * cl,
** Lookup new context. It must not be current for someone else.
*/
if (contextId != None) {
- dixLookupResourceByType((pointer *) &glxc, contextId, __glXContextRes,
+ dixLookupResourceByType((void **) &glxc, contextId, __glXContextRes,
NullClient, DixUnknownAccess);
if (!glxc) {
client->errorValue = contextId;
@@ -935,7 +935,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pDraw) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+ dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient,
DixUnknownAccess);
if (pGlxPixmap) {
@@ -960,7 +960,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+ dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient,
DixUnknownAccess);
if (pGlxWindow) {
@@ -983,7 +983,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxPbuffer, drawId,
+ dixLookupResourceByType((void **) &pGlxPbuffer, drawId,
__glXPbufferRes, NullClient,
DixUnknownAccess);
if (pGlxPbuffer) {
@@ -1050,7 +1050,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pReadDraw) {
- dixLookupResourceByType((pointer *) &pReadGlxPixmap, readId,
+ dixLookupResourceByType((void **) &pReadGlxPixmap, readId,
__glXPixmapRes, NullClient,
DixUnknownAccess);
if (pReadGlxPixmap) {
@@ -1072,7 +1072,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxReadWindow, readId,
+ dixLookupResourceByType((void **) &pGlxReadWindow, readId,
__glXWindowRes, NullClient,
DixUnknownAccess);
if (pGlxReadWindow) {
@@ -1094,7 +1094,7 @@ MakeCurrent(__GLXclientState * cl,
}
if (!pReadDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxReadPbuffer, readId,
+ dixLookupResourceByType((void **) &pGlxReadPbuffer, readId,
__glXPbufferRes, NullClient,
DixUnknownAccess);
if (pGlxReadPbuffer) {
@@ -1236,14 +1236,14 @@ MakeCurrent(__GLXclientState * cl,
to_screen = screenInfo.numScreens - 1;
if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) {
- dixLookupResourceByClass((pointer *) &pXinDraw,
+ dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
if (pReadDraw && pReadDraw != pDraw &&
new_reply.readType != GLX_PBUFFER_TYPE) {
- dixLookupResourceByClass((pointer *) &pXinReadDraw,
+ dixLookupResourceByClass((void **) &pXinReadDraw,
pReadDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
@@ -1460,7 +1460,7 @@ __glXIsDirect(__GLXclientState * cl, GLbyte * pc)
/*
** Find the GL context.
*/
- dixLookupResourceByType((pointer *) &glxc, req->context, __glXContextRes,
+ dixLookupResourceByType((void **) &glxc, req->context, __glXContextRes,
NullClient, DixUnknownAccess);
if (!glxc) {
client->errorValue = req->context;
@@ -1619,13 +1619,13 @@ __glXCopyContext(__GLXclientState * cl, GLbyte * pc)
/*
** Check that each context exists.
*/
- dixLookupResourceByType((pointer *) &src, source, __glXContextRes,
+ dixLookupResourceByType((void **) &src, source, __glXContextRes,
NullClient, DixUnknownAccess);
if (!src) {
client->errorValue = source;
return __glXBadContext;
}
- dixLookupResourceByType((pointer *) &dst, dest, __glXContextRes,
+ dixLookupResourceByType((void **) &dst, dest, __glXContextRes,
NullClient, DixUnknownAccess);
if (!dst) {
client->errorValue = dest;
@@ -1925,7 +1925,7 @@ CreateGLXPixmap(__GLXclientState * cl,
from_screen = 0;
to_screen = screenInfo.numScreens - 1;
- dixLookupResourceByClass((pointer *) &pXinDraw,
+ dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
@@ -2055,7 +2055,7 @@ __glXDestroyGLXPixmap(__GLXclientState * cl, GLbyte * pc)
/*
** Check if it's a valid GLX pixmap.
*/
- dixLookupResourceByType((pointer *) &pGlxPixmap, glxpixmap,
+ dixLookupResourceByType((void **) &pGlxPixmap, glxpixmap,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (!pGlxPixmap) {
client->errorValue = glxpixmap;
@@ -2141,7 +2141,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
}
if (!pDraw) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+ dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) {
/*
@@ -2153,7 +2153,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+ dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) {
/*
@@ -2183,7 +2183,7 @@ __glXDoSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag)
if (!noPanoramiXExtension) {
from_screen = 0;
to_screen = screenInfo.numScreens - 1;
- dixLookupResourceByClass((pointer *) &pXinDraw,
+ dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
}
@@ -2291,7 +2291,7 @@ __glXSwapBuffers(__GLXclientState * cl, GLbyte * pc)
}
if (!pDraw) {
- dixLookupResourceByType((pointer *) &pGlxPixmap, drawId,
+ dixLookupResourceByType((void **) &pGlxPixmap, drawId,
__glXPixmapRes, NullClient, DixUnknownAccess);
if (pGlxPixmap) {
/*
@@ -2302,7 +2302,7 @@ __glXSwapBuffers(__GLXclientState * cl, GLbyte * pc)
}
if (!pDraw && __GLX_IS_VERSION_SUPPORTED(1, 3)) {
- dixLookupResourceByType((pointer *) &pGlxWindow, drawId,
+ dixLookupResourceByType((void **) &pGlxWindow, drawId,
__glXWindowRes, NullClient, DixUnknownAccess);
if (pGlxWindow) {
/*
@@ -2817,12 +2817,12 @@ __glXUseXFont(__GLXclientState * cl, GLbyte * pc)
** Font can actually be either the ID of a font or the ID of a GC
** containing a font.
*/
- dixLookupResourceByType((pointer *) &pFont, req->font, RT_FONT,
+ dixLookupResourceByType((void **) &pFont, req->font, RT_FONT,
NullClient, DixUnknownAccess);
if (!pFont) {
GC *pGC;
- dixLookupResourceByType((pointer *) &pGC, req->font,
+ dixLookupResourceByType((void **) &pGC, req->font,
RT_GC, NullClient, DixUnknownAccess);
if (!pGC) {
client->errorValue = req->font;
@@ -3082,7 +3082,7 @@ __glXCreateWindow(__GLXclientState * cl, GLbyte * pc)
VisualPtr pVisual;
VisualID visId;
int i, rc;
- pointer val;
+ void *val;
/*
** Check if windowId is valid
@@ -3184,7 +3184,7 @@ __glXDestroyWindow(__GLXclientState * cl, GLbyte * pc)
ClientPtr client = cl->client;
xGLXDestroyWindowReq *req = (xGLXDestroyWindowReq *) pc;
XID glxwindow = req->glxwindow;
- pointer val;
+ void *val;
/*
** Check if it's a valid GLX window.
@@ -3216,7 +3216,7 @@ __glXQueryContext(__GLXclientState * cl, GLbyte * pc)
int nReplyBytes;
req = (xGLXQueryContextReq *) pc;
- dixLookupResourceByType((pointer *) &ctx, req->context, __glXContextRes,
+ dixLookupResourceByType((void **) &ctx, req->context, __glXContextRes,
NullClient, DixUnknownAccess);
if (!ctx) {
client->errorValue = req->context;
@@ -3266,7 +3266,7 @@ __glXQueryContextInfoEXT(__GLXclientState * cl, GLbyte * pc)
int nReplyBytes;
req = (xGLXQueryContextInfoEXTReq *) pc;
- dixLookupResourceByType((pointer *) &ctx,
+ dixLookupResourceByType((void **) &ctx,
req->context, __glXContextRes,
client, DixReadAccess);
@@ -3439,7 +3439,7 @@ __glXDestroyPbuffer(__GLXclientState * cl, GLbyte * pc)
/*
** Check if it's a valid Pbuffer
*/
- dixLookupResourceByType((pointer *) &pGlxPbuffer, pbuffer,
+ dixLookupResourceByType((void **) &pGlxPbuffer, pbuffer,
__glXPbufferRes, NullClient, DixUnknownAccess);
if (!pGlxPbuffer) {
client->errorValue = pbuffer;
@@ -3514,7 +3514,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__GLXpixmap *pGlxPixmap;
- dixLookupResourceByType((pointer *) &pGlxPixmap,
+ dixLookupResourceByType((void **) &pGlxPixmap,
drawId, __glXPixmapRes,
NullClient, DixUnknownAccess);
if (pGlxPixmap) {
@@ -3527,7 +3527,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXWindow *pGlxWindow;
- dixLookupResourceByType((pointer *) &pGlxWindow,
+ dixLookupResourceByType((void **) &pGlxWindow,
drawId, __glXWindowRes,
NullClient, DixUnknownAccess);
if (pGlxWindow) {
@@ -3540,7 +3540,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXPbuffer *pGlxPbuffer;
- dixLookupResourceByType((pointer *) &pGlxPbuffer,
+ dixLookupResourceByType((void **) &pGlxPbuffer,
drawId, __glXPbufferRes,
NullClient, DixUnknownAccess);
if (pGlxPbuffer) {
@@ -3567,7 +3567,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
- if (Success != dixLookupResourceByClass((pointer *) &pXinDraw,
+ if (Success != dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess)) {
client->errorValue = drawId;
@@ -3676,7 +3676,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__GLXpixmap *pGlxPixmap;
- dixLookupResourceByType((pointer *) &pGlxPixmap,
+ dixLookupResourceByType((void **) &pGlxPixmap,
drawId, __glXPixmapRes,
NullClient, DixUnknownAccess);
if (pGlxPixmap) {
@@ -3689,7 +3689,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXWindow *pGlxWindow;
- dixLookupResourceByType((pointer *) &pGlxWindow,
+ dixLookupResourceByType((void **) &pGlxWindow,
drawId, __glXWindowRes,
NullClient, DixUnknownAccess);
if (pGlxWindow) {
@@ -3702,7 +3702,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!pDraw) {
__glXPbuffer *pGlxPbuffer;
- dixLookupResourceByType((pointer *) &pGlxPbuffer,
+ dixLookupResourceByType((void **) &pGlxPbuffer,
drawId, __glXPbufferRes,
NullClient, DixUnknownAccess);
if (pGlxPbuffer) {
@@ -3731,7 +3731,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc)
if (!noPanoramiXExtension) {
PanoramiXRes *pXinDraw;
- if (Success != dixLookupResourceByClass((pointer *) &pXinDraw,
+ if (Success != dixLookupResourceByClass((void **) &pXinDraw,
pDraw->id, XRC_DRAWABLE,
client, DixReadAccess)) {
client->errorValue = drawId;
diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
index b469708..3c5a14b 100644
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@@ -182,7 +182,7 @@ __glXFreeGLXWindow(__glXWindow * pGlxWindow)
WindowPtr pWindow = (WindowPtr) pGlxWindow->pDraw;
WindowPtr ret;
- dixLookupResourceByType((pointer) &ret,
+ dixLookupResourceByType((void *) &ret,
pWindow->drawable.id, RT_WINDOW,
NullClient, DixUnknownAccess);
if (ret == pWindow) {
@@ -414,7 +414,7 @@ __glXDispatch(ClientPtr client)
*/
XID xid = FakeClientID(client->index);
- if (!AddResource(xid, __glXClientRes, (pointer) (long) client->index)) {
+ if (!AddResource(xid, __glXClientRes, (void *) (long) client->index)) {
return BadAlloc;
}
ResetClientState(client->index);
@@ -468,7 +468,7 @@ __glXSwapDispatch(ClientPtr client)
*/
XID xid = FakeClientID(client->index);
- if (!AddResource(xid, __glXClientRes, (pointer) (long) client->index)) {
+ if (!AddResource(xid, __glXClientRes, (void *) (long) client->index)) {
return BadAlloc;
}
ResetClientState(client->index);
diff --git a/hw/dmx/glxProxy/glxswap.c b/hw/dmx/glxProxy/glxswap.c
index 87a7486..5f56501 100644
--- a/hw/dmx/glxProxy/glxswap.c
+++ b/hw/dmx/glxProxy/glxswap.c
@@ -110,7 +110,7 @@ SwapGroupIsReadyToSwap(SwapGroupPtr pSwap)
}
static Bool
-SGSwapCleanup(ClientPtr client, pointer closure)
+SGSwapCleanup(ClientPtr client, void *closure)
{
/* SwapGroupPtr pSwap = (SwapGroupPtr)closure; */
@@ -154,7 +154,7 @@ SGSwapBuffers(__GLXclientState * cl, XID drawId, GLXContextTag tag,
else {
/* The swap group/barrier is not yet ready to swap, so put
* client to sleep until the rest are ready to swap */
- ClientSleep(cl->client, SGSwapCleanup, (pointer) pWin);
+ ClientSleep(cl->client, SGSwapCleanup, (void *) pWin);
pCur->sleeping = TRUE;
}
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
index 807e023..56abe80 100644
--- a/hw/dmx/input/dmxbackend.c
+++ b/hw/dmx/input/dmxbackend.c
@@ -101,7 +101,7 @@ typedef struct _myPrivate {
#endif
/** Create and return a private data structure. */
-pointer
+void *
dmxBackendCreatePrivate(DeviceIntPtr pDevice)
{
GETDMXLOCALFROMPDEVICE;
@@ -115,7 +115,7 @@ dmxBackendCreatePrivate(DeviceIntPtr pDevice)
* verify that the structure was actually created by
* #dmxBackendCreatePrivate. */
void
-dmxBackendDestroyPrivate(pointer private)
+dmxBackendDestroyPrivate(void *private)
{
free(private);
}
@@ -262,7 +262,7 @@ dmxBackendOffscreen(int screen, int x, int y)
/** This routine is called from #dmxCoreMotion for each motion
* event. \a x and \a y are global coordinants. */
void
-dmxBackendUpdatePosition(pointer private, int x, int y)
+dmxBackendUpdatePosition(void *private, int x, int y)
{
GETPRIVFROMPRIVATE;
int screen = miPointerGetScreen(inputInfo.pointer)->myNum;
@@ -500,7 +500,7 @@ dmxBackendCollectEvents(DevicePtr pDev,
* event processing actually takes place here, but this is a convenient
* place to update the pointer. */
void
-dmxBackendProcessInput(pointer private)
+dmxBackendProcessInput(void *private)
{
GETPRIVFROMPRIVATE;
@@ -650,7 +650,7 @@ dmxBackendKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
/** Process #DMXFunctionType functions. The only function handled here
* is to acknowledge a pending server shutdown. */
int
-dmxBackendFunctions(pointer private, DMXFunctionType function)
+dmxBackendFunctions(void *private, DMXFunctionType function)
{
switch (function) {
case DMX_FUNCTION_TERMINATE:
diff --git a/hw/dmx/input/dmxbackend.h b/hw/dmx/input/dmxbackend.h
index 6a49a56..a608573 100644
--- a/hw/dmx/input/dmxbackend.h
+++ b/hw/dmx/input/dmxbackend.h
@@ -38,8 +38,8 @@
#ifndef _DMXBACKEND_H_
#define _DMXBACKEND_H_
-extern pointer dmxBackendCreatePrivate(DeviceIntPtr pDevice);
-extern void dmxBackendDestroyPrivate(pointer private);
+extern void *dmxBackendCreatePrivate(DeviceIntPtr pDevice);
+extern void dmxBackendDestroyPrivate(void *private);
extern void dmxBackendInit(DevicePtr pDev);
extern void dmxBackendLateReInit(DevicePtr pDev);
extern void dmxBackendMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
@@ -49,8 +49,8 @@ extern void dmxBackendCollectEvents(DevicePtr pDev,
dmxEnqueueProcPtr enqueue,
dmxCheckSpecialProcPtr checkspecial,
DMXBlockType block);
-extern void dmxBackendProcessInput(pointer private);
-extern int dmxBackendFunctions(pointer private, DMXFunctionType function);
-extern void dmxBackendUpdatePosition(pointer private, int x, int y);
+extern void dmxBackendProcessInput(void *private);
+extern int dmxBackendFunctions(void *private, DMXFunctionType function);
+extern void dmxBackendUpdatePosition(void *private, int x, int y);
#endif
diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c
index 6eb94b2..90154ef 100644
--- a/hw/dmx/input/dmxcommon.c
+++ b/hw/dmx/input/dmxcommon.c
@@ -558,7 +558,7 @@ dmxFindPointerScreen(int x, int y)
* (e.g., when a keyboard and mouse form a pair that should share the
* same private area). If the requested private area cannot be located,
* then NULL is returned. */
-pointer
+void *
dmxCommonCopyPrivate(DeviceIntPtr pDevice)
{
GETDMXLOCALFROMPDEVICE;
@@ -583,7 +583,7 @@ dmxCommonCopyPrivate(DeviceIntPtr pDevice)
* server startup and server shutdown).
*/
void
-dmxCommonSaveState(pointer private)
+dmxCommonSaveState(void *private)
{
GETPRIVFROMPRIVATE;
XKeyboardState ks;
@@ -641,7 +641,7 @@ dmxCommonSaveState(pointer private)
/** This routine restores all the information saved by #dmxCommonSaveState. */
void
-dmxCommonRestoreState(pointer private)
+dmxCommonRestoreState(void *private)
{
GETPRIVFROMPRIVATE;
int retcode = -1;
diff --git a/hw/dmx/input/dmxcommon.h b/hw/dmx/input/dmxcommon.h
index d4f8d3c..ed04287 100644
--- a/hw/dmx/input/dmxcommon.h
+++ b/hw/dmx/input/dmxcommon.h
@@ -118,7 +118,7 @@ extern void dmxCommonOthOff(DevicePtr pDev);
extern void dmxCommonOthGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
/* helper functions */
-extern pointer dmxCommonCopyPrivate(DeviceIntPtr pDevice);
-extern void dmxCommonSaveState(pointer private);
-extern void dmxCommonRestoreState(pointer private);
+extern void *dmxCommonCopyPrivate(DeviceIntPtr pDevice);
+extern void dmxCommonSaveState(void *private);
+extern void dmxCommonRestoreState(void *private);
#endif
diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
index cb80bd8..f33a0eb 100644
--- a/hw/dmx/input/dmxconsole.c
+++ b/hw/dmx/input/dmxconsole.c
@@ -141,7 +141,7 @@ unscaley(myPrivate * priv, int y)
}
/** Create the private area for \a pDevice. */
-pointer
+void *
dmxConsoleCreatePrivate(DeviceIntPtr pDevice)
{
GETDMXLOCALFROMPDEVICE;
@@ -153,7 +153,7 @@ dmxConsoleCreatePrivate(DeviceIntPtr pDevice)
/** If \a private is non-NULL, free its associated memory. */
void
-dmxConsoleDestroyPrivate(pointer private)
+dmxConsoleDestroyPrivate(void *private)
{
free(private);
}
@@ -193,7 +193,7 @@ dmxConsoleDrawFineCursor(myPrivate * priv, XRectangle * rect)
}
static void
-dmxConsoleDrawWindows(pointer private)
+dmxConsoleDrawWindows(void *private)
{
GETONLYPRIVFROMPRIVATE;
Display *dpy = priv->display;
@@ -391,7 +391,7 @@ dmxConsoleUpdateFineCursor(myPrivate * priv)
* fashion: the actual layout of the windows of the screen might not
* have had any human-visible changes. */
void
-dmxConsoleUpdateInfo(pointer private, DMXUpdateType type, WindowPtr pWindow)
+dmxConsoleUpdateInfo(void *private, DMXUpdateType type, WindowPtr pWindow)
{
GETONLYPRIVFROMPRIVATE;
dmxConsoleDraw(priv, 1, 1);
@@ -436,7 +436,7 @@ dmxConsoleMoveRelative(myPrivate * priv, int x, int y,
* allows the console's notion of the cursor postion to change when
* another input device actually caused the change. */
void
-dmxConsoleUpdatePosition(pointer private, int x, int y)
+dmxConsoleUpdatePosition(void *private, int x, int y)
{
GETONLYPRIVFROMPRIVATE;
int tmpX, tmpY;
@@ -941,7 +941,7 @@ dmxConsoleKbdGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
/** Handle special console-only keys. */
int
-dmxConsoleFunctions(pointer private, DMXFunctionType function)
+dmxConsoleFunctions(void *private, DMXFunctionType function)
{
GETONLYPRIVFROMPRIVATE;
XRectangle rect;
diff --git a/hw/dmx/input/dmxconsole.h b/hw/dmx/input/dmxconsole.h
index 1c52611..ea6033c 100644
--- a/hw/dmx/input/dmxconsole.h
+++ b/hw/dmx/input/dmxconsole.h
@@ -37,8 +37,8 @@
#ifndef _DMXCONSOLE_H_
#define _DMXCONSOLE_H_
-extern pointer dmxConsoleCreatePrivate(DeviceIntPtr pDevice);
-extern void dmxConsoleDestroyPrivate(pointer private);
+extern void *dmxConsoleCreatePrivate(DeviceIntPtr pDevice);
+extern void dmxConsoleDestroyPrivate(void *private);
extern void dmxConsoleInit(DevicePtr pDev);
extern void dmxConsoleReInit(DevicePtr pDev);
extern void dmxConsoleMouGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
@@ -48,12 +48,12 @@ extern void dmxConsoleCollectEvents(DevicePtr pDev,
dmxEnqueueProcPtr enqueue,
dmxCheckSpecialProcPtr checkspecial,
DMXBlockType block);
-extern int dmxConsoleFunctions(pointer private, DMXFunctionType function);
-extern void dmxConsoleUpdatePosition(pointer private, int x, int y);
-extern void dmxConsoleKbdSetCtrl(pointer private, KeybdCtrl * ctrl);
+extern int dmxConsoleFunctions(void *private, DMXFunctionType function);
+extern void dmxConsoleUpdatePosition(void *private, int x, int y);
+extern void dmxConsoleKbdSetCtrl(void *private, KeybdCtrl * ctrl);
extern void dmxConsoleCapture(DMXInputInfo * dmxInput);
extern void dmxConsoleUncapture(DMXInputInfo * dmxInput);
-extern void dmxConsoleUpdateInfo(pointer private,
+extern void dmxConsoleUpdateInfo(void *private,
DMXUpdateType, WindowPtr pWindow);
#endif
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index e06fc87..abb6a85 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -225,7 +225,7 @@ dmxKbdCtrl(DeviceIntPtr pDevice, KeybdCtrl * ctrl)
/* taken from kdrive/src/kinput.c: */
static void
-dmxBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
+dmxBell(int volume, DeviceIntPtr pDev, void *arg, int something)
{
#if 0
KeybdCtrl *ctrl = arg;
@@ -336,7 +336,7 @@ _dmxKeyboardBellProc(DMXLocalInputInfoPtr dmxLocal, int percent)
* sound the bell on all of the devices that send core events. */
void
dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
- pointer ctrl, int unknown)
+ void *ctrl, int unknown)
{
GETDMXLOCALFROMPDEVICE;
int i, j;
@@ -633,7 +633,7 @@ dmxCollectAll(DMXInputInfo * dmxInput)
}
static void
-dmxBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
+dmxBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadMask)
{
DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t) blockData];
static unsigned long generation = 0;
@@ -645,7 +645,7 @@ dmxBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
}
static void
-dmxSwitchReturn(pointer p)
+dmxSwitchReturn(void *p)
{
DMXInputInfo *dmxInput = p;
int i;
@@ -662,7 +662,7 @@ dmxSwitchReturn(pointer p)
}
static void
-dmxWakeupHandler(pointer blockData, int result, pointer pReadMask)
+dmxWakeupHandler(void *blockData, int result, void *pReadMask)
{
DMXInputInfo *dmxInput = &dmxInputs[(uintptr_t) blockData];
int i;
diff --git a/hw/dmx/input/dmxinputinit.h b/hw/dmx/input/dmxinputinit.h
index 94ec101..11af2ca 100644
--- a/hw/dmx/input/dmxinputinit.h
+++ b/hw/dmx/input/dmxinputinit.h
@@ -127,8 +127,8 @@ typedef struct _DMXLocalInitInfo {
KeySym *symbols; /**< Key symbols */
} DMXLocalInitInfo, *DMXLocalInitInfoPtr;
-typedef pointer (*dmxCreatePrivateProcPtr) (DeviceIntPtr);
-typedef void (*dmxDestroyPrivateProcPtr) (pointer);
+typedef void *(*dmxCreatePrivateProcPtr) (DeviceIntPtr);
+typedef void (*dmxDestroyPrivateProcPtr) (void *);
typedef void (*dmxInitProcPtr) (DevicePtr);
typedef void (*dmxReInitProcPtr) (DevicePtr);
@@ -136,13 +136,13 @@ typedef void (*dmxLateReInitProcPtr) (DevicePtr);
typedef void (*dmxGetInfoProcPtr) (DevicePtr, DMXLocalInitInfoPtr);
typedef int (*dmxOnProcPtr) (DevicePtr);
typedef void (*dmxOffProcPtr) (DevicePtr);
-typedef void (*dmxUpdatePositionProcPtr) (pointer, int x, int y);
+typedef void (*dmxUpdatePositionProcPtr) (void *, int x, int y);
-typedef void (*dmxVTPreSwitchProcPtr) (pointer); /* Turn I/O Off */
-typedef void (*dmxVTPostSwitchProcPtr) (pointer); /* Turn I/O On */
-typedef void (*dmxVTSwitchReturnProcPtr) (pointer);
-typedef int (*dmxVTSwitchProcPtr) (pointer, int vt,
- dmxVTSwitchReturnProcPtr, pointer);
+typedef void (*dmxVTPreSwitchProcPtr) (void *); /* Turn I/O Off */
+typedef void (*dmxVTPostSwitchProcPtr) (void *); /* Turn I/O On */
+typedef void (*dmxVTSwitchReturnProcPtr) (void *);
+typedef int (*dmxVTSwitchProcPtr) (void *, int vt,
+ dmxVTSwitchReturnProcPtr, void *);
typedef void (*dmxMotionProcPtr) (DevicePtr,
int *valuators,
@@ -157,9 +157,9 @@ typedef void (*dmxCollectEventsProcPtr) (DevicePtr,
dmxMotionProcPtr,
dmxEnqueueProcPtr,
dmxCheckSpecialProcPtr, DMXBlockType);
-typedef void (*dmxProcessInputProcPtr) (pointer);
-typedef void (*dmxUpdateInfoProcPtr) (pointer, DMXUpdateType, WindowPtr);
-typedef int (*dmxFunctionsProcPtr) (pointer, DMXFunctionType);
+typedef void (*dmxProcessInputProcPtr) (void *);
+typedef void (*dmxUpdateInfoProcPtr) (void *, DMXUpdateType, WindowPtr);
+typedef int (*dmxFunctionsProcPtr) (void *, DMXFunctionType);
typedef void (*dmxKBCtrlProcPtr) (DevicePtr, KeybdCtrl * ctrl);
typedef void (*dmxMCtrlProcPtr) (DevicePtr, PtrCtrl * ctrl);
@@ -223,7 +223,7 @@ typedef struct _DMXLocalInputInfo {
dmxKBCtrlProcPtr kCtrl; /**< Keyboard control */
dmxKBBellProcPtr kBell; /**< Bell control */
- pointer private; /**< Device-dependent private */
+ void *private; /**< Device-dependent private */
int isCore; /**< Is a DMX core device */
int sendsCore; /**< Sends DMX core events */
KeybdCtrl kctrl; /**< Keyboard control */
@@ -269,7 +269,7 @@ extern DMXLocalInputInfoPtr dmxInputCopyLocal(DMXInputInfo * dmxInput,
extern void dmxChangePointerControl(DeviceIntPtr pDevice, PtrCtrl * ctrl);
extern void dmxKeyboardKbdCtrlProc(DeviceIntPtr pDevice, KeybdCtrl * ctrl);
extern void dmxKeyboardBellProc(int percent, DeviceIntPtr pDevice,
- pointer ctrl, int unknown);
+ void *ctrl, int unknown);
extern int dmxInputExtensionErrorHandler(Display * dsp, _Xconst char *name,
_Xconst char *reason);
diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c
index ecf4f59..1a4d01f 100644
--- a/hw/dmx/input/lnx-keyboard.c
+++ b/hw/dmx/input/lnx-keyboard.c
@@ -361,7 +361,7 @@ static unsigned char at2lnx[NUM_KEYCODES] = {
};
/** Create a private structure for use within this file. */
-pointer
+void *
kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard)
{
myPrivate *priv = calloc(1, sizeof(*priv));
@@ -373,7 +373,7 @@ kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard)
/** Destroy a private structure. */
void
-kbdLinuxDestroyPrivate(pointer priv)
+kbdLinuxDestroyPrivate(void *priv)
{
free(priv);
}
@@ -466,13 +466,13 @@ static int kbdLinuxActivate(int fd, int vtno, int setSig);
/** Currently unused hook called prior to an VT switch. */
void
-kbdLinuxVTPreSwitch(pointer p)
+kbdLinuxVTPreSwitch(void *p)
{
}
/** Currently unused hook called after returning from a VT switch. */
void
-kbdLinuxVTPostSwitch(pointer p)
+kbdLinuxVTPostSwitch(void *p)
{
}
@@ -481,8 +481,8 @@ kbdLinuxVTPostSwitch(pointer p)
* switched back to the pre-switch VT (i.e., the user returns to the DMX
* session). */
int
-kbdLinuxVTSwitch(pointer p, int vt,
- void (*switch_return) (pointer), pointer switch_return_data)
+kbdLinuxVTSwitch(void *p, int vt,
+ void (*switch_return) (void *), void *switch_return_data)
{
myPrivate *priv = p;
diff --git a/hw/dmx/input/lnx-keyboard.h b/hw/dmx/input/lnx-keyboard.h
index 891c6a9..857ea11 100644
--- a/hw/dmx/input/lnx-keyboard.h
+++ b/hw/dmx/input/lnx-keyboard.h
@@ -37,19 +37,19 @@
#ifndef _LNX_KEYBOARD_H_
#define _LNX_KEYBOARD_H_
-extern pointer kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard);
-extern void kbdLinuxDestroyPrivate(pointer private);
+extern void *kbdLinuxCreatePrivate(DeviceIntPtr pKeyboard);
+extern void kbdLinuxDestroyPrivate(void *private);
extern void kbdLinuxInit(DevicePtr pDev);
extern void kbdLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
extern int kbdLinuxOn(DevicePtr pDev);
extern void kbdLinuxOff(DevicePtr pDev);
-extern void kbdLinuxVTPreSwitch(pointer p);
-extern void kbdLinuxVTPostSwitch(pointer p);
-extern int kbdLinuxVTSwitch(pointer p, int vt,
+extern void kbdLinuxVTPreSwitch(void *p);
+extern void kbdLinuxVTPostSwitch(void *p);
+extern int kbdLinuxVTSwitch(void *p, int vt,
dmxVTSwitchReturnProcPtr switch_return,
- pointer switch_return_data);
+ void *switch_return_data);
extern void kbdLinuxRead(DevicePtr pDev,
dmxMotionProcPtr motion,
diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c
index 7e1acf4..210f6de 100644
--- a/hw/dmx/input/lnx-ms.c
+++ b/hw/dmx/input/lnx-ms.c
@@ -302,18 +302,18 @@ msLinuxGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)
/** Currently unused hook called prior to an VT switch. */
void
-msLinuxVTPreSwitch(pointer p)
+msLinuxVTPreSwitch(void *p)
{
}
/** Currently unused hook called after returning from a VT switch. */
void
-msLinuxVTPostSwitch(pointer p)
+msLinuxVTPostSwitch(void *p)
{
}
/** Create a private structure for use within this file. */
-pointer
+void *
msLinuxCreatePrivate(DeviceIntPtr pMouse)
{
myPrivate *priv = calloc(1, sizeof(*priv));
@@ -325,7 +325,7 @@ msLinuxCreatePrivate(DeviceIntPtr pMouse)
/** Destroy a private structure. */
void
-msLinuxDestroyPrivate(pointer priv)
+msLinuxDestroyPrivate(void *priv)
{
free(priv);
}
diff --git a/hw/dmx/input/lnx-ms.h b/hw/dmx/input/lnx-ms.h
index 28ed095..7f3ba4e 100644
--- a/hw/dmx/input/lnx-ms.h
+++ b/hw/dmx/input/lnx-ms.h
@@ -37,8 +37,8 @@
#ifndef _LNX_MS_H_
#define _LNX_MS_H_
-extern pointer msLinuxCreatePrivate(DeviceIntPtr pMouse);
-extern void msLinuxDestroyPrivate(pointer priv);
+extern void *msLinuxCreatePrivate(DeviceIntPtr pMouse);
+extern void msLinuxDestroyPrivate(void *priv);
extern void msLinuxRead(DevicePtr pDev,
dmxMotionProcPtr motion,
dmxEnqueueProcPtr enqueue,
@@ -49,7 +49,7 @@ extern void msLinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
extern int msLinuxOn(DevicePtr pDev);
extern void msLinuxOff(DevicePtr pDev);
extern void msLinuxCtrl(DevicePtr pDev, PtrCtrl * ctrl);
-extern void msLinuxVTPreSwitch(pointer p);
-extern void msLinuxVTPostSwitch(pointer p);
+extern void msLinuxVTPreSwitch(void *p);
+extern void msLinuxVTPostSwitch(void *p);
#endif
diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c
index 67c73a0..dd70cb8 100644
--- a/hw/dmx/input/lnx-ps2.c
+++ b/hw/dmx/input/lnx-ps2.c
@@ -272,18 +272,18 @@ ps2LinuxGetMap(DevicePtr pDev, unsigned char *map, int *nButtons)
/** Currently unused hook called prior to an VT switch. */
void
-ps2LinuxVTPreSwitch(pointer p)
+ps2LinuxVTPreSwitch(void *p)
{
}
/** Currently unused hook called after returning from a VT switch. */
void
-ps2LinuxVTPostSwitch(pointer p)
+ps2LinuxVTPostSwitch(void *p)
{
}
/** Create a private structure for use within this file. */
-pointer
+void *
ps2LinuxCreatePrivate(DeviceIntPtr pMouse)
{
myPrivate *priv = calloc(1, sizeof(*priv));
@@ -295,7 +295,7 @@ ps2LinuxCreatePrivate(DeviceIntPtr pMouse)
/** Destroy a private structure. */
void
-ps2LinuxDestroyPrivate(pointer priv)
+ps2LinuxDestroyPrivate(void *priv)
{
free(priv);
}
diff --git a/hw/dmx/input/lnx-ps2.h b/hw/dmx/input/lnx-ps2.h
index 93f0f02..339f353 100644
--- a/hw/dmx/input/lnx-ps2.h
+++ b/hw/dmx/input/lnx-ps2.h
@@ -37,8 +37,8 @@
#ifndef _LNX_PS2_H_
#define _LNX_PS2_H_
-extern pointer ps2LinuxCreatePrivate(DeviceIntPtr pMouse);
-extern void ps2LinuxDestroyPrivate(pointer priv);
+extern void *ps2LinuxCreatePrivate(DeviceIntPtr pMouse);
+extern void ps2LinuxDestroyPrivate(void *priv);
extern void ps2LinuxRead(DevicePtr pDev,
dmxMotionProcPtr motion,
dmxEnqueueProcPtr enqueue,
@@ -49,7 +49,7 @@ extern void ps2LinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info);
extern int ps2LinuxOn(DevicePtr pDev);
extern void ps2LinuxOff(DevicePtr pDev);
extern void ps2LinuxCtrl(DevicePtr pDev, PtrCtrl * ctrl);
-extern void ps2LinuxVTPreSwitch(pointer p);
-extern void ps2LinuxVTPostSwitch(pointer p);
+extern void ps2LinuxVTPreSwitch(void *p);
+extern void ps2LinuxVTPostSwitch(void *p);
#endif
diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c
index c7c166c..67aa07e 100644
--- a/hw/dmx/input/usb-common.c
+++ b/hw/dmx/input/usb-common.c
@@ -474,7 +474,7 @@ usbOff(DevicePtr pDev)
}
/** Create a private structure for use within this file. */
-pointer
+void *
usbCreatePrivate(DeviceIntPtr pDevice)
{
myPrivate *priv = calloc(1, sizeof(*priv));
@@ -486,7 +486,7 @@ usbCreatePrivate(DeviceIntPtr pDevice)
/** Destroy a private structure. */
void
-usbDestroyPrivate(pointer priv)
+usbDestroyPrivate(void *priv)
{
free(priv);
}
diff --git a/hw/dmx/input/usb-common.h b/hw/dmx/input/usb-common.h
index eea98af..7159376 100644
--- a/hw/dmx/input/usb-common.h
+++ b/hw/dmx/input/usb-common.h
@@ -43,8 +43,8 @@ typedef enum {
usbOther
} usbType;
-extern pointer usbCreatePrivate(DeviceIntPtr pDevice);
-extern void usbDestroyPrivate(pointer priv);
+extern void *usbCreatePrivate(DeviceIntPtr pDevice);
+extern void usbDestroyPrivate(void *priv);
extern void usbRead(DevicePtr pDev,
dmxMotionProcPtr motion,
dmxEnqueueProcPtr enqueue,
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index b2a7985..12c7086 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -341,7 +341,7 @@ ephyrInternalDamageRedisplay(ScreenPtr pScreen)
}
static void
-ephyrInternalDamageBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead)
+ephyrInternalDamageBlockHandler(void *data, OSTimePtr pTimeout, void *pRead)
{
ScreenPtr pScreen = (ScreenPtr) data;
@@ -349,7 +349,7 @@ ephyrInternalDamageBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead)
}
static void
-ephyrInternalDamageWakeupHandler(pointer data, int i, pointer LastSelectMask)
+ephyrInternalDamageWakeupHandler(void *data, int i, void *LastSelectMask)
{
/* FIXME: Not needed ? */
}
@@ -368,7 +368,7 @@ ephyrSetInternalDamage(ScreenPtr pScreen)
if (!RegisterBlockAndWakeupHandlers(ephyrInternalDamageBlockHandler,
ephyrInternalDamageWakeupHandler,
- (pointer) pScreen))
+ (void *) pScreen))
return FALSE;
pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
@@ -389,7 +389,7 @@ ephyrUnsetInternalDamage(ScreenPtr pScreen)
RemoveBlockAndWakeupHandlers(ephyrInternalDamageBlockHandler,
ephyrInternalDamageWakeupHandler,
- (pointer) pScreen);
+ (void *) pScreen);
}
#ifdef RANDR
diff --git a/hw/kdrive/ephyr/ephyrvideo.c b/hw/kdrive/ephyr/ephyrvideo.c
index 4a05721..c672835 100644
--- a/hw/kdrive/ephyr/ephyrvideo.c
+++ b/hw/kdrive/ephyr/ephyrvideo.c
@@ -84,15 +84,15 @@ static Bool ephyrXVPrivSaveImageToPortPriv(EphyrPortPriv * a_port_priv,
int a_image_len);
static void ephyrStopVideo(KdScreenInfo * a_info,
- pointer a_xv_priv, Bool a_exit);
+ void *a_xv_priv, Bool a_exit);
static int ephyrSetPortAttribute(KdScreenInfo * a_info,
Atom a_attr_name,
- int a_attr_value, pointer a_port_priv);
+ int a_attr_value, void *a_port_priv);
static int ephyrGetPortAttribute(KdScreenInfo * a_screen_info,
Atom a_attr_name,
- int *a_attr_value, pointer a_port_priv);
+ int *a_attr_value, void *a_port_priv);
static void ephyrQueryBestSize(KdScreenInfo * a_info,
Bool a_motion,
@@ -101,7 +101,7 @@ static void ephyrQueryBestSize(KdScreenInfo * a_info,
short a_drw_w,
short a_drw_h,
unsigned int *a_prefered_w,
- unsigned int *a_prefered_h, pointer a_port_priv);
+ unsigned int *a_prefered_h, void *a_port_priv);
static int ephyrPutImage(KdScreenInfo * a_info,
DrawablePtr a_drawable,
@@ -118,13 +118,13 @@ static int ephyrPutImage(KdScreenInfo * a_info,
short a_width,
short a_height,
Bool a_sync,
- RegionPtr a_clipping_region, pointer a_port_priv);
+ RegionPtr a_clipping_region, void *a_port_priv);
static int ephyrReputImage(KdScreenInfo * a_info,
DrawablePtr a_drawable,
short a_drw_x,
short a_drw_y,
- RegionPtr a_clipping_region, pointer a_port_priv);
+ RegionPtr a_clipping_region, void *a_port_priv);
static int ephyrPutVideo(KdScreenInfo * a_info,
DrawablePtr a_drawable,
@@ -132,7 +132,7 @@ static int ephyrPutVideo(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clip_region, pointer a_port_priv);
+ RegionPtr a_clip_region, void *a_port_priv);
static int ephyrGetVideo(KdScreenInfo * a_info,
DrawablePtr a_drawable,
@@ -140,7 +140,7 @@ static int ephyrGetVideo(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clip_region, pointer a_port_priv);
+ RegionPtr a_clip_region, void *a_port_priv);
static int ephyrPutStill(KdScreenInfo * a_info,
DrawablePtr a_drawable,
@@ -148,7 +148,7 @@ static int ephyrPutStill(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clip_region, pointer a_port_priv);
+ RegionPtr a_clip_region, void *a_port_priv);
static int ephyrGetStill(KdScreenInfo * a_info,
DrawablePtr a_drawable,
@@ -156,7 +156,7 @@ static int ephyrGetStill(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clip_region, pointer a_port_priv);
+ RegionPtr a_clip_region, void *a_port_priv);
static int ephyrQueryImageAttributes(KdScreenInfo * a_info,
int a_id,
@@ -744,7 +744,7 @@ ephyrXVPrivSaveImageToPortPriv(EphyrPortPriv * a_port_priv,
}
static void
-ephyrStopVideo(KdScreenInfo * a_info, pointer a_port_priv, Bool a_exit)
+ephyrStopVideo(KdScreenInfo * a_info, void *a_port_priv, Bool a_exit)
{
xcb_connection_t *conn = hostx_get_xcbconn();
EphyrPortPriv *port_priv = a_port_priv;
@@ -759,7 +759,7 @@ ephyrStopVideo(KdScreenInfo * a_info, pointer a_port_priv, Bool a_exit)
static int
ephyrSetPortAttribute(KdScreenInfo * a_info,
- Atom a_attr_name, int a_attr_value, pointer a_port_priv)
+ Atom a_attr_name, int a_attr_value, void *a_port_priv)
{
xcb_connection_t *conn = hostx_get_xcbconn();
int res = Success, host_atom = 0;
@@ -814,7 +814,7 @@ ephyrSetPortAttribute(KdScreenInfo * a_info,
static int
ephyrGetPortAttribute(KdScreenInfo * a_screen_info,
- Atom a_attr_name, int *a_attr_value, pointer a_port_priv)
+ Atom a_attr_name, int *a_attr_value, void *a_port_priv)
{
xcb_connection_t *conn = hostx_get_xcbconn();
int res = Success, host_atom = 0;
@@ -862,7 +862,7 @@ ephyrQueryBestSize(KdScreenInfo * a_info,
short a_drw_w,
short a_drw_h,
unsigned int *a_prefered_w,
- unsigned int *a_prefered_h, pointer a_port_priv)
+ unsigned int *a_prefered_h, void *a_port_priv)
{
xcb_connection_t *conn = hostx_get_xcbconn();
EphyrPortPriv *port_priv = a_port_priv;
@@ -992,7 +992,7 @@ ephyrPutImage(KdScreenInfo * a_info,
unsigned char *a_buf,
short a_width,
short a_height,
- Bool a_sync, RegionPtr a_clipping_region, pointer a_port_priv)
+ Bool a_sync, RegionPtr a_clipping_region, void *a_port_priv)
{
EphyrPortPriv *port_priv = a_port_priv;
Bool is_ok = FALSE;
@@ -1064,7 +1064,7 @@ static int
ephyrReputImage(KdScreenInfo * a_info,
DrawablePtr a_drawable,
short a_drw_x,
- short a_drw_y, RegionPtr a_clipping_region, pointer a_port_priv)
+ short a_drw_y, RegionPtr a_clipping_region, void *a_port_priv)
{
EphyrPortPriv *port_priv = a_port_priv;
int result = BadImplementation;
@@ -1107,7 +1107,7 @@ ephyrPutVideo(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clipping_region, pointer a_port_priv)
+ RegionPtr a_clipping_region, void *a_port_priv)
{
EphyrScrPriv *scrpriv = a_info->driver;
xcb_connection_t *conn = hostx_get_xcbconn();
@@ -1138,7 +1138,7 @@ ephyrGetVideo(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clipping_region, pointer a_port_priv)
+ RegionPtr a_clipping_region, void *a_port_priv)
{
EphyrScrPriv *scrpriv = a_info->driver;
xcb_connection_t *conn = hostx_get_xcbconn();
@@ -1170,7 +1170,7 @@ ephyrPutStill(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clipping_region, pointer a_port_priv)
+ RegionPtr a_clipping_region, void *a_port_priv)
{
EphyrScrPriv *scrpriv = a_info->driver;
xcb_connection_t *conn = hostx_get_xcbconn();
@@ -1201,7 +1201,7 @@ ephyrGetStill(KdScreenInfo * a_info,
short a_drw_x, short a_drw_y,
short a_vid_w, short a_vid_h,
short a_drw_w, short a_drw_h,
- RegionPtr a_clipping_region, pointer a_port_priv)
+ RegionPtr a_clipping_region, void *a_port_priv)
{
EphyrScrPriv *scrpriv = a_info->driver;
xcb_connection_t *conn = hostx_get_xcbconn();
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index 00de2ae..6284de5 100644
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@@ -167,14 +167,14 @@ LinuxSetSwitchMode(int mode)
}
static void
-LinuxApmBlock(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+LinuxApmBlock(void *blockData, OSTimePtr pTimeout, void *pReadmask)
{
}
static Bool LinuxApmRunning;
static void
-LinuxApmWakeup(pointer blockData, int result, pointer pReadmask)
+LinuxApmWakeup(void *blockData, int result, void *pReadmask)
{
fd_set *readmask = (fd_set *) pReadmask;
diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c
index c93c2f4..0970064 100644
--- a/hw/kdrive/src/kcmap.c
+++ b/hw/kdrive/src/kcmap.c
@@ -138,7 +138,7 @@ KdInstallColormap(ColormapPtr pCmap)
/* Tell X clients that the installed colormap is going away. */
if (pScreenPriv->pInstalledmap)
WalkTree(pScreenPriv->pInstalledmap->pScreen, TellLostMap,
- (pointer) &(pScreenPriv->pInstalledmap->mid));
+ (void *) &(pScreenPriv->pInstalledmap->mid));
/* Take note of the new installed colorscreen-> */
pScreenPriv->pInstalledmap = pCmap;
@@ -146,7 +146,7 @@ KdInstallColormap(ColormapPtr pCmap)
KdSetColormap(pCmap->pScreen);
/* Tell X clients of the new colormap */
- WalkTree(pCmap->pScreen, TellGainedMap, (pointer) &(pCmap->mid));
+ WalkTree(pCmap->pScreen, TellGainedMap, (void *) &(pCmap->mid));
}
/*
@@ -173,13 +173,13 @@ KdUninstallColormap(ColormapPtr pCmap)
return;
/* install default */
- dixLookupResourceByType((pointer *) &defMap, defMapID, RT_COLORMAP,
+ dixLookupResourceByType((void **) &defMap, defMapID, RT_COLORMAP,
serverClient, DixInstallAccess);
if (defMap)
(*pCmap->pScreen->InstallColormap) (defMap);
else {
/* uninstall and clear colormap pointer */
- WalkTree(pCmap->pScreen, TellLostMap, (pointer) &(pCmap->mid));
+ WalkTree(pCmap->pScreen, TellLostMap, (void *) &(pCmap->mid));
pScreenPriv->pInstalledmap = 0;
}
}
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 3829684..8eb8cd0 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -665,7 +665,7 @@ KdCloseScreen(ScreenPtr pScreen)
pScreenPriv->screen->pScreen = 0;
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return ret;
}
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 296d611..bec75cb 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -526,11 +526,11 @@ void
KdSetLed(KdKeyboardInfo * ki, int led, Bool on);
void
- KdSetPointerMatrix(KdPointerMatrix * pointer);
+ KdSetPointerMatrix(KdPointerMatrix *pointer);
void
-KdComputePointerMatrix(KdPointerMatrix * pointer, Rotation randr, int width,
+KdComputePointerMatrix(KdPointerMatrix *pointer, Rotation randr, int width,
int height);
void
@@ -538,11 +538,11 @@ void
void
-KdBlockHandler(ScreenPtr pScreen, pointer timeout, pointer readmask);
+KdBlockHandler(ScreenPtr pScreen, void *timeout, void *readmask);
void
-KdWakeupHandler(ScreenPtr pScreen, unsigned long result, pointer readmask);
+KdWakeupHandler(ScreenPtr pScreen, unsigned long result, void *readmask);
void
KdDisableInput(void);
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index a9a9fa5..7d09e28 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -533,7 +533,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
}
static void
-KdBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
+KdBell(int volume, DeviceIntPtr pDev, void *arg, int something)
{
KeybdCtrl *ctrl = arg;
KdKeyboardInfo *ki = NULL;
@@ -1940,7 +1940,7 @@ _KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z,
}
void
-KdBlockHandler(ScreenPtr pScreen, pointer timeout, pointer readmask)
+KdBlockHandler(ScreenPtr pScreen, void *timeout, void *readmask)
{
KdPointerInfo *pi;
int myTimeout = 0;
@@ -1966,7 +1966,7 @@ KdBlockHandler(ScreenPtr pScreen, pointer timeout, pointer readmask)
}
void
-KdWakeupHandler(ScreenPtr pScreen, unsigned long lresult, pointer readmask)
+KdWakeupHandler(ScreenPtr pScreen, unsigned long lresult, void *readmask)
{
int result = (int) lresult;
fd_set *pReadmask = (fd_set *) readmask;
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 2263972..9e76ead 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -208,7 +208,7 @@ KdXVScreenInit(ScreenPtr pScreen, KdVideoAdaptorPtr * adaptors, int num)
sure that I appreciate that. */
ScreenPriv = malloc(sizeof(KdXVScreenRec));
- pxvs->devPriv.ptr = (pointer) ScreenPriv;
+ pxvs->devPriv.ptr = (void *) ScreenPriv;
if (!ScreenPriv)
return FALSE;
@@ -487,7 +487,7 @@ KdXVInitAdaptors(ScreenPtr pScreen, KdVideoAdaptorPtr * infoPtr, int number)
adaptorPriv->PutImage = adaptorPtr->PutImage;
adaptorPriv->ReputImage = adaptorPtr->ReputImage;
- pa->devPriv.ptr = (pointer) adaptorPriv;
+ pa->devPriv.ptr = (void *) adaptorPriv;
if (!(pPort = calloc(adaptorPtr->nPorts, sizeof(XvPortRec)))) {
KdXVFreeAdaptor(pa);
@@ -874,7 +874,7 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
}
static int
-KdXVReputAllVideo(WindowPtr pWin, pointer data)
+KdXVReputAllVideo(WindowPtr pWin, void *data)
{
KdXVWindowPtr WinPriv;
diff --git a/hw/kdrive/src/kxv.h b/hw/kdrive/src/kxv.h
index 29118bc..4f644c2 100644
--- a/hw/kdrive/src/kxv.h
+++ b/hw/kdrive/src/kxv.h
@@ -98,41 +98,41 @@ typedef int (*PutVideoFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
short vid_x, short vid_y, short drw_x,
short drw_y, short vid_w, short vid_h,
short drw_w, short drw_h, RegionPtr clipBoxes,
- pointer data);
+ void *data);
typedef int (*PutStillFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
short vid_x, short vid_y, short drw_x,
short drw_y, short vid_w, short vid_h,
short drw_w, short drw_h, RegionPtr clipBoxes,
- pointer data);
+ void *data);
typedef int (*GetVideoFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
short vid_x, short vid_y, short drw_x,
short drw_y, short vid_w, short vid_h,
short drw_w, short drw_h, RegionPtr clipBoxes,
- pointer data);
+ void *data);
typedef int (*GetStillFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
short vid_x, short vid_y, short drw_x,
short drw_y, short vid_w, short vid_h,
short drw_w, short drw_h, RegionPtr clipBoxes,
- pointer data);
-typedef void (*StopVideoFuncPtr) (KdScreenInfo * screen, pointer data,
+ void *data);
+typedef void (*StopVideoFuncPtr) (KdScreenInfo * screen, void *data,
Bool Exit);
typedef int (*SetPortAttributeFuncPtr) (KdScreenInfo * screen, Atom attribute,
- int value, pointer data);
+ int value, void *data);
typedef int (*GetPortAttributeFuncPtr) (KdScreenInfo * screen, Atom attribute,
- int *value, pointer data);
+ int *value, void *data);
typedef void (*QueryBestSizeFuncPtr) (KdScreenInfo * screen, Bool motion,
short vid_w, short vid_h, short drw_w,
short drw_h, unsigned int *p_w,
- unsigned int *p_h, pointer data);
+ unsigned int *p_h, void *data);
typedef int (*PutImageFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
short src_x, short src_y, short drw_x,
short drw_y, short src_w, short src_h,
short drw_w, short drw_h, int image,
unsigned char *buf, short width, short height,
- Bool Sync, RegionPtr clipBoxes, pointer data);
+ Bool Sync, RegionPtr clipBoxes, void *data);
typedef int (*ReputImageFuncPtr) (KdScreenInfo * screen, DrawablePtr pDraw,
short drw_x, short drw_y, RegionPtr clipBoxes,
- pointer data);
+ void *data);
typedef int (*QueryImageAttributesFuncPtr) (KdScreenInfo * screen, int image,
unsigned short *width,
unsigned short *height,
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index ec3c47a..d102722 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -458,7 +458,7 @@ vfbUninstallColormap(ColormapPtr pmap)
if (pmap == curpmap) {
if (pmap->mid != pmap->pScreen->defColormap) {
- dixLookupResourceByType((pointer *) &curpmap,
+ dixLookupResourceByType((void **) &curpmap,
pmap->pScreen->defColormap,
RT_COLORMAP, serverClient,
DixInstallAccess);
@@ -506,7 +506,7 @@ vfbSaveScreen(ScreenPtr pScreen, int on)
/* this flushes any changes to the screens out to the mmapped file */
static void
-vfbBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+vfbBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadmask)
{
int i;
@@ -527,7 +527,7 @@ vfbBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
}
static void
-vfbWakeupHandler(pointer blockData, int result, pointer pReadmask)
+vfbWakeupHandler(void *blockData, int result, void *pReadmask)
{
}
diff --git a/hw/xfree86/common/vidmodeproc.h b/hw/xfree86/common/vidmodeproc.h
index f547efd..cff340c 100644
--- a/hw/xfree86/common/vidmodeproc.h
+++ b/hw/xfree86/common/vidmodeproc.h
@@ -42,38 +42,38 @@ typedef union {
extern Bool VidModeExtensionInit(ScreenPtr pScreen);
extern _X_EXPORT Bool VidModeAvailable(int scrnIndex);
-extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode,
+extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, void **mode,
int *dotClock);
-extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode,
+extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, void **mode,
int *dotClock);
-extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode,
+extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, void **mode,
int *dotClock);
-extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, pointer mode);
+extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, void *mode);
extern _X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom);
extern _X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y);
extern _X_EXPORT Bool VidModeSetViewPort(int scrnIndex, int x, int y);
-extern _X_EXPORT Bool VidModeSwitchMode(int scrnIndex, pointer mode);
+extern _X_EXPORT Bool VidModeSwitchMode(int scrnIndex, void *mode);
extern _X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock);
-extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, pointer *monitor);
+extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, void **monitor);
extern _X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock);
extern _X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks);
extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex,
- pointer mode);
+ void *mode);
extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex,
- pointer mode);
-extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, pointer mode);
-extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, pointer mode);
+ void *mode);
+extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, void *mode);
+extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, void *mode);
extern _X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock);
extern _X_EXPORT int VidModeGetNumOfModes(int scrnIndex);
extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green,
float blue);
extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green,
float *blue);
-extern _X_EXPORT pointer VidModeCreateMode(void);
-extern _X_EXPORT void VidModeCopyMode(pointer modefrom, pointer modeto);
-extern _X_EXPORT int VidModeGetModeValue(pointer mode, int valtyp);
-extern _X_EXPORT void VidModeSetModeValue(pointer mode, int valtyp, int val);
-extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor,
+extern _X_EXPORT void *VidModeCreateMode(void);
+extern _X_EXPORT void VidModeCopyMode(void *modefrom, void *modeto);
+extern _X_EXPORT int VidModeGetModeValue(void *mode, int valtyp);
+extern _X_EXPORT void VidModeSetModeValue(void *mode, int valtyp, int val);
+extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(void *monitor,
int valtyp, int indx);
extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *,
CARD16 *);
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 143be1e..89025fe 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -128,7 +128,7 @@ extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,
void *dummy, EntityProc init,
EntityProc enter,
EntityProc leave,
- pointer private);
+ void *private);
/* Obsolete! don't use */
extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
int entityIndex,
@@ -136,7 +136,7 @@ extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
void *dummy, EntityProc init,
EntityProc enter,
EntityProc leave,
- pointer private);
+ void *private);
#else
#define xf86VGAarbiterInit() do {} while (0)
#define xf86VGAarbiterFini() do {} while (0)
@@ -166,7 +166,7 @@ extern _X_EXPORT void xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn,
extern _X_EXPORT EntityInfoPtr xf86GetEntityInfo(int entityIndex);
extern _X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init,
EntityProc enter, EntityProc leave,
- pointer);
+ void *);
extern _X_EXPORT Bool xf86IsEntityPrimary(int entityIndex);
extern _X_EXPORT ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
@@ -216,18 +216,18 @@ extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode;
/* xf86Events.c */
extern _X_EXPORT void SetTimeSinceLastInputEvent(void);
-extern _X_EXPORT pointer xf86AddInputHandler(int fd, InputHandlerProc proc,
- pointer data);
-extern _X_EXPORT int xf86RemoveInputHandler(pointer handler);
-extern _X_EXPORT void xf86DisableInputHandler(pointer handler);
-extern _X_EXPORT void xf86EnableInputHandler(pointer handler);
-extern _X_EXPORT pointer xf86AddGeneralHandler(int fd, InputHandlerProc proc,
- pointer data);
-extern _X_EXPORT int xf86RemoveGeneralHandler(pointer handler);
-extern _X_EXPORT void xf86DisableGeneralHandler(pointer handler);
-extern _X_EXPORT void xf86EnableGeneralHandler(pointer handler);
+extern _X_EXPORT void *xf86AddInputHandler(int fd, InputHandlerProc proc,
+ void *data);
+extern _X_EXPORT int xf86RemoveInputHandler(void *handler);
+extern _X_EXPORT void xf86DisableInputHandler(void *handler);
+extern _X_EXPORT void xf86EnableInputHandler(void *handler);
+extern _X_EXPORT void *xf86AddGeneralHandler(int fd, InputHandlerProc proc,
+ void *data);
+extern _X_EXPORT int xf86RemoveGeneralHandler(void *handler);
+extern _X_EXPORT void xf86DisableGeneralHandler(void *handler);
+extern _X_EXPORT void xf86EnableGeneralHandler(void *handler);
extern _X_EXPORT InputHandlerProc xf86SetConsoleHandler(InputHandlerProc
- handler, pointer data);
+ handler, void *data);
extern _X_EXPORT void xf86InterceptSignals(int *signo);
extern _X_EXPORT void xf86InterceptSigIll(void (*sigillhandler) (void));
extern _X_EXPORT Bool xf86EnableVTSwitch(Bool new);
@@ -237,7 +237,7 @@ extern _X_EXPORT Bool xf86VTOwner(void);
/* xf86Helper.c */
-extern _X_EXPORT void xf86AddDriver(DriverPtr driver, pointer module,
+extern _X_EXPORT void xf86AddDriver(DriverPtr driver, void *module,
int flags);
extern _X_EXPORT void xf86DeleteDriver(int drvIndex);
extern _X_EXPORT ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags);
@@ -328,36 +328,36 @@ xf86DisableRandR(void);
extern _X_EXPORT CARD32
xorgGetVersion(void);
extern _X_EXPORT CARD32
-xf86GetModuleVersion(pointer module);
-extern _X_EXPORT pointer
+xf86GetModuleVersion(void *module);
+extern _X_EXPORT void *
xf86LoadDrvSubModule(DriverPtr drv, const char *name);
-extern _X_EXPORT pointer
+extern _X_EXPORT void *
xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
-extern _X_EXPORT pointer
-xf86LoadOneModule(const char *name, pointer optlist);
+extern _X_EXPORT void *
+xf86LoadOneModule(const char *name, void *optlist);
extern _X_EXPORT void
-xf86UnloadSubModule(pointer mod);
+xf86UnloadSubModule(void *mod);
extern _X_EXPORT Bool
xf86LoaderCheckSymbol(const char *name);
extern _X_EXPORT void
xf86SetBackingStore(ScreenPtr pScreen);
extern _X_EXPORT void
xf86SetSilkenMouse(ScreenPtr pScreen);
-extern _X_EXPORT pointer
+extern _X_EXPORT void *
xf86FindXvOptions(ScrnInfoPtr pScrn, int adapt_index, const char *port_name,
- const char **adaptor_name, pointer *adaptor_options);
+ const char **adaptor_name, void **adaptor_options);
extern _X_EXPORT void
xf86GetOS(const char **name, int *major, int *minor, int *teeny);
extern _X_EXPORT ScrnInfoPtr
xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag,
int entityIndex, EntityProc init,
- EntityProc enter, EntityProc leave, pointer private);
+ EntityProc enter, EntityProc leave, void *private);
extern _X_EXPORT Bool
xf86IsScreenPrimary(ScrnInfoPtr pScrn);
extern _X_EXPORT int
xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
- int format, unsigned long len, pointer value);
+ int format, unsigned long len, void *value);
extern _X_EXPORT Bool
xf86IsUnblank(int mode);
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index d463e91..507c57d 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -288,7 +288,7 @@ xf86IsEntityPrimary(int entityIndex)
Bool
xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter,
- EntityProc leave, pointer private)
+ EntityProc leave, void *private)
{
if (entityIndex >= xf86NumEntities)
return FALSE;
diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h
index e83ba78..c59625d 100644
--- a/hw/xfree86/common/xf86Bus.h
+++ b/hw/xfree86/common/xf86Bus.h
@@ -51,7 +51,7 @@ typedef struct {
EntityProc entityInit;
EntityProc entityEnter;
EntityProc entityLeave;
- pointer private;
+ void *private;
Bool active;
Bool inUse;
BusRec bus;
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index de50ec0..5be1693 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -237,7 +237,7 @@ xf86ValidateFontPath(char *path)
* that we need at this point
*/
const char **
-xf86ModulelistFromConfig(pointer **optlist)
+xf86ModulelistFromConfig(void ***optlist)
{
int count = 0, i = 0;
const char **modulearray;
@@ -246,7 +246,7 @@ xf86ModulelistFromConfig(pointer **optlist)
"freetype", "type1",
NULL
};
- pointer *optarray;
+ void **optarray;
XF86LoadPtr modp;
Bool found;
@@ -352,7 +352,7 @@ xf86ModulelistFromConfig(pointer **optlist)
* allocate the memory and walk the list again to fill in the pointers
*/
modulearray = xnfalloc((count + 1) * sizeof(char *));
- optarray = xnfalloc((count + 1) * sizeof(pointer));
+ optarray = xnfalloc((count + 1) * sizeof(void *));
count = 0;
if (xf86configptr->conf_modules) {
modp = xf86configptr->conf_modules->mod_load_lst;
@@ -2446,7 +2446,7 @@ xf86HandleConfigFile(Bool autoconfig)
else {
if (xf86configptr->conf_flags != NULL) {
char *dfltlayout = NULL;
- pointer optlist = xf86configptr->conf_flags->flg_option_lst;
+ void *optlist = xf86configptr->conf_flags->flg_option_lst;
if (optlist && xf86FindOption(optlist, "defaultserverlayout"))
dfltlayout =
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index 84013e1..23fb383 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/hw/xfree86/common/xf86Config.h
@@ -59,7 +59,7 @@ typedef struct _ModuleDefault {
/*
* prototypes
*/
-const char **xf86ModulelistFromConfig(pointer **);
+const char **xf86ModulelistFromConfig(void ***);
const char **xf86DriverlistFromConfig(void);
const char **xf86DriverlistFromCompile(void);
const char **xf86InputDriverlistFromConfig(void);
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 6a05ce5..b9e1e3f 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -450,7 +450,7 @@ xf86SetDGAMode(ScrnInfoPtr pScrn, int num, DGADevicePtr devRet)
pMode->pixmapHeight, pMode->depth,
pMode->bitsPerPixel,
pMode->bytesPerScanline,
- (pointer) (pMode->address));
+ (void *) (pMode->address));
}
}
@@ -1214,7 +1214,7 @@ DGAHandleEvent(int screen_num, InternalEvent *ev, DeviceIntPtr device)
static void XDGAResetProc(ExtensionEntry * extEntry);
-static void DGAClientStateChange(CallbackListPtr *, pointer, pointer);
+static void DGAClientStateChange(CallbackListPtr *, void *, void *);
static DevPrivateKeyRec DGAScreenPrivateKeyRec;
@@ -1404,7 +1404,7 @@ ProcXDGAQueryModes(ClientPtr client)
}
static void
-DGAClientStateChange(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
+DGAClientStateChange(CallbackListPtr *pcbl, void *nulldata, void *calldata)
{
NewClientInfoRec *pci = (NewClientInfoRec *) calldata;
ClientPtr client = NULL;
@@ -1484,7 +1484,7 @@ ProcXDGASetMode(ClientPtr client)
DGA_SETCLIENT(stuff->screen, client);
if (pPix) {
- if (AddResource(stuff->pid, RT_PIXMAP, (pointer) (pPix))) {
+ if (AddResource(stuff->pid, RT_PIXMAP, (void *) (pPix))) {
pPix->drawable.id = (int) stuff->pid;
rep.flags = DGA_PIXMAP_AVAILABLE;
}
@@ -1562,7 +1562,7 @@ ProcXDGAInstallColormap(ClientPtr client)
REQUEST_SIZE_MATCH(xXDGAInstallColormapReq);
- rc = dixLookupResourceByType((pointer *) &cmap, stuff->cmap, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &cmap, stuff->cmap, RT_COLORMAP,
client, DixInstallAccess);
if (rc != Success)
return rc;
@@ -1991,7 +1991,7 @@ ProcXF86DGAInstallColormap(ClientPtr client)
if (!DGAActive(stuff->screen))
return DGAErrorBase + XF86DGADirectNotActivated;
- rc = dixLookupResourceByType((pointer *) &pcmp, stuff->id, RT_COLORMAP,
+ rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP,
client, DixInstallAccess);
if (rc == Success) {
DGAInstallCmap(pcmp);
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 881cb27..14d1f45 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -60,7 +60,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
#ifdef DPMSExtension
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
DPMSPtr pDPMS;
- pointer DPMSOpt;
+ void *DPMSOpt;
MessageType enabled_from;
DPMSKey = &DPMSKeyRec;
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index d0b1431..cae7873 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -114,7 +114,7 @@ static void xf86VTSwitch(void);
typedef struct x_IHRec {
int fd;
InputHandlerProc ihproc;
- pointer data;
+ void *data;
Bool enabled;
Bool is_input;
struct x_IHRec *next;
@@ -243,7 +243,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
/* ARGSUSED */
void
-xf86Wakeup(pointer blockData, int err, pointer pReadmask)
+xf86Wakeup(void *blockData, int err, void *pReadmask)
{
fd_set *LastSelectMask = (fd_set *) pReadmask;
fd_set devicesWithInput;
@@ -583,8 +583,8 @@ xf86VTSwitch(void)
/* Input handler registration */
-static pointer
-addInputHandler(int fd, InputHandlerProc proc, pointer data)
+static void *
+addInputHandler(int fd, InputHandlerProc proc, void *data)
{
IHPtr ih;
@@ -606,8 +606,8 @@ addInputHandler(int fd, InputHandlerProc proc, pointer data)
return ih;
}
-pointer
-xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data)
+void *
+xf86AddInputHandler(int fd, InputHandlerProc proc, void *data)
{
IHPtr ih = addInputHandler(fd, proc, data);
@@ -618,8 +618,8 @@ xf86AddInputHandler(int fd, InputHandlerProc proc, pointer data)
return ih;
}
-pointer
-xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data)
+void *
+xf86AddGeneralHandler(int fd, InputHandlerProc proc, void *data)
{
IHPtr ih = addInputHandler(fd, proc, data);
@@ -634,7 +634,7 @@ xf86AddGeneralHandler(int fd, InputHandlerProc proc, pointer data)
* proc may be NULL if the server should not handle events on the console.
*/
InputHandlerProc
-xf86SetConsoleHandler(InputHandlerProc proc, pointer data)
+xf86SetConsoleHandler(InputHandlerProc proc, void *data)
{
static IHPtr handler = NULL;
InputHandlerProc old_proc = NULL;
@@ -667,7 +667,7 @@ removeInputHandler(IHPtr ih)
}
int
-xf86RemoveInputHandler(pointer handler)
+xf86RemoveInputHandler(void *handler)
{
IHPtr ih;
int fd;
@@ -686,7 +686,7 @@ xf86RemoveInputHandler(pointer handler)
}
int
-xf86RemoveGeneralHandler(pointer handler)
+xf86RemoveGeneralHandler(void *handler)
{
IHPtr ih;
int fd;
@@ -705,7 +705,7 @@ xf86RemoveGeneralHandler(pointer handler)
}
void
-xf86DisableInputHandler(pointer handler)
+xf86DisableInputHandler(void *handler)
{
IHPtr ih;
@@ -719,7 +719,7 @@ xf86DisableInputHandler(pointer handler)
}
void
-xf86DisableGeneralHandler(pointer handler)
+xf86DisableGeneralHandler(void *handler)
{
IHPtr ih;
@@ -733,7 +733,7 @@ xf86DisableGeneralHandler(pointer handler)
}
void
-xf86EnableInputHandler(pointer handler)
+xf86EnableInputHandler(void *handler)
{
IHPtr ih;
@@ -747,7 +747,7 @@ xf86EnableInputHandler(pointer handler)
}
void
-xf86EnableGeneralHandler(pointer handler)
+xf86EnableGeneralHandler(void *handler)
{
IHPtr ih;
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index a59f4fc..0916dec 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -67,7 +67,7 @@ static int xf86ScrnInfoPrivateCount = 0;
/* Add a pointer to a new DriverRec to xf86DriverList */
void
-xf86AddDriver(DriverPtr driver, pointer module, int flags)
+xf86AddDriver(DriverPtr driver, void *module, int flags)
{
/* Don't add null entries */
if (!driver)
@@ -107,7 +107,7 @@ xf86DeleteDriver(int drvIndex)
/* Add a pointer to a new InputDriverRec to xf86InputDriverList */
void
-xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags)
+xf86AddInputDriver(InputDriverPtr driver, void *module, int flags)
{
/* Don't add null entries */
if (!driver)
@@ -1529,15 +1529,15 @@ xf86DisableRandR(void)
}
CARD32
-xf86GetModuleVersion(pointer module)
+xf86GetModuleVersion(void *module)
{
return (CARD32) LoaderGetModuleVersion(module);
}
-pointer
+void *
xf86LoadDrvSubModule(DriverPtr drv, const char *name)
{
- pointer ret;
+ void *ret;
int errmaj = 0, errmin = 0;
ret = LoadSubModule(drv->module, name, NULL, NULL, NULL, NULL,
@@ -1547,10 +1547,10 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name)
return ret;
}
-pointer
+void *
xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
{
- pointer ret;
+ void *ret;
int errmaj = 0, errmin = 0;
ret = LoadSubModule(pScrn->module, name, NULL, NULL, NULL, NULL,
@@ -1563,12 +1563,12 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
/*
* xf86LoadOneModule loads a single module.
*/
-pointer
-xf86LoadOneModule(const char *name, pointer opt)
+void *
+xf86LoadOneModule(const char *name, void *opt)
{
int errmaj, errmin;
char *Name;
- pointer mod;
+ void *mod;
if (!name)
return NULL;
@@ -1592,7 +1592,7 @@ xf86LoadOneModule(const char *name, pointer opt)
}
void
-xf86UnloadSubModule(pointer mod)
+xf86UnloadSubModule(void *mod)
{
UnloadSubModule(mod);
}
@@ -1695,9 +1695,9 @@ xf86SetSilkenMouse(ScreenPtr pScreen)
/* Wrote this function for the PM2 Xv driver, preliminary. */
-pointer
+void *
xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, const char *port_name,
- const char **adaptor_name, pointer *adaptor_options)
+ const char **adaptor_name, void **adaptor_options)
{
confXvAdaptorPtr adaptor;
int i;
@@ -1729,7 +1729,7 @@ xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, const char *port_name,
static void
xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
- EntityProc enter, EntityProc leave, pointer private)
+ EntityProc enter, EntityProc leave, void *private)
{
ScrnInfoPtr pScrn;
@@ -1741,7 +1741,7 @@ xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init,
ScrnInfoPtr
xf86ConfigFbEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
EntityProc init, EntityProc enter, EntityProc leave,
- pointer private)
+ void *private)
{
EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
@@ -1783,7 +1783,7 @@ xf86IsScreenPrimary(ScrnInfoPtr pScrn)
int
xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
- int format, unsigned long len, pointer value)
+ int format, unsigned long len, void *value)
{
RootWinPropPtr pNewProp = NULL, pRegProp;
Bool existing = FALSE;
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 6feedc8..7c72aa9 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -396,7 +396,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
{
int i, j, k, scr_index;
const char **modulelist;
- pointer *optionlist;
+ void **optionlist;
Pix24Flags screenpix24, pix24;
MessageType pix24From = X_DEFAULT;
Bool pix24Fail = FALSE;
@@ -1538,10 +1538,10 @@ ddxUseMsg(void)
* xf86LoadModules iterates over a list that is being passed in.
*/
Bool
-xf86LoadModules(const char **list, pointer *optlist)
+xf86LoadModules(const char **list, void **optlist)
{
int errmaj, errmin;
- pointer opt;
+ void *opt;
int i;
char *name;
Bool failed = FALSE;
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 396f63c..b6ec19d 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -170,12 +170,12 @@ typedef struct {
#define INITARGS void
/* Prototypes for Loader functions that are exported to modules */
-extern _X_EXPORT pointer LoadSubModule(pointer, const char *, const char **,
- const char **, pointer,
+extern _X_EXPORT void *LoadSubModule(void *, const char *, const char **,
+ const char **, void *,
const XF86ModReqInfo *, int *, int *);
-extern _X_EXPORT void UnloadSubModule(pointer);
-extern _X_EXPORT void UnloadModule(pointer);
-extern _X_EXPORT pointer LoaderSymbol(const char *);
+extern _X_EXPORT void UnloadSubModule(void *);
+extern _X_EXPORT void UnloadModule(void *);
+extern _X_EXPORT void *LoaderSymbol(const char *);
extern _X_EXPORT const char **LoaderListDirs(const char **, const char **);
extern _X_EXPORT void LoaderFreeDirList(char **);
extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);
@@ -184,11 +184,11 @@ extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor,
extern _X_EXPORT Bool LoaderShouldIgnoreABI(void);
extern _X_EXPORT int LoaderGetABIVersion(const char *abiclass);
-typedef pointer (*ModuleSetupProc) (pointer, pointer, int *, int *);
-typedef void (*ModuleTearDownProc) (pointer);
+typedef void *(*ModuleSetupProc) (void *, void *, int *, int *);
+typedef void (*ModuleTearDownProc) (void *);
-#define MODULESETUPPROTO(func) pointer func(pointer, pointer, int*, int*)
-#define MODULETEARDOWNPROTO(func) void func(pointer)
+#define MODULESETUPPROTO(func) void *func(void *, void *, int*, int*)
+#define MODULETEARDOWNPROTO(func) void func(void *)
typedef struct {
XF86ModuleVersionInfo *vers;
diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index 15257cb..9e49e8e 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -196,7 +196,7 @@ DoApmEvent(pmEvent event, Bool undo)
#define MAX_NO_EVENTS 8
void
-xf86HandlePMEvents(int fd, pointer data)
+xf86HandlePMEvents(int fd, void *data)
{
pmEvent events[MAX_NO_EVENTS];
int i, n;
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 5239a6b..6e374eb 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -139,11 +139,11 @@ DoShowOptions(void)
/* xf86Events.c */
extern _X_EXPORT void
-xf86Wakeup(pointer blockData, int err, pointer pReadmask);
+xf86Wakeup(void *blockData, int err, void *pReadmask);
extern _X_HIDDEN int
xf86SigWrapper(int signo);
extern _X_EXPORT void
-xf86HandlePMEvents(int fd, pointer data);
+xf86HandlePMEvents(int fd, void *data);
extern _X_EXPORT int (*xf86PMGetEventFromOs) (int fd, pmEvent * events,
int num);
extern _X_EXPORT pmWait (*xf86PMConfirmEventToOs) (int fd, pmEvent event);
@@ -156,7 +156,7 @@ xf86CloseLog(enum ExitCode error);
/* xf86Init.c */
extern _X_EXPORT Bool
-xf86LoadModules(const char **list, pointer *optlist);
+xf86LoadModules(const char **list, void **optlist);
extern _X_EXPORT int
xf86SetVerbosity(int verb);
extern _X_EXPORT int
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index ddcb3ca..f7a9c9f 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -140,7 +140,7 @@ typedef struct _RootWinProp {
Atom type;
short format;
long size;
- pointer data;
+ void *data;
} RootWinProp, *RootWinPropPtr;
/* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */
diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c
index 225fff0..5cc2429 100644
--- a/hw/xfree86/common/xf86VGAarbiter.c
+++ b/hw/xfree86/common/xf86VGAarbiter.c
@@ -257,7 +257,7 @@ VGAarbiterCloseScreen(ScreenPtr pScreen)
UNWRAP_SCREEN_INFO(FreeScreen);
UNWRAP_SPRITE;
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
xf86VGAarbiterLock(xf86ScreenToScrn(pScreen));
val = (*pScreen->CloseScreen) (pScreen);
xf86VGAarbiterUnlock(xf86ScreenToScrn(pScreen));
@@ -266,7 +266,7 @@ VGAarbiterCloseScreen(ScreenPtr pScreen)
static void
VGAarbiterBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadmask)
+ void *pTimeout, void *pReadmask)
{
SCREEN_PROLOG(BlockHandler);
VGAGet(pScreen);
@@ -277,7 +277,7 @@ VGAarbiterBlockHandler(ScreenPtr pScreen,
static void
VGAarbiterWakeupHandler(ScreenPtr pScreen, unsigned long result,
- pointer pReadmask)
+ void *pReadmask)
{
SCREEN_PROLOG(WakeupHandler);
VGAGet(pScreen);
@@ -586,7 +586,7 @@ VGAarbiterCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
}
static void
-VGAarbiterChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+VGAarbiterChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
GC_UNWRAP(pGC);
(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
@@ -860,7 +860,7 @@ VGAarbiterImageGlyphBlt(DrawablePtr pDraw,
GCPtr pGC,
int xInit, int yInit,
unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
ScreenPtr pScreen = pGC->pScreen;
@@ -877,7 +877,7 @@ VGAarbiterPolyGlyphBlt(DrawablePtr pDraw,
GCPtr pGC,
int xInit, int yInit,
unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
ScreenPtr pScreen = pGC->pScreen;
diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h
index f91de0c..ec21bc2 100644
--- a/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -142,10 +142,10 @@ typedef struct _VGAarbiterGC {
} VGAarbiterGCRec, *VGAarbiterGCPtr;
/* Screen funcs */
-static void VGAarbiterBlockHandler(ScreenPtr pScreen, pointer pTimeout,
- pointer pReadmask);
+static void VGAarbiterBlockHandler(ScreenPtr pScreen, void *pTimeout,
+ void *pReadmask);
static void VGAarbiterWakeupHandler(ScreenPtr pScreen,
- unsigned long result, pointer pReadmask);
+ unsigned long result, void *pReadmask);
static Bool VGAarbiterCloseScreen(ScreenPtr pScreen);
static void VGAarbiterGetImage(DrawablePtr pDrawable, int sx, int sy, int w,
int h, unsigned int format,
@@ -188,7 +188,7 @@ static void VGAarbiterValidateGC(GCPtr pGC, unsigned long changes,
static void VGAarbiterChangeGC(GCPtr pGC, unsigned long mask);
static void VGAarbiterCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void VGAarbiterDestroyGC(GCPtr pGC);
-static void VGAarbiterChangeClip(GCPtr pGC, int type, pointer pvalue,
+static void VGAarbiterChangeClip(GCPtr pGC, int type, void *pvalue,
int nrects);
static void VGAarbiterDestroyClip(GCPtr pGC);
static void VGAarbiterCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
@@ -236,10 +236,10 @@ static void VGAarbiterImageText16(DrawablePtr pDraw, GCPtr pGC, int x, int y,
int count, unsigned short *chars);
static void VGAarbiterImageGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,
int yInit, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
static void VGAarbiterPolyGlyphBlt(DrawablePtr pDraw, GCPtr pGC, int xInit,
int yInit, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase);
+ CharInfoPtr * ppci, void *pglyphBase);
static void VGAarbiterPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr
pDraw, int dx, int dy, int xOrg, int yOrg);
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index a7d1c25..e708b27 100644
--- a/hw/xfree86/common/xf86VidMode.c
+++ b/hw/xfree86/common/xf86VidMode.c
@@ -138,7 +138,7 @@ VidModeAvailable(int scrnIndex)
}
Bool
-VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock)
+VidModeGetCurrentModeline(int scrnIndex, void **mode, int *dotClock)
{
ScrnInfoPtr pScrn;
@@ -148,7 +148,7 @@ VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock)
pScrn = xf86Screens[scrnIndex];
if (pScrn->currentMode) {
- *mode = (pointer) (pScrn->currentMode);
+ *mode = (void *) (pScrn->currentMode);
*dotClock = pScrn->currentMode->Clock;
return TRUE;
@@ -211,7 +211,7 @@ VidModeGetClocks(int scrnIndex, int *Clocks)
}
Bool
-VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
+VidModeGetFirstModeline(int scrnIndex, void **mode, int *dotClock)
{
ScrnInfoPtr pScrn;
VidModePtr pVidMode;
@@ -228,7 +228,7 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
pVidMode->Next = pVidMode->First->next;
if (pVidMode->First->status == MODE_OK) {
- *mode = (pointer) (pVidMode->First);
+ *mode = (void *) (pVidMode->First);
*dotClock = VidModeGetDotClock(scrnIndex, pVidMode->First->Clock);
return TRUE;
}
@@ -237,7 +237,7 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
}
Bool
-VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock)
+VidModeGetNextModeline(int scrnIndex, void **mode, int *dotClock)
{
ScrnInfoPtr pScrn;
VidModePtr pVidMode;
@@ -252,7 +252,7 @@ VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock)
for (p = pVidMode->Next; p != NULL && p != pVidMode->First; p = p->next) {
if (p->status == MODE_OK) {
pVidMode->Next = p->next;
- *mode = (pointer) p;
+ *mode = (void *) p;
*dotClock = VidModeGetDotClock(scrnIndex, p->Clock);
return TRUE;
}
@@ -262,7 +262,7 @@ VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock)
}
Bool
-VidModeDeleteModeline(int scrnIndex, pointer mode)
+VidModeDeleteModeline(int scrnIndex, void *mode)
{
ScrnInfoPtr pScrn;
@@ -323,7 +323,7 @@ VidModeGetViewPort(int scrnIndex, int *x, int *y)
}
Bool
-VidModeSwitchMode(int scrnIndex, pointer mode)
+VidModeSwitchMode(int scrnIndex, void *mode)
{
ScrnInfoPtr pScrn;
DisplayModePtr pTmpMode;
@@ -362,7 +362,7 @@ VidModeLockZoom(int scrnIndex, Bool lock)
}
Bool
-VidModeGetMonitor(int scrnIndex, pointer *monitor)
+VidModeGetMonitor(int scrnIndex, void **monitor)
{
ScrnInfoPtr pScrn;
@@ -370,13 +370,13 @@ VidModeGetMonitor(int scrnIndex, pointer *monitor)
return FALSE;
pScrn = xf86Screens[scrnIndex];
- *monitor = (pointer) (pScrn->monitor);
+ *monitor = (void *) (pScrn->monitor);
return TRUE;
}
ModeStatus
-VidModeCheckModeForMonitor(int scrnIndex, pointer mode)
+VidModeCheckModeForMonitor(int scrnIndex, void *mode)
{
ScrnInfoPtr pScrn;
@@ -389,7 +389,7 @@ VidModeCheckModeForMonitor(int scrnIndex, pointer mode)
}
ModeStatus
-VidModeCheckModeForDriver(int scrnIndex, pointer mode)
+VidModeCheckModeForDriver(int scrnIndex, void *mode)
{
ScrnInfoPtr pScrn;
@@ -402,7 +402,7 @@ VidModeCheckModeForDriver(int scrnIndex, pointer mode)
}
void
-VidModeSetCrtcForMode(int scrnIndex, pointer mode)
+VidModeSetCrtcForMode(int scrnIndex, void *mode)
{
ScrnInfoPtr pScrn;
DisplayModePtr ScreenModes;
@@ -421,7 +421,7 @@ VidModeSetCrtcForMode(int scrnIndex, pointer mode)
}
Bool
-VidModeAddModeline(int scrnIndex, pointer mode)
+VidModeAddModeline(int scrnIndex, void *mode)
{
ScrnInfoPtr pScrn;
@@ -444,7 +444,7 @@ VidModeAddModeline(int scrnIndex, pointer mode)
int
VidModeGetNumOfModes(int scrnIndex)
{
- pointer mode = NULL;
+ void *mode = NULL;
int dotClock = 0, nummodes = 0;
if (!VidModeGetFirstModeline(scrnIndex, &mode, &dotClock))
@@ -526,7 +526,7 @@ VidModeGetGammaRampSize(int scrnIndex)
return xf86GetGammaRampSize(xf86Screens[scrnIndex]->pScreen);
}
-pointer
+void *
VidModeCreateMode(void)
{
DisplayModePtr mode;
@@ -543,13 +543,13 @@ VidModeCreateMode(void)
}
void
-VidModeCopyMode(pointer modefrom, pointer modeto)
+VidModeCopyMode(void *modefrom, void *modeto)
{
memcpy(modeto, modefrom, sizeof(DisplayModeRec));
}
int
-VidModeGetModeValue(pointer mode, int valtyp)
+VidModeGetModeValue(void *mode, int valtyp)
{
int ret = 0;
@@ -592,7 +592,7 @@ VidModeGetModeValue(pointer mode, int valtyp)
}
void
-VidModeSetModeValue(pointer mode, int valtyp, int val)
+VidModeSetModeValue(void *mode, int valtyp, int val)
{
switch (valtyp) {
case VIDMODE_H_DISPLAY:
@@ -633,7 +633,7 @@ VidModeSetModeValue(pointer mode, int valtyp, int val)
}
vidMonitorValue
-VidModeGetMonitorValue(pointer monitor, int valtyp, int indx)
+VidModeGetMonitorValue(void *monitor, int valtyp, int indx)
{
vidMonitorValue ret = { NULL, };
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 5b0b6a1..3a01513 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -107,7 +107,7 @@ static int
* Eval config and modify DeviceVelocityRec accordingly
*/
static void
-ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, pointer list,
+ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, void *list,
DeviceVelocityPtr s)
{
int tempi;
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index b95fbe5..f94261a 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -74,7 +74,7 @@ typedef struct _InputDriverRec {
struct _InputInfoRec * pInfo, int flags);
void (*UnInit) (struct _InputDriverRec * drv,
struct _InputInfoRec * pInfo, int flags);
- pointer module;
+ void *module;
const char **default_options;
} InputDriverRec, *InputDriverPtr;
@@ -97,10 +97,10 @@ typedef struct _InputInfoRec {
int fd;
DeviceIntPtr dev;
- pointer private;
+ void *private;
const char *type_name;
InputDriverPtr drv;
- pointer module;
+ void *module;
XF86OptionPtr options;
InputAttributes *attrs;
} *InputInfoPtr;
@@ -178,7 +178,7 @@ int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
InputInfoPtr xf86AllocateInput(void);
/* xf86Helper.c */
-extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module,
+extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module,
int flags);
extern _X_EXPORT void xf86DeleteInputDriver(int drvIndex);
extern _X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name);
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 85f35f8..3f9c880 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -224,7 +224,7 @@ xf86HandleColormaps(ScreenPtr pScreen,
ComputeGamma(pScreenPriv);
/* get the default map */
- dixLookupResourceByType((pointer *) &pDefMap, pScreen->defColormap,
+ dixLookupResourceByType((void **) &pDefMap, pScreen->defColormap,
RT_COLORMAP, serverClient, DixInstallAccess);
if (!CMapAllocateColormapPrivate(pDefMap)) {
diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c
index 4da6af2..dafaad3 100644
--- a/hw/xfree86/common/xf86fbman.c
+++ b/hw/xfree86/common/xf86fbman.c
@@ -74,7 +74,7 @@ xf86FBManagerRunning(ScreenPtr pScreen)
Bool
xf86RegisterFreeBoxCallback(ScreenPtr pScreen,
FreeBoxCallbackProcPtr FreeBoxCallback,
- pointer devPriv)
+ void *devPriv)
{
FBManagerFuncsPtr funcs;
@@ -93,7 +93,7 @@ xf86AllocateOffscreenArea(ScreenPtr pScreen,
int w, int h,
int gran,
MoveAreaCallbackProcPtr moveCB,
- RemoveAreaCallbackProcPtr removeCB, pointer privData)
+ RemoveAreaCallbackProcPtr removeCB, void *privData)
{
FBManagerFuncsPtr funcs;
@@ -113,7 +113,7 @@ xf86AllocateOffscreenLinear(ScreenPtr pScreen,
int gran,
MoveLinearCallbackProcPtr moveCB,
RemoveLinearCallbackProcPtr removeCB,
- pointer privData)
+ void *privData)
{
FBManagerFuncsPtr funcs;
@@ -309,7 +309,7 @@ SendCallFreeBoxCallbacks(FBManagerPtr offman)
static Bool
localRegisterFreeBoxCallback(ScreenPtr pScreen,
FreeBoxCallbackProcPtr FreeBoxCallback,
- pointer devPriv)
+ void *devPriv)
{
FBManagerPtr offman;
FreeBoxCallbackProcPtr *newCallbacks;
@@ -346,7 +346,7 @@ AllocateArea(FBManagerPtr offman,
int w, int h,
int granularity,
MoveAreaCallbackProcPtr moveCB,
- RemoveAreaCallbackProcPtr removeCB, pointer privData)
+ RemoveAreaCallbackProcPtr removeCB, void *privData)
{
ScreenPtr pScreen = offman->pScreen;
FBLinkPtr link = NULL;
@@ -436,7 +436,7 @@ localAllocateOffscreenArea(ScreenPtr pScreen,
int w, int h,
int gran,
MoveAreaCallbackProcPtr moveCB,
- RemoveAreaCallbackProcPtr removeCB, pointer privData)
+ RemoveAreaCallbackProcPtr removeCB, void *privData)
{
FBManagerPtr offman;
FBAreaPtr area = NULL;
@@ -824,7 +824,7 @@ DumpDebug(FBLinearLinkPtr pLink)
}
static FBLinearPtr
-AllocateLinear(FBManagerPtr offman, int size, int granularity, pointer privData)
+AllocateLinear(FBManagerPtr offman, int size, int granularity, void *privData)
{
ScreenPtr pScreen = offman->pScreen;
FBLinearLinkPtr linear = NULL;
@@ -903,7 +903,7 @@ localAllocateOffscreenLinear(ScreenPtr pScreen,
int gran,
MoveLinearCallbackProcPtr moveCB,
RemoveLinearCallbackProcPtr removeCB,
- pointer privData)
+ void *privData)
{
FBManagerPtr offman;
FBLinearLinkPtr link;
@@ -1394,7 +1394,7 @@ xf86AllocateLinearOffscreenArea(ScreenPtr pScreen,
int gran,
MoveAreaCallbackProcPtr moveCB,
RemoveAreaCallbackProcPtr removeCB,
- pointer privData)
+ void *privData)
{
FBManagerFuncsPtr funcs;
FBManagerPtr offman;
diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h
index 99bf991..092c2e2 100644
--- a/hw/xfree86/common/xf86fbman.h
+++ b/hw/xfree86/common/xf86fbman.h
@@ -60,7 +60,7 @@ typedef struct _FBLinear {
DevUnion devPrivate;
} FBLinear, *FBLinearPtr;
-typedef void (*FreeBoxCallbackProcPtr) (ScreenPtr, RegionPtr, pointer);
+typedef void (*FreeBoxCallbackProcPtr) (ScreenPtr, RegionPtr, void *);
typedef void (*MoveAreaCallbackProcPtr) (FBAreaPtr, FBAreaPtr);
typedef void (*RemoveAreaCallbackProcPtr) (FBAreaPtr);
@@ -73,7 +73,7 @@ typedef struct {
int granularity,
MoveAreaCallbackProcPtr moveCB,
RemoveAreaCallbackProcPtr removeCB,
- pointer privData);
+ void *privData);
void (*FreeOffscreenArea) (FBAreaPtr area);
Bool (*ResizeOffscreenArea) (FBAreaPtr area, int w, int h);
Bool (*QueryLargestOffscreenArea) (ScreenPtr pScreen,
@@ -82,14 +82,14 @@ typedef struct {
int preferences, int priority);
Bool (*RegisterFreeBoxCallback) (ScreenPtr pScreen,
FreeBoxCallbackProcPtr FreeBoxCallback,
- pointer devPriv);
+ void *devPriv);
/* linear functions */
FBLinearPtr(*AllocateOffscreenLinear) (ScreenPtr pScreen,
int size,
int granularity,
MoveLinearCallbackProcPtr moveCB,
RemoveLinearCallbackProcPtr
- removeCB, pointer privData);
+ removeCB, void *privData);
void (*FreeOffscreenLinear) (FBLinearPtr area);
Bool (*ResizeOffscreenLinear) (FBLinearPtr area, int size);
Bool (*QueryLargestOffscreenLinear) (ScreenPtr pScreen,
@@ -121,7 +121,7 @@ xf86AllocateOffscreenArea(ScreenPtr pScreen,
int w, int h,
int granularity,
MoveAreaCallbackProcPtr moveCB,
- RemoveAreaCallbackProcPtr removeCB, pointer privData);
+ RemoveAreaCallbackProcPtr removeCB, void *privData);
extern _X_EXPORT FBAreaPtr
xf86AllocateLinearOffscreenArea(ScreenPtr pScreen,
@@ -129,7 +129,7 @@ xf86AllocateLinearOffscreenArea(ScreenPtr pScreen,
int granularity,
MoveAreaCallbackProcPtr moveCB,
RemoveAreaCallbackProcPtr removeCB,
- pointer privData);
+ void *privData);
extern _X_EXPORT FBLinearPtr
xf86AllocateOffscreenLinear(ScreenPtr pScreen,
@@ -137,7 +137,7 @@ xf86AllocateOffscreenLinear(ScreenPtr pScreen,
int granularity,
MoveLinearCallbackProcPtr moveCB,
RemoveLinearCallbackProcPtr removeCB,
- pointer privData);
+ void *privData);
extern _X_EXPORT void xf86FreeOffscreenArea(FBAreaPtr area);
extern _X_EXPORT void xf86FreeOffscreenLinear(FBLinearPtr area);
@@ -152,7 +152,7 @@ extern _X_EXPORT Bool
xf86RegisterFreeBoxCallback(ScreenPtr pScreen,
FreeBoxCallbackProcPtr FreeBoxCallback,
- pointer devPriv);
+ void *devPriv);
extern _X_EXPORT Bool
xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen);
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 2704766..0f76a03 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1013,7 +1013,7 @@ xf86MatchPciInstances(const char *driverName, int vendorID,
static void
xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets * p_chip,
EntityProc init, EntityProc enter,
- EntityProc leave, pointer private)
+ EntityProc leave, void *private)
{
ScrnInfoPtr pScrn;
@@ -1027,7 +1027,7 @@ xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets * p_chip,
ScrnInfoPtr
xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
PciChipsets * p_chip, void *dummy, EntityProc init,
- EntityProc enter, EntityProc leave, pointer private)
+ EntityProc enter, EntityProc leave, void *private)
{
EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
@@ -1068,7 +1068,7 @@ xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
Bool
xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
PciChipsets * p_chip, void *dummy, EntityProc init,
- EntityProc enter, EntityProc leave, pointer private)
+ EntityProc enter, EntityProc leave, void *private)
{
EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h
index 5ebdf25..9cfcbc5 100644
--- a/hw/xfree86/common/xf86sbusBus.h
+++ b/hw/xfree86/common/xf86sbusBus.h
@@ -76,10 +76,10 @@ extern _X_EXPORT sbusDevicePtr xf86GetSbusInfoForEntity(int entityIndex);
extern _X_EXPORT int xf86GetEntityForSbusInfo(sbusDevicePtr psdp);
extern _X_EXPORT void xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn,
sbusDevicePtr psdp);
-extern _X_EXPORT pointer xf86MapSbusMem(sbusDevicePtr psdp,
+extern _X_EXPORT void *xf86MapSbusMem(sbusDevicePtr psdp,
unsigned long offset,
unsigned long size);
-extern _X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr,
+extern _X_EXPORT void xf86UnmapSbusMem(sbusDevicePtr psdp, void *addr,
unsigned long size);
extern _X_EXPORT void xf86SbusHideOsHwCursor(sbusDevicePtr psdp);
extern _X_EXPORT void xf86SbusSetOsHwCursorCmap(sbusDevicePtr psdp, int bg,
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index fe13816..b164b7f 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -224,8 +224,8 @@ typedef struct {
Gamma gamma; /* Gamma of the monitor */
int widthmm;
int heightmm;
- pointer options;
- pointer DDC;
+ void *options;
+ void *DDC;
Bool reducedblanking; /* Allow CVT reduced blanking modes? */
int maxPixClock; /* in kHz, like mode->Clock */
} MonRec, *MonPtr;
@@ -259,7 +259,7 @@ typedef enum {
GET_REQUIRED_HW_INTERFACES = 10
} xorgDriverFuncOp;
-typedef Bool xorgDriverFuncProc(ScrnInfoPtr, xorgDriverFuncOp, pointer);
+typedef Bool xorgDriverFuncProc(ScrnInfoPtr, xorgDriverFuncOp, void *);
/* RR_GET_INFO, RR_SET_CONFIG */
typedef struct {
@@ -303,7 +303,7 @@ typedef struct {
void (*Identify) (int flags);
Bool (*Probe) (struct _DriverRec * drv, int flags);
const OptionInfoRec *(*AvailableOptions) (int chipid, int bustype);
- pointer module;
+ void *module;
int refCount;
} DriverRec1;
@@ -319,7 +319,7 @@ typedef struct _DriverRec {
void (*Identify) (int flags);
Bool (*Probe) (struct _DriverRec * drv, int flags);
const OptionInfoRec *(*AvailableOptions) (int chipid, int bustype);
- pointer module;
+ void *module;
int refCount;
xorgDriverFuncProc *driverFunc;
@@ -408,7 +408,7 @@ typedef struct {
unsigned long IOBase;
int chipID;
int chipRev;
- pointer options;
+ void *options;
int irq;
int screen; /* For multi-CRTC cards */
} GDevRec, *GDevPtr;
@@ -425,19 +425,19 @@ typedef struct {
rgb whiteColour;
int defaultVisual;
const char **modes;
- pointer options;
+ void *options;
} DispRec, *DispPtr;
typedef struct _confxvportrec {
const char *identifier;
- pointer options;
+ void *options;
} confXvPortRec, *confXvPortPtr;
typedef struct _confxvadaptrec {
const char *identifier;
int numports;
confXvPortPtr ports;
- pointer options;
+ void *options;
} confXvAdaptorRec, *confXvAdaptorPtr;
typedef struct _confscreenrec {
@@ -452,7 +452,7 @@ typedef struct _confscreenrec {
DispPtr displays;
int numxvadaptors;
confXvAdaptorPtr xvadaptors;
- pointer options;
+ void *options;
} confScreenRec, *confScreenPtr;
typedef enum {
@@ -489,7 +489,7 @@ typedef struct _serverlayoutrec {
screenLayoutPtr screens;
GDevPtr inactives;
InputInfoRec **inputs; /* NULL terminated */
- pointer options;
+ void *options;
} serverLayoutRec, *serverLayoutPtr;
typedef struct _confdribufferrec {
@@ -512,7 +512,7 @@ typedef struct _confdrirec {
#define NUM_RESERVED_POINTERS 14
#define NUM_RESERVED_FUNCS 10
-typedef pointer (*funcPointer) (void);
+typedef void *(*funcPointer) (void);
/* flags for depth 24 pixmap options */
typedef enum {
@@ -581,7 +581,7 @@ typedef struct _PciChipsets {
} PciChipsets;
/* Entity properties */
-typedef void (*EntityProc) (int entityIndex, pointer private);
+typedef void (*EntityProc) (int entityIndex, void *private);
typedef struct _entityInfo {
int index;
@@ -731,11 +731,11 @@ typedef struct _ScrnInfoRec {
int xDpi; /* width DPI */
int yDpi; /* height DPI */
const char *name; /* Name to prefix messages */
- pointer driverPrivate; /* Driver private area */
+ void *driverPrivate; /* Driver private area */
DevUnion *privates; /* Other privates can hook in
* here */
DriverPtr drv; /* xf86DriverList[] entry */
- pointer module; /* Pointer to module head */
+ void *module; /* Pointer to module head */
int colorKey;
int overlayFlags;
@@ -754,7 +754,7 @@ typedef struct _ScrnInfoRec {
int memClk; /* memory clock */
int textClockFreq; /* clock of text mode */
Bool flipPixels; /* swap default black/white */
- pointer options;
+ void *options;
int chipID;
int chipRev;
@@ -779,7 +779,7 @@ typedef struct _ScrnInfoRec {
int *entityInstanceList;
struct pci_device *vgaDev;
- pointer reservedPtr[NUM_RESERVED_POINTERS];
+ void *reservedPtr[NUM_RESERVED_POINTERS];
/*
* Driver entry points.
@@ -864,7 +864,7 @@ typedef enum {
typedef void (*DPMSSetProcPtr) (ScrnInfoPtr, int, int);
/* Input handler proc */
-typedef void (*InputHandlerProc) (int fd, pointer data);
+typedef void (*InputHandlerProc) (int fd, void *data);
/* These are used by xf86GetClocks */
#define CLK_REG_SAVE -1
diff --git a/hw/xfree86/common/xf86vmode.c b/hw/xfree86/common/xf86vmode.c
index cad0e6a..2b07833 100644
--- a/hw/xfree86/common/xf86vmode.c
+++ b/hw/xfree86/common/xf86vmode.c
@@ -216,7 +216,7 @@ setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
}
static int
-XF86VidModeFreeEvents(pointer value, XID id)
+XF86VidModeFreeEvents(void *value, XID id)
{
XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value;
ScreenPtr pScreen = pOld->screen;
@@ -314,7 +314,7 @@ ProcXF86VidModeGetModeLine(ClientPtr client)
.type = X_Reply,
.sequenceNumber = client->sequence
};
- pointer mode;
+ void *mode;
int dotClock;
int ver;
@@ -413,7 +413,7 @@ ProcXF86VidModeGetAllModeLines(ClientPtr client)
{
REQUEST(xXF86VidModeGetAllModeLinesReq);
xXF86VidModeGetAllModeLinesReply rep;
- pointer mode;
+ void *mode;
int modecount, dotClock;
int ver;
@@ -524,7 +524,7 @@ ProcXF86VidModeAddModeLine(ClientPtr client)
xXF86OldVidModeAddModeLineReq *oldstuff =
(xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
xXF86VidModeAddModeLineReq newstuff;
- pointer mode;
+ void *mode;
int len;
int dotClock;
int ver;
@@ -688,7 +688,7 @@ ProcXF86VidModeDeleteModeLine(ClientPtr client)
xXF86OldVidModeDeleteModeLineReq *oldstuff =
(xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
xXF86VidModeDeleteModeLineReq newstuff;
- pointer mode;
+ void *mode;
int len, dotClock;
int ver;
@@ -813,7 +813,7 @@ ProcXF86VidModeModModeLine(ClientPtr client)
xXF86OldVidModeModModeLineReq *oldstuff =
(xXF86OldVidModeModModeLineReq *) client->requestBuffer;
xXF86VidModeModModeLineReq newstuff;
- pointer mode, modetmp;
+ void *mode, *modetmp;
int len, dotClock;
int ver;
@@ -942,7 +942,7 @@ ProcXF86VidModeValidateModeLine(ClientPtr client)
(xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
xXF86VidModeValidateModeLineReq newstuff;
xXF86VidModeValidateModeLineReply rep;
- pointer mode, modetmp = NULL;
+ void *mode, *modetmp = NULL;
int len, status, dotClock;
int ver;
@@ -1080,7 +1080,7 @@ ProcXF86VidModeSwitchToMode(ClientPtr client)
xXF86OldVidModeSwitchToModeReq *oldstuff =
(xXF86OldVidModeSwitchToModeReq *) client->requestBuffer;
xXF86VidModeSwitchToModeReq newstuff;
- pointer mode;
+ void *mode;
int len, dotClock;
int ver;
@@ -1205,7 +1205,7 @@ ProcXF86VidModeGetMonitor(ClientPtr client)
};
CARD32 *hsyncdata, *vsyncdata;
int i, nHsync, nVrefresh;
- pointer monitor;
+ void *monitor;
DEBUG_P("XF86VidModeGetMonitor");
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 92d0f6d..b16cb5d 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -261,7 +261,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num)
sure that I appreciate that. */
ScreenPriv = malloc(sizeof(XF86XVScreenRec));
- pxvs->devPriv.ptr = (pointer) ScreenPriv;
+ pxvs->devPriv.ptr = (void *) ScreenPriv;
if (!ScreenPriv)
return FALSE;
@@ -551,7 +551,7 @@ xf86XVInitAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr * infoPtr, int number)
adaptorPriv->PutImage = adaptorPtr->PutImage;
adaptorPriv->ReputImage = adaptorPtr->ReputImage; /* image/still */
- pa->devPriv.ptr = (pointer) adaptorPriv;
+ pa->devPriv.ptr = (void *) adaptorPriv;
if (!(pPort = calloc(adaptorPtr->nPorts, sizeof(XvPortRec)))) {
xf86XVFreeAdaptor(pa);
@@ -957,7 +957,7 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv)
}
static int
-xf86XVReputAllVideo(WindowPtr pWin, pointer data)
+xf86XVReputAllVideo(WindowPtr pWin, void *data)
{
XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);
@@ -1922,7 +1922,7 @@ xf86XVFillKeyHelper(ScreenPtr pScreen, CARD32 key, RegionPtr fillboxes)
}
void
-xf86XVFillKeyHelperPort(DrawablePtr pDraw, pointer data, CARD32 key,
+xf86XVFillKeyHelperPort(DrawablePtr pDraw, void *data, CARD32 key,
RegionPtr clipboxes, Bool fillEverything)
{
WindowPtr pWin = (WindowPtr) pDraw;
diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h
index f393369..8986e2e 100644
--- a/hw/xfree86/common/xf86xv.h
+++ b/hw/xfree86/common/xf86xv.h
@@ -84,47 +84,47 @@ typedef int (*PutVideoFuncPtr) (ScrnInfoPtr pScrn,
short vid_x, short vid_y, short drw_x,
short drw_y, short vid_w, short vid_h,
short drw_w, short drw_h, RegionPtr clipBoxes,
- pointer data, DrawablePtr pDraw);
+ void *data, DrawablePtr pDraw);
typedef int (*PutStillFuncPtr) (ScrnInfoPtr pScrn, short vid_x, short vid_y,
short drw_x, short drw_y, short vid_w,
short vid_h, short drw_w, short drw_h,
- RegionPtr clipBoxes, pointer data,
+ RegionPtr clipBoxes, void *data,
DrawablePtr pDraw);
typedef int (*GetVideoFuncPtr) (ScrnInfoPtr pScrn, short vid_x, short vid_y,
short drw_x, short drw_y, short vid_w,
short vid_h, short drw_w, short drw_h,
- RegionPtr clipBoxes, pointer data,
+ RegionPtr clipBoxes, void *data,
DrawablePtr pDraw);
typedef int (*GetStillFuncPtr) (ScrnInfoPtr pScrn, short vid_x, short vid_y,
short drw_x, short drw_y, short vid_w,
short vid_h, short drw_w, short drw_h,
- RegionPtr clipBoxes, pointer data,
+ RegionPtr clipBoxes, void *data,
DrawablePtr pDraw);
-typedef void (*StopVideoFuncPtr) (ScrnInfoPtr pScrn, pointer data, Bool Exit);
+typedef void (*StopVideoFuncPtr) (ScrnInfoPtr pScrn, void *data, Bool Exit);
typedef int (*SetPortAttributeFuncPtr) (ScrnInfoPtr pScrn, Atom attribute,
- INT32 value, pointer data);
+ INT32 value, void *data);
typedef int (*GetPortAttributeFuncPtr) (ScrnInfoPtr pScrn, Atom attribute,
- INT32 *value, pointer data);
+ INT32 *value, void *data);
typedef void (*QueryBestSizeFuncPtr) (ScrnInfoPtr pScrn, Bool motion,
short vid_w, short vid_h, short drw_w,
short drw_h, unsigned int *p_w,
- unsigned int *p_h, pointer data);
+ unsigned int *p_h, void *data);
typedef int (*PutImageFuncPtr) (ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x, short drw_y, short src_w,
short src_h, short drw_w, short drw_h,
int image, unsigned char *buf, short width,
short height, Bool Sync, RegionPtr clipBoxes,
- pointer data, DrawablePtr pDraw);
+ void *data, DrawablePtr pDraw);
typedef int (*ReputImageFuncPtr) (ScrnInfoPtr pScrn, short src_x, short src_y,
short drw_x, short drw_y, short src_w,
short src_h, short drw_w, short drw_h,
- RegionPtr clipBoxes, pointer data,
+ RegionPtr clipBoxes, void *data,
DrawablePtr pDraw);
typedef int (*QueryImageAttributesFuncPtr) (ScrnInfoPtr pScrn, int image,
unsigned short *width,
unsigned short *height,
int *pitches, int *offsets);
-typedef void (*ClipNotifyFuncPtr) (ScrnInfoPtr pScrn, pointer data,
+typedef void (*ClipNotifyFuncPtr) (ScrnInfoPtr pScrn, void *data,
WindowPtr window, int dx, int dy);
typedef enum {
@@ -238,7 +238,7 @@ xf86XVFillKeyHelperDrawable(DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);
extern _X_EXPORT void
-xf86XVFillKeyHelperPort(DrawablePtr pDraw, pointer data, CARD32 key,
+xf86XVFillKeyHelperPort(DrawablePtr pDraw, void *data, CARD32 key,
RegionPtr clipboxes, Bool fillEverything);
extern _X_EXPORT Bool
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 133a2a6..bf7d182 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -68,8 +68,8 @@ static XF86ModuleVersionInfo VersRec = {
_X_EXPORT XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL };
-static pointer
-glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+static void *
+glxSetup(void *module, void *opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;
__GLXprovider *provider;
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index bfa3e36..38bfc1d 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1052,7 +1052,7 @@ DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
}
/* track this in case the client dies before cleanup */
- AddResource(context, DRIContextPrivResType, (pointer) pDRIContextPriv);
+ AddResource(context, DRIContextPrivResType, (void *) pDRIContextPriv);
return TRUE;
}
@@ -1067,7 +1067,7 @@ DRIDestroyContext(ScreenPtr pScreen, XID context)
/* DRIContextPrivDelete is called by the resource manager. */
Bool
-DRIContextPrivDelete(pointer pResource, XID id)
+DRIContextPrivDelete(void *pResource, XID id)
{
DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr) pResource;
DRIScreenPrivPtr pDRIPriv;
@@ -1150,7 +1150,7 @@ DRITransitionTo2d(ScreenPtr pScreen)
}
static int
-DRIDCNTreeTraversal(WindowPtr pWin, pointer data)
+DRIDCNTreeTraversal(WindowPtr pWin, void *data)
{
DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
@@ -1189,7 +1189,7 @@ DRIDriverClipNotify(ScreenPtr pScreen)
if (pDRIPriv->nrWindows > 0) {
pDRIPriv->nrWalked = 0;
TraverseTree(pScreen->root, DRIDCNTreeTraversal,
- (pointer) pDRIWindows);
+ (void *) pDRIWindows);
}
pDRIInfo->ClipNotify(pScreen, pDRIWindows, pDRIPriv->nrWindows);
@@ -1284,7 +1284,7 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
/* track this in case the client dies */
AddResource(FakeClientID(client->index), DRIDrawablePrivResType,
- (pointer) (intptr_t) pDrawable->id);
+ (void *) (intptr_t) pDrawable->id);
if (pDRIDrawablePriv->hwDrawable) {
drmUpdateDrawableInfo(pDRIPriv->drmFD,
@@ -1337,7 +1337,7 @@ DRIDrawablePrivDestroy(WindowPtr pWin)
}
static Bool
-DRIDestroyDrawableCB(pointer value, XID id, pointer data)
+DRIDestroyDrawableCB(void *value, XID id, void *data)
{
if (value == data) {
/* This calls back DRIDrawablePrivDelete which frees private area */
@@ -1355,7 +1355,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
if (pDrawable->type == DRAWABLE_WINDOW) {
LookupClientResourceComplex(client, DRIDrawablePrivResType,
DRIDestroyDrawableCB,
- (pointer) (intptr_t) pDrawable->id);
+ (void *) (intptr_t) pDrawable->id);
}
else { /* pixmap (or for GLX 1.3, a PBuffer) */
/* NOT_DONE */
@@ -1366,7 +1366,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
}
Bool
-DRIDrawablePrivDelete(pointer pResource, XID id)
+DRIDrawablePrivDelete(void *pResource, XID id)
{
WindowPtr pWin;
int rc;
@@ -1625,7 +1625,7 @@ DRIDestroyInfoRec(DRIInfoPtr DRIInfo)
}
void
-DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
+DRIWakeupHandler(void *wakeupData, int result, void *pReadmask)
{
int i;
@@ -1640,7 +1640,7 @@ DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
}
void
-DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+DRIBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadmask)
{
int i;
@@ -1656,7 +1656,7 @@ DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
void
DRIDoWakeupHandler(ScreenPtr pScreen,
- unsigned long result, pointer pReadmask)
+ unsigned long result, void *pReadmask)
{
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1674,7 +1674,7 @@ DRIDoWakeupHandler(ScreenPtr pScreen,
void
DRIDoBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadmask)
+ void *pTimeout, void *pReadmask)
{
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -1877,7 +1877,7 @@ DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
}
static int
-DRITreeTraversal(WindowPtr pWin, pointer data)
+DRITreeTraversal(WindowPtr pWin, void *data)
{
DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
@@ -1937,7 +1937,7 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
RegionNull(®);
pDRIPriv->nrWalked = 0;
- TraverseTree(pWin, DRITreeTraversal, (pointer) (®));
+ TraverseTree(pWin, DRITreeTraversal, (void *) (®));
if (RegionNotEmpty(®)) {
RegionTranslate(®, ptOldOrg.x - pWin->drawable.x,
diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h
index 4bfaf16..64cd7c9 100644
--- a/hw/xfree86/dri/dri.h
+++ b/hw/xfree86/dri/dri.h
@@ -151,7 +151,7 @@ typedef struct {
int ddxDriverMajorVersion;
int ddxDriverMinorVersion;
int ddxDriverPatchVersion;
- pointer frameBufferPhysicalAddress;
+ void *frameBufferPhysicalAddress;
long frameBufferSize;
long frameBufferStride;
long SAREASize;
@@ -224,7 +224,7 @@ extern _X_EXPORT Bool DRICreateContext(ScreenPtr pScreen,
extern _X_EXPORT Bool DRIDestroyContext(ScreenPtr pScreen, XID context);
-extern _X_EXPORT Bool DRIContextPrivDelete(pointer pResource, XID id);
+extern _X_EXPORT Bool DRIContextPrivDelete(void *pResource, XID id);
extern _X_EXPORT Bool DRICreateDrawable(ScreenPtr pScreen,
ClientPtr client,
@@ -235,7 +235,7 @@ extern _X_EXPORT Bool DRIDestroyDrawable(ScreenPtr pScreen,
ClientPtr client,
DrawablePtr pDrawable);
-extern _X_EXPORT Bool DRIDrawablePrivDelete(pointer pResource, XID id);
+extern _X_EXPORT Bool DRIDrawablePrivDelete(void *pResource, XID id);
extern _X_EXPORT Bool DRIGetDrawableInfo(ScreenPtr pScreen,
DrawablePtr pDrawable,
@@ -265,18 +265,18 @@ extern _X_EXPORT void DRIDestroyInfoRec(DRIInfoPtr DRIInfo);
extern _X_EXPORT Bool DRIFinishScreenInit(ScreenPtr pScreen);
-extern _X_EXPORT void DRIWakeupHandler(pointer wakeupData,
- int result, pointer pReadmask);
+extern _X_EXPORT void DRIWakeupHandler(void *wakeupData,
+ int result, void *pReadmask);
-extern _X_EXPORT void DRIBlockHandler(pointer blockData,
- OSTimePtr pTimeout, pointer pReadmask);
+extern _X_EXPORT void DRIBlockHandler(void *blockData,
+ OSTimePtr pTimeout, void *pReadmask);
extern _X_EXPORT void DRIDoWakeupHandler(ScreenPtr pScreen,
unsigned long result,
- pointer pReadmask);
+ void *pReadmask);
extern _X_EXPORT void DRIDoBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadmask);
+ void *pTimeout, void *pReadmask);
extern _X_EXPORT void DRISwapContext(int drmFD, void *oldctx, void *newctx);
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 34cc02f..729a323 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -354,7 +354,7 @@ DRI2CreateDrawable(ClientPtr client, DrawablePtr pDraw, XID id,
}
static int
-DRI2DrawableGone(pointer p, XID id)
+DRI2DrawableGone(void *p, XID id)
{
DRI2DrawablePtr pPriv = p;
DRI2DrawableRefPtr ref, next;
@@ -754,7 +754,7 @@ static inline PixmapPtr GetDrawablePixmap(DrawablePtr drawable)
* pixmap
*/
static int
-DRI2InvalidateWalk(WindowPtr pWin, pointer data)
+DRI2InvalidateWalk(WindowPtr pWin, void *data)
{
if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
return WT_DONTWALKCHILDREN;
diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c
index 2eb27ba..ebd1454 100644
--- a/hw/xfree86/i2c/fi1236.c
+++ b/hw/xfree86/i2c/fi1236.c
@@ -545,7 +545,7 @@ FI1236_set_tuner_type(FI1236Ptr f, int type)
}
static CARD32
-AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data)
+AFC_TimerCallback(OsTimerPtr timer, CARD32 time, void *data)
{
FI1236Ptr f = (FI1236Ptr) data;
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 41e348c..abbd36f 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -87,8 +87,8 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
if (!xf86Int10ExecSetup(pInt))
goto error0;
pInt->mem = &genericMem;
- pInt->private = (pointer) xnfcalloc(1, sizeof(genericInt10Priv));
- INTPriv(pInt)->alloc = (pointer) xnfcalloc(1, ALLOC_ENTRIES(getpagesize()));
+ pInt->private = (void *) xnfcalloc(1, sizeof(genericInt10Priv));
+ INTPriv(pInt)->alloc = (void *) xnfcalloc(1, ALLOC_ENTRIES(getpagesize()));
pInt->pScrn = pScrn;
base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS);
@@ -343,10 +343,10 @@ xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
: *(uint8_t*) V_ADDR(addr)
#define V_ADDR_RW(addr) \
(VRAM(addr)) ? MMIO_IN16((uint16_t*)VRAM_BASE,VRAM_ADDR(addr)) \
- : ldw_u((pointer)V_ADDR(addr))
+ : ldw_u((void *)V_ADDR(addr))
#define V_ADDR_RL(addr) \
(VRAM(addr)) ? MMIO_IN32((uint32_t*)VRAM_BASE,VRAM_ADDR(addr)) \
- : ldl_u((pointer)V_ADDR(addr))
+ : ldl_u((void *)V_ADDR(addr))
#define V_ADDR_WB(addr,val) \
if(VRAM(addr)) \
@@ -357,13 +357,13 @@ xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
if(VRAM(addr)) \
MMIO_OUT16((uint16_t*)VRAM_BASE,VRAM_ADDR(addr),val); \
else \
- stw_u((val),(pointer)(V_ADDR(addr)));
+ stw_u((val),(void *)(V_ADDR(addr)));
#define V_ADDR_WL(addr,val) \
if (VRAM(addr)) \
MMIO_OUT32((uint32_t*)VRAM_BASE,VRAM_ADDR(addr),val); \
else \
- stl_u(val,(pointer)(V_ADDR(addr)));
+ stl_u(val,(void *)(V_ADDR(addr)));
static uint8_t
read_b(xf86Int10InfoPtr pInt, int addr)
@@ -425,7 +425,7 @@ write_l(xf86Int10InfoPtr pInt, int addr, uint32_t val)
V_ADDR_WB(addr + 3, val >> 24);
}
-pointer
+void *
xf86int10Addr(xf86Int10InfoPtr pInt, uint32_t addr)
{
return V_ADDR(addr);
diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 160c5ae..1b5960e 100644
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@@ -199,7 +199,7 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
OptionInfoPtr options = NULL;
if (pEnt->device) {
- pointer configOptions = NULL;
+ void *configOptions = NULL;
/* Check if xf86CollectOptions() has already been called */
if (((pEnt->index < 0) ||
diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c
index 8fd0790..40e0ba7 100644
--- a/hw/xfree86/int10/stub.c
+++ b/hw/xfree86/int10/stub.c
@@ -62,7 +62,7 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt)
return;
}
-pointer
+void *
xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
{
return 0;
diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h
index 94040c5..83bab7e 100644
--- a/hw/xfree86/int10/xf86int10.h
+++ b/hw/xfree86/int10/xf86int10.h
@@ -24,10 +24,10 @@ typedef struct {
uint16_t BIOSseg;
uint16_t inb40time;
ScrnInfoPtr pScrn;
- pointer cpuRegs;
+ void *cpuRegs;
char *BIOSScratch;
int Flags;
- pointer private;
+ void *private;
struct _int10Mem *mem;
int num;
int ax;
@@ -69,7 +69,7 @@ extern _X_EXPORT void *xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num,
int *off);
extern _X_EXPORT void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase,
int num);
-extern _X_EXPORT pointer xf86int10Addr(xf86Int10InfoPtr pInt, uint32_t addr);
+extern _X_EXPORT void *xf86int10Addr(xf86Int10InfoPtr pInt, uint32_t addr);
/* x86 executor related functions */
extern _X_EXPORT void xf86ExecX86int10(xf86Int10InfoPtr pInt);
diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h
index 8b4b53f..cfc4d80 100644
--- a/hw/xfree86/loader/loaderProcs.h
+++ b/hw/xfree86/loader/loaderProcs.h
@@ -72,10 +72,10 @@ typedef struct module_desc {
void LoaderInit(void);
-ModuleDescPtr LoadDriver(const char *, const char *, int, pointer, int *,
+ModuleDescPtr LoadDriver(const char *, const char *, int, void *, int *,
int *);
ModuleDescPtr LoadModule(const char *, const char *, const char **,
- const char **, pointer, const XF86ModReqInfo *,
+ const char **, void *, const XF86ModReqInfo *,
int *, int *);
ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
void UnloadDriver(ModuleDescPtr);
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index d70ba28..092bf57 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -81,7 +81,7 @@ static void UnloadModuleOrDriver(ModuleDescPtr mod);
static char *LoaderGetCanonicalName(const char *, PatternPtr);
static void RemoveChild(ModuleDescPtr);
static ModuleDescPtr doLoadModule(const char *, const char *, const char **,
- const char **, pointer,
+ const char **, void *,
const XF86ModReqInfo *, int *, int *);
const ModuleVersions LoaderVersionInfo = {
@@ -761,10 +761,10 @@ AddSibling(ModuleDescPtr head, ModuleDescPtr new)
return new;
}
-pointer
-LoadSubModule(pointer _parent, const char *module,
+void *
+LoadSubModule(void *_parent, const char *module,
const char **subdirlist, const char **patternlist,
- pointer options, const XF86ModReqInfo * modreq,
+ void *options, const XF86ModReqInfo * modreq,
int *errmaj, int *errmin)
{
ModuleDescPtr submod;
@@ -843,7 +843,7 @@ static const char *compiled_in_modules[] = {
static ModuleDescPtr
doLoadModule(const char *module, const char *path, const char **subdirlist,
- const char **patternlist, pointer options,
+ const char **patternlist, void *options,
const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
{
XF86ModuleData *initdata = NULL;
@@ -1071,7 +1071,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
*/
ModuleDescPtr
LoadModule(const char *module, const char *path, const char **subdirlist,
- const char **patternlist, pointer options,
+ const char **patternlist, void *options,
const XF86ModReqInfo * modreq, int *errmaj, int *errmin)
{
return doLoadModule(module, path, subdirlist, patternlist, options,
@@ -1079,7 +1079,7 @@ LoadModule(const char *module, const char *path, const char **subdirlist,
}
void
-UnloadModule(pointer mod)
+UnloadModule(void *mod)
{
UnloadModuleOrDriver((ModuleDescPtr) mod);
}
@@ -1115,7 +1115,7 @@ UnloadModuleOrDriver(ModuleDescPtr mod)
}
void
-UnloadSubModule(pointer _mod)
+UnloadSubModule(void *_mod)
{
ModuleDescPtr mod = (ModuleDescPtr) _mod;
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 2c9c31b..0ddd840 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -229,7 +229,7 @@ xf86RotateRedisplay(ScreenPtr pScreen)
static void
xf86RotateBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadmask)
+ void *pTimeout, void *pReadmask)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index 91f9fc8..95bd059 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -189,10 +189,10 @@ static int devMemFd = -1;
#define DEV_APERTURE "/dev/xf86"
#endif
-static pointer mapVidMem(int, unsigned long, unsigned long, int);
-static void unmapVidMem(int, pointer, unsigned long);
-static pointer mapVidMemSparse(int, unsigned long, unsigned long, int);
-static void unmapVidMemSparse(int, pointer, unsigned long);
+static void *mapVidMem(int, unsigned long, unsigned long, int);
+static void unmapVidMem(int, void *, unsigned long);
+static void *mapVidMemSparse(int, unsigned long, unsigned long, int);
+static void unmapVidMemSparse(int, void *, unsigned long);
/*
* Check if /dev/mem can be mmap'd. If it can't print a warning when
@@ -203,7 +203,7 @@ checkDevMem(Bool warn)
{
static Bool devMemChecked = FALSE;
int fd;
- pointer base;
+ void *base;
if (devMemChecked)
return;
@@ -295,10 +295,10 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->initialised = TRUE;
}
-static pointer
+static void *
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{
- pointer base;
+ void *base;
checkDevMem(FALSE);
Base = Base & ((1L << 32) - 1);
@@ -336,7 +336,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
}
static void
-unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
munmap((caddr_t) Base, Size);
}
@@ -424,40 +424,40 @@ xf86DisableIO()
#define vuip volatile unsigned int *
-static pointer memSBase = 0;
-static pointer memBase = 0;
+static void *memSBase = 0;
+static void *memBase = 0;
-extern int readDense8(pointer Base, register unsigned long Offset);
-extern int readDense16(pointer Base, register unsigned long Offset);
-extern int readDense32(pointer Base, register unsigned long Offset);
+extern int readDense8(void *Base, register unsigned long Offset);
+extern int readDense16(void *Base, register unsigned long Offset);
+extern int readDense32(void *Base, register unsigned long Offset);
extern void
- writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB8(int Value, void *Base, register unsigned long Offset);
extern void
- writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB16(int Value, void *Base, register unsigned long Offset);
extern void
- writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB32(int Value, void *Base, register unsigned long Offset);
extern void
- writeDense8(int Value, pointer Base, register unsigned long Offset);
+ writeDense8(int Value, void *Base, register unsigned long Offset);
extern void
- writeDense16(int Value, pointer Base, register unsigned long Offset);
+ writeDense16(int Value, void *Base, register unsigned long Offset);
extern void
- writeDense32(int Value, pointer Base, register unsigned long Offset);
+ writeDense32(int Value, void *Base, register unsigned long Offset);
-static int readSparse8(pointer Base, register unsigned long Offset);
-static int readSparse16(pointer Base, register unsigned long Offset);
-static int readSparse32(pointer Base, register unsigned long Offset);
+static int readSparse8(void *Base, register unsigned long Offset);
+static int readSparse16(void *Base, register unsigned long Offset);
+static int readSparse32(void *Base, register unsigned long Offset);
static void
- writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB8(int Value, void *Base, register unsigned long Offset);
static void
- writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB16(int Value, void *Base, register unsigned long Offset);
static void
- writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB32(int Value, void *Base, register unsigned long Offset);
static void
- writeSparse8(int Value, pointer Base, register unsigned long Offset);
+ writeSparse8(int Value, void *Base, register unsigned long Offset);
static void
- writeSparse16(int Value, pointer Base, register unsigned long Offset);
+ writeSparse16(int Value, void *Base, register unsigned long Offset);
static void
- writeSparse32(int Value, pointer Base, register unsigned long Offset);
+ writeSparse32(int Value, void *Base, register unsigned long Offset);
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
extern int sysarch(int, void *);
@@ -481,7 +481,7 @@ sethae(u_int64_t hae)
}
#endif
-static pointer
+static void *
mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size,
int flags)
{
@@ -514,16 +514,16 @@ mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size,
strerror(errno));
}
}
- return (pointer) ((unsigned long) memBase + Base);
+ return (void *) ((unsigned long) memBase + Base);
}
static void
-unmapVidMemSparse(int ScreenNum, pointer Base, unsigned long Size)
+unmapVidMemSparse(int ScreenNum, void *Base, unsigned long Size)
{
}
static int
-readSparse8(pointer Base, register unsigned long Offset)
+readSparse8(void *Base, register unsigned long Offset)
{
register unsigned long result, shift;
register unsigned long msb;
@@ -544,7 +544,7 @@ readSparse8(pointer Base, register unsigned long Offset)
}
static int
-readSparse16(pointer Base, register unsigned long Offset)
+readSparse16(void *Base, register unsigned long Offset)
{
register unsigned long result, shift;
register unsigned long msb;
@@ -566,14 +566,14 @@ readSparse16(pointer Base, register unsigned long Offset)
}
static int
-readSparse32(pointer Base, register unsigned long Offset)
+readSparse32(void *Base, register unsigned long Offset)
{
mem_barrier();
return *(vuip) ((unsigned long) Base + (Offset));
}
static void
-writeSparse8(int Value, pointer Base, register unsigned long Offset)
+writeSparse8(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int b = Value & 0xffU;
@@ -591,7 +591,7 @@ writeSparse8(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparse16(int Value, pointer Base, register unsigned long Offset)
+writeSparse16(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int w = Value & 0xffffU;
@@ -611,7 +611,7 @@ writeSparse16(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparse32(int Value, pointer Base, register unsigned long Offset)
+writeSparse32(int Value, void *Base, register unsigned long Offset)
{
write_mem_barrier();
*(vuip) ((unsigned long) Base + (Offset)) = Value;
@@ -619,7 +619,7 @@ writeSparse32(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
+writeSparseNB8(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int b = Value & 0xffU;
@@ -636,7 +636,7 @@ writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
+writeSparseNB16(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int w = Value & 0xffffU;
@@ -654,27 +654,27 @@ writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparseNB32(int Value, pointer Base, register unsigned long Offset)
+writeSparseNB32(int Value, void *Base, register unsigned long Offset)
{
*(vuip) ((unsigned long) Base + (Offset)) = Value;
return;
}
-void (*xf86WriteMmio8) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
= writeDense8;
-void (*xf86WriteMmio16) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
= writeDense16;
-void (*xf86WriteMmio32) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
= writeDense32;
-void (*xf86WriteMmioNB8) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmioNB8) (int Value, void *Base, unsigned long Offset)
= writeDenseNB8;
-void (*xf86WriteMmioNB16) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmioNB16) (int Value, void *Base, unsigned long Offset)
= writeDenseNB16;
-void (*xf86WriteMmioNB32) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmioNB32) (int Value, void *Base, unsigned long Offset)
= writeDenseNB32;
-int (*xf86ReadMmio8) (pointer Base, unsigned long Offset)
+int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
= readDense8;
-int (*xf86ReadMmio16) (pointer Base, unsigned long Offset)
+int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
= readDense16;
-int (*xf86ReadMmio32) (pointer Base, unsigned long Offset)
+int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
= readDense32;
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 71064af..6a977c2 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -71,12 +71,12 @@
struct memAccess {
int ioctl;
struct map_info memInfo;
- pointer regionVirtBase;
+ void *regionVirtBase;
Bool Checked;
Bool OK;
};
-static pointer xf86MapInfoMap();
+static void *xf86MapInfoMap();
static void xf86MapInfoUnmap();
static struct memAccess *checkMapInfo();
extern int vgaPhysLinearBase;
@@ -111,8 +111,8 @@ struct memAccess ioMemInfo = { CONSOLE_GET_IO_INFO, NULL, NULL,
static Bool useDevMem = FALSE;
static int devMemFd = -1;
-static pointer mapVidMem(int, unsigned long, unsigned long, int);
-static void unmapVidMem(int, pointer, unsigned long);
+static void *mapVidMem(int, unsigned long, unsigned long, int);
+static void unmapVidMem(int, void *, unsigned long);
/*
* Check if /dev/mem can be mmap'd. If it can't print a warning when
@@ -123,7 +123,7 @@ checkDevMem(Bool warn)
{
static Bool devMemChecked = FALSE;
int fd;
- pointer base;
+ void *base;
if (devMemChecked)
return;
@@ -170,10 +170,10 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->initialised = TRUE;
}
-static pointer
+static void *
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{
- pointer base;
+ void *base;
checkDevMem(FALSE);
@@ -210,7 +210,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
}
static void
-unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
munmap((caddr_t) Base, Size);
}
@@ -310,8 +310,8 @@ checkMapInfo(Bool warn, int Region)
}
}
-static pointer
-xf86MapInfoMap(struct memAccess *memInfoP, pointer Base, unsigned long Size)
+static void *
+xf86MapInfoMap(struct memAccess *memInfoP, void *Base, unsigned long Size)
{
struct map_info *mapInfoP = &(memInfoP->memInfo);
@@ -335,7 +335,7 @@ xf86MapInfoMap(struct memAccess *memInfoP, pointer Base, unsigned long Size)
MAP_SHARED,
xf86Info.consoleFd,
(unsigned long) mapInfoP->u.map_info_mmap.map_offset))
- == (pointer) -1) {
+ == (void *) -1) {
FatalError
("xf86MapInfoMap: Failed to map memory at 0x%x\n\t%s\n",
mapInfoP->u.map_info_mmap.map_offset, strerror(errno));
@@ -351,7 +351,7 @@ xf86MapInfoMap(struct memAccess *memInfoP, pointer Base, unsigned long Size)
break;
}
- return (pointer) ((int) memInfoP->regionVirtBase + (int) Base);
+ return (void *) ((int) memInfoP->regionVirtBase + (int) Base);
}
static void
@@ -374,7 +374,7 @@ xf86MapInfoUnmap(struct memAccess *memInfoP, unsigned long Size)
}
}
-static pointer
+static void *
armMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{
struct memAccess *memInfoP;
@@ -404,7 +404,7 @@ armMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
}
static void
-armUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+armUnmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
struct memAccess *memInfoP;
@@ -450,17 +450,17 @@ Bool
xf86EnableIO()
{
int fd;
- pointer base;
+ void *base;
if (ExtendedEnabled)
return TRUE;
if ((fd = open("/dev/ttyC0", O_RDWR)) >= 0) {
/* Try to map a page at the pccons I/O space */
- base = (pointer) mmap((caddr_t) 0, 65536, PROT_READ | PROT_WRITE,
- MAP_FLAGS, fd, (off_t) 0x0000);
+ base = (void *) mmap((caddr_t) 0, 65536, PROT_READ | PROT_WRITE,
+ MAP_FLAGS, fd, (off_t) 0x0000);
- if (base != (pointer) -1) {
+ if (base != (void *) -1) {
IOPortBase = base;
}
else {
@@ -509,7 +509,7 @@ int ScreenNum;
{
int i;
int fd;
- pointer base;
+ void *base;
#ifdef __arm32__
struct memAccess *memInfoP;
@@ -524,10 +524,10 @@ int ScreenNum;
#ifdef USE_ARC_MMAP
if ((fd = open("/dev/ttyC0", O_RDWR)) >= 0) {
/* Try to map a page at the pccons I/O space */
- base = (pointer) mmap((caddr_t) 0, 65536, PROT_READ | PROT_WRITE,
- MAP_FLAGS, fd, (off_t) 0x0000);
+ base = (void *) mmap((caddr_t) 0, 65536, PROT_READ | PROT_WRITE,
+ MAP_FLAGS, fd, (off_t) 0x0000);
- if (base != (pointer) -1) {
+ if (base != (void *) -1) {
IOPortBase = base;
}
else {
@@ -563,10 +563,10 @@ int ScreenNum;
checkDevMem(TRUE);
if (devMemFd >= 0 && useDevMem) {
- base = (pointer) mmap((caddr_t) 0, 0x400, PROT_READ | PROT_WRITE,
+ base = (void *) mmap((caddr_t) 0, 0x400, PROT_READ | PROT_WRITE,
MAP_FLAGS, devMemFd, (off_t) DEV_MEM_IOBASE);
- if (base != (pointer) -1)
+ if (base != (void *) -1)
IOPortBase = (unsigned int) base;
}
diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
index b1938cf..1b92962 100644
--- a/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -14,7 +14,7 @@
#define APM_DEVICE "/dev/apm"
-static pointer APMihPtr = NULL;
+static void *APMihPtr = NULL;
static void bsdCloseAPM(void);
static struct {
diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c
index 645377e..320bb23 100644
--- a/hw/xfree86/os-support/bsd/bsd_ev56.c
+++ b/hw/xfree86/os-support/bsd/bsd_ev56.c
@@ -22,77 +22,77 @@
*/
__asm(".arch ev56");
-int readDense8(pointer Base, register unsigned long Offset);
-int readDense16(pointer Base, register unsigned long Offset);
-int readDense32(pointer Base, register unsigned long Offset);
+int readDense8(void *Base, register unsigned long Offset);
+int readDense16(void *Base, register unsigned long Offset);
+int readDense32(void *Base, register unsigned long Offset);
void
- writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB8(int Value, void *Base, register unsigned long Offset);
void
- writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB16(int Value, void *Base, register unsigned long Offset);
void
- writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB32(int Value, void *Base, register unsigned long Offset);
void
- writeDense8(int Value, pointer Base, register unsigned long Offset);
+ writeDense8(int Value, void *Base, register unsigned long Offset);
void
- writeDense16(int Value, pointer Base, register unsigned long Offset);
+ writeDense16(int Value, void *Base, register unsigned long Offset);
void
- writeDense32(int Value, pointer Base, register unsigned long Offset);
+ writeDense32(int Value, void *Base, register unsigned long Offset);
int
-readDense8(pointer Base, register unsigned long Offset)
+readDense8(void *Base, register unsigned long Offset)
{
mem_barrier();
- return (alpha_ldbu((pointer) ((unsigned long) Base + (Offset))));
+ return (alpha_ldbu((void *) ((unsigned long) Base + (Offset))));
}
int
-readDense16(pointer Base, register unsigned long Offset)
+readDense16(void *Base, register unsigned long Offset)
{
mem_barrier();
- return (alpha_ldwu((pointer) ((unsigned long) Base + (Offset))));
+ return (alpha_ldwu((void *) ((unsigned long) Base + (Offset))));
}
int
-readDense32(pointer Base, register unsigned long Offset)
+readDense32(void *Base, register unsigned long Offset)
{
mem_barrier();
return *(volatile CARD32 *) ((unsigned long) Base + (Offset));
}
void
-writeDenseNB8(int Value, pointer Base, register unsigned long Offset)
+writeDenseNB8(int Value, void *Base, register unsigned long Offset)
{
- alpha_stb((pointer) ((unsigned long) Base + (Offset)), Value);
+ alpha_stb((void *) ((unsigned long) Base + (Offset)), Value);
}
void
-writeDenseNB16(int Value, pointer Base, register unsigned long Offset)
+writeDenseNB16(int Value, void *Base, register unsigned long Offset)
{
- alpha_stw((pointer) ((unsigned long) Base + (Offset)), Value);
+ alpha_stw((void *) ((unsigned long) Base + (Offset)), Value);
}
void
-writeDenseNB32(int Value, pointer Base, register unsigned long Offset)
+writeDenseNB32(int Value, void *Base, register unsigned long Offset)
{
*(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value;
}
void
-writeDense8(int Value, pointer Base, register unsigned long Offset)
+writeDense8(int Value, void *Base, register unsigned long Offset)
{
write_mem_barrier();
- alpha_stb((pointer) ((unsigned long) Base + (Offset)), Value);
+ alpha_stb((void *) ((unsigned long) Base + (Offset)), Value);
}
void
-writeDense16(int Value, pointer Base, register unsigned long Offset)
+writeDense16(int Value, void *Base, register unsigned long Offset)
{
write_mem_barrier();
- alpha_stw((pointer) ((unsigned long) Base + (Offset)), Value);
+ alpha_stw((void *) ((unsigned long) Base + (Offset)), Value);
}
void
-writeDense32(int Value, pointer Base, register unsigned long Offset)
+writeDense32(int Value, void *Base, register unsigned long Offset)
{
write_mem_barrier();
*(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value;
diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
index 2294385..32ea489 100644
--- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
@@ -45,7 +45,7 @@
#define _PATH_APM_DEV "/dev/apm"
#define _PATH_APM_CTLDEV "/dev/apmctl"
-static pointer APMihPtr = NULL;
+static void *APMihPtr = NULL;
static int devFd = -1;
static int ctlFd = -1;
static void bsdCloseAPM(void);
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 569a4ec..7453190 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -85,18 +85,18 @@ static int devMemFd = -1;
#define DEV_APERTURE "/dev/xf86"
#endif
-static pointer mapVidMem(int, unsigned long, unsigned long, int);
-static void unmapVidMem(int, pointer, unsigned long);
+static void *mapVidMem(int, unsigned long, unsigned long, int);
+static void unmapVidMem(int, void *, unsigned long);
#ifdef HAS_MTRR_SUPPORT
-static pointer setWC(int, unsigned long, unsigned long, Bool, MessageType);
-static void undoWC(int, pointer);
+static void *setWC(int, unsigned long, unsigned long, Bool, MessageType);
+static void undoWC(int, void *);
static Bool cleanMTRR(void);
#endif
#if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-static pointer NetBSDsetWC(int, unsigned long, unsigned long, Bool,
+static void *NetBSDsetWC(int, unsigned long, unsigned long, Bool,
MessageType);
-static void NetBSDundoWC(int, pointer);
+static void NetBSDundoWC(int, void *);
#endif
/*
@@ -108,7 +108,7 @@ checkDevMem(Bool warn)
{
static Bool devMemChecked = FALSE;
int fd;
- pointer base;
+ void *base;
if (devMemChecked)
return;
@@ -210,10 +210,10 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->initialised = TRUE;
}
-static pointer
+static void *
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{
- pointer base;
+ void *base;
checkDevMem(FALSE);
@@ -250,7 +250,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
}
static void
-unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
munmap((caddr_t) Base, Size);
}
@@ -690,7 +690,7 @@ fullCoverage(unsigned long base, unsigned long size, RangePtr overlap)
return FALSE;
}
-static pointer
+static void *
addWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
{
RangePtr uc = NULL, wc = NULL, retlist = NULL;
@@ -731,7 +731,7 @@ addWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
}
}
-static pointer
+static void *
delWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
{
RangePtr uc = NULL, wc = NULL, retlist = NULL;
@@ -776,7 +776,7 @@ delWC(int screenNum, unsigned long base, unsigned long size, MessageType from)
}
}
-static pointer
+static void *
setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
MessageType from)
{
@@ -787,7 +787,7 @@ setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
}
static void
-undoWC(int screenNum, pointer list)
+undoWC(int screenNum, void *list)
{
RangePtr rp;
struct mem_range_op mro;
@@ -835,7 +835,7 @@ undoWC(int screenNum, pointer list)
#endif /* HAS_MTRR_SUPPORT */
#if defined(HAS_MTRR_BUILTIN) && defined(__NetBSD__)
-static pointer
+static void *
NetBSDsetWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
MessageType from)
{
@@ -871,7 +871,7 @@ NetBSDsetWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
}
static void
-NetBSDundoWC(int screenNum, pointer list)
+NetBSDundoWC(int screenNum, void *list)
{
struct mtrr *mtrrp = (struct mtrr *) list;
int n;
diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c
index 417adbf..947a686 100644
--- a/hw/xfree86/os-support/bsd/ppc_video.c
+++ b/hw/xfree86/os-support/bsd/ppc_video.c
@@ -44,8 +44,8 @@
#define DEV_MEM "/dev/xf86"
#endif
-static pointer ppcMapVidMem(int, unsigned long, unsigned long, int flags);
-static void ppcUnmapVidMem(int, pointer, unsigned long);
+static void *ppcMapVidMem(int, unsigned long, unsigned long, int flags);
+static void ppcUnmapVidMem(int, void *, unsigned long);
Bool xf86EnableIO(void);
void xf86DisableIO(void);
@@ -62,11 +62,11 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
volatile unsigned char *ioBase = MAP_FAILED;
-static pointer
+static void *
ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{
int fd = xf86Info.consoleFd;
- pointer base;
+ void *base;
#ifdef DEBUG
xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
@@ -83,7 +83,7 @@ ppcMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
}
static void
-ppcUnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+ppcUnmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
munmap(Base, Size);
}
diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c
index 21c1661..02951d6 100644
--- a/hw/xfree86/os-support/bsd/sparc64_video.c
+++ b/hw/xfree86/os-support/bsd/sparc64_video.c
@@ -38,8 +38,8 @@
/* Video Memory Mapping section */
/***************************************************************************/
-static pointer sparc64MapVidMem(int, unsigned long, unsigned long, int);
-static void sparc64UnmapVidMem(int, pointer, unsigned long);
+static void *sparc64MapVidMem(int, unsigned long, unsigned long, int);
+static void sparc64UnmapVidMem(int, void *, unsigned long);
void
xf86OSInitVidMem(VidMemInfoPtr pVidMem)
@@ -50,12 +50,12 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
pVidMem->initialised = TRUE;
}
-static pointer
+static void *
sparc64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size,
int flags)
{
int fd = xf86Info.consoleFd;
- pointer base;
+ void *base;
#ifdef DEBUG
xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", Base, Size, fd);
@@ -71,7 +71,7 @@ sparc64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size,
}
static void
-sparc64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+sparc64UnmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
munmap(Base, Size);
}
diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index 14e6d4b..16ce5b5 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -641,10 +641,10 @@ sparcPromPathname2Node(const char *pathName)
return i;
}
-pointer
+void *
xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
{
- pointer ret;
+ void *ret;
unsigned long pagemask = getpagesize() - 1;
unsigned long off = offset & ~pagemask;
unsigned long len = ((offset + size + pagemask) & ~pagemask) - off;
@@ -657,26 +657,26 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
else if (psdp->fd < 0)
return NULL;
- ret = (pointer) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+ ret = (void *) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE,
psdp->fd, off);
- if (ret == (pointer) -1) {
- ret = (pointer) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
+ if (ret == (void *) -1) {
+ ret = (void *) mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED,
psdp->fd, off);
}
- if (ret == (pointer) -1)
+ if (ret == (void *) -1)
return NULL;
return (char *) ret + (offset - off);
}
void
-xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
+xf86UnmapSbusMem(sbusDevicePtr psdp, void *addr, unsigned long size)
{
unsigned long mask = getpagesize() - 1;
unsigned long base = (unsigned long) addr & ~mask;
unsigned long len = (((unsigned long) addr + size + mask) & ~mask) - base;
- munmap((pointer) base, len);
+ munmap((void *) base, len);
}
/* Tell OS that we are driving the HW cursor ourselves. */
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index b3b94c9..dc1a8e6 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -42,7 +42,7 @@
/**************************************************************************
* Video Memory Mapping section
***************************************************************************/
-static pointer
+static void *
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
{
mach_port_t device, mem_dev;
@@ -89,11 +89,11 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
("xf86MapVidMem() can't mach_port_deallocate.(mem_dev) (%s)\n",
strerror(errno));
}
- return (pointer) addr;
+ return (void *) addr;
}
static void
-unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
kern_return_t err = vm_deallocate(mach_task_self(), (int) Base, Size);
diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c
index 8bca375..6181eb9 100644
--- a/hw/xfree86/os-support/linux/int10/linux.c
+++ b/hw/xfree86/os-support/linux/int10/linux.c
@@ -18,7 +18,7 @@
#define DEV_MEM "/dev/mem"
#endif
#define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
-#define SHMERRORPTR (pointer)(-1)
+#define SHMERRORPTR (void *)(-1)
#include <fcntl.h>
#include <errno.h>
@@ -153,9 +153,9 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
goto error0;
pInt->mem = &linuxMem;
pagesize = getpagesize();
- pInt->private = (pointer) xnfcalloc(1, sizeof(linuxInt10Priv));
+ pInt->private = (void *) xnfcalloc(1, sizeof(linuxInt10Priv));
((linuxInt10Priv *) pInt->private)->alloc =
- (pointer) xnfcalloc(1, ALLOC_ENTRIES(pagesize));
+ (void *) xnfcalloc(1, ALLOC_ENTRIES(pagesize));
if (!xf86IsEntityPrimary(entityIndex)) {
DebugF("Mapping high memory area\n");
@@ -233,10 +233,10 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
* 64K bytes at a time.
*/
if (!videoBiosMapped) {
- memset((pointer) V_BIOS, 0, SYS_BIOS - V_BIOS);
+ memset((void *) V_BIOS, 0, SYS_BIOS - V_BIOS);
DebugF("Reading BIOS\n");
for (cs = V_BIOS; cs < SYS_BIOS; cs += V_BIOS_SIZE)
- if (xf86ReadBIOS(cs, 0, (pointer) cs, V_BIOS_SIZE) < V_BIOS_SIZE)
+ if (xf86ReadBIOS(cs, 0, (void *) cs, V_BIOS_SIZE) < V_BIOS_SIZE)
xf86DrvMsg(screen, X_WARNING,
"Unable to retrieve all of segment 0x%06lX.\n",
(long) cs);
@@ -319,7 +319,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
Bool
MapCurrentInt10(xf86Int10InfoPtr pInt)
{
- pointer addr;
+ void *addr;
int fd = -1;
if (Int10Current) {
@@ -327,7 +327,7 @@ MapCurrentInt10(xf86Int10InfoPtr pInt)
if (((linuxInt10Priv *) Int10Current->private)->highMem >= 0)
shmdt((char *) HIGH_MEM);
else
- munmap((pointer) V_BIOS, (SYS_BIOS - V_BIOS));
+ munmap((void *) V_BIOS, (SYS_BIOS - V_BIOS));
}
addr =
shmat(((linuxInt10Priv *) pInt->private)->lowMem, (char *) 1, SHM_RND);
@@ -392,7 +392,7 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
if (((linuxInt10Priv *) pInt->private)->highMem >= 0)
shmdt((char *) HIGH_MEM);
else
- munmap((pointer) V_BIOS, (SYS_BIOS - V_BIOS));
+ munmap((void *) V_BIOS, (SYS_BIOS - V_BIOS));
Int10Current = NULL;
}
@@ -486,22 +486,22 @@ write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
*((CARD32 *) (memType) addr) = val;
}
-pointer
+void *
xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
{
if (addr < V_RAM)
return ((linuxInt10Priv *) pInt->private)->base + addr;
else if (addr < V_BIOS)
- return (pointer) (memType) addr;
+ return (void *) (memType) addr;
else if (addr < SYS_BIOS) {
if (((linuxInt10Priv *) pInt->private)->base_high)
- return (pointer) (((linuxInt10Priv *) pInt->private)->base_high
+ return (void *) (((linuxInt10Priv *) pInt->private)->base_high
- V_BIOS + addr);
else
- return (pointer) (memType) addr;
+ return (void *) (memType) addr;
}
else
- return (pointer) (memType) addr;
+ return (void *) (memType) addr;
}
#if defined DoSubModules
diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c
index 4e5f7f9..dbd5afe 100644
--- a/hw/xfree86/os-support/linux/lnx_acpi.c
+++ b/hw/xfree86/os-support/linux/lnx_acpi.c
@@ -33,14 +33,14 @@
#define ACPI_VIDEO_HEAD_END (~0u)
static void lnxCloseACPI(void);
-static pointer ACPIihPtr = NULL;
+static void *ACPIihPtr = NULL;
PMClose lnxACPIOpen(void);
/* in milliseconds */
#define ACPI_REOPEN_DELAY 1000
static CARD32
-lnxACPIReopen(OsTimerPtr timer, CARD32 time, pointer arg)
+lnxACPIReopen(OsTimerPtr timer, CARD32 time, void *arg)
{
if (lnxACPIOpen()) {
TimerFree(timer);
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index 3879340..6216919 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -36,7 +36,7 @@ extern PMClose lnxACPIOpen(void);
static PMClose lnxAPMOpen(void);
static void lnxCloseAPM(void);
-static pointer APMihPtr = NULL;
+static void *APMihPtr = NULL;
static struct {
apm_event_t apmLinux;
diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c
index 4995070..b695000 100644
--- a/hw/xfree86/os-support/linux/lnx_ev56.c
+++ b/hw/xfree86/os-support/linux/lnx_ev56.c
@@ -6,77 +6,77 @@
#include "xf86.h"
#include "compiler.h"
-int readDense8(pointer Base, register unsigned long Offset);
-int readDense16(pointer Base, register unsigned long Offset);
-int readDense32(pointer Base, register unsigned long Offset);
+int readDense8(void *Base, register unsigned long Offset);
+int readDense16(void *Base, register unsigned long Offset);
+int readDense32(void *Base, register unsigned long Offset);
void
- writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB8(int Value, void *Base, register unsigned long Offset);
void
- writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB16(int Value, void *Base, register unsigned long Offset);
void
- writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB32(int Value, void *Base, register unsigned long Offset);
void
- writeDense8(int Value, pointer Base, register unsigned long Offset);
+ writeDense8(int Value, void *Base, register unsigned long Offset);
void
- writeDense16(int Value, pointer Base, register unsigned long Offset);
+ writeDense16(int Value, void *Base, register unsigned long Offset);
void
- writeDense32(int Value, pointer Base, register unsigned long Offset);
+ writeDense32(int Value, void *Base, register unsigned long Offset);
int
-readDense8(pointer Base, register unsigned long Offset)
+readDense8(void *Base, register unsigned long Offset)
{
mem_barrier();
return *(volatile CARD8 *) ((unsigned long) Base + (Offset));
}
int
-readDense16(pointer Base, register unsigned long Offset)
+readDense16(void *Base, register unsigned long Offset)
{
mem_barrier();
return *(volatile CARD16 *) ((unsigned long) Base + (Offset));
}
int
-readDense32(pointer Base, register unsigned long Offset)
+readDense32(void *Base, register unsigned long Offset)
{
mem_barrier();
return *(volatile CARD32 *) ((unsigned long) Base + (Offset));
}
void
-writeDenseNB8(int Value, pointer Base, register unsigned long Offset)
+writeDenseNB8(int Value, void *Base, register unsigned long Offset)
{
*(volatile CARD8 *) ((unsigned long) Base + (Offset)) = Value;
}
void
-writeDenseNB16(int Value, pointer Base, register unsigned long Offset)
+writeDenseNB16(int Value, void *Base, register unsigned long Offset)
{
*(volatile CARD16 *) ((unsigned long) Base + (Offset)) = Value;
}
void
-writeDenseNB32(int Value, pointer Base, register unsigned long Offset)
+writeDenseNB32(int Value, void *Base, register unsigned long Offset)
{
*(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value;
}
void
-writeDense8(int Value, pointer Base, register unsigned long Offset)
+writeDense8(int Value, void *Base, register unsigned long Offset)
{
write_mem_barrier();
*(volatile CARD8 *) ((unsigned long) Base + (Offset)) = Value;
}
void
-writeDense16(int Value, pointer Base, register unsigned long Offset)
+writeDense16(int Value, void *Base, register unsigned long Offset)
{
write_mem_barrier();
*(volatile CARD16 *) ((unsigned long) Base + (Offset)) = Value;
}
void
-writeDense32(int Value, pointer Base, register unsigned long Offset)
+writeDense32(int Value, void *Base, register unsigned long Offset)
{
write_mem_barrier();
*(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value;
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 43d0a36..824003d 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -80,17 +80,17 @@ extern int iopl(int __level);
/* Video Memory Mapping section */
/***************************************************************************/
-static pointer mapVidMem(int, unsigned long, unsigned long, int);
-static void unmapVidMem(int, pointer, unsigned long);
+static void *mapVidMem(int, unsigned long, unsigned long, int);
+static void unmapVidMem(int, void *, unsigned long);
#if defined (__alpha__)
extern void sethae(unsigned long hae);
extern unsigned long _bus_base __P((void)) __attribute__ ((const));
extern unsigned long _bus_base_sparse __P((void)) __attribute__ ((const));
-static pointer mapVidMemSparse(int, unsigned long, unsigned long, int);
+static void *mapVidMemSparse(int, unsigned long, unsigned long, int);
extern axpDevice lnxGetAXP(void);
-static void unmapVidMemSparse(int, pointer, unsigned long);
+static void unmapVidMemSparse(int, void *, unsigned long);
static axpDevice axpSystem = -1;
static Bool needSparse;
static unsigned long hae_thresh;
@@ -102,8 +102,8 @@ static unsigned long bus_base;
#define SPLIT_WC_REGIONS 1
-static pointer setWC(int, unsigned long, unsigned long, Bool, MessageType);
-static void undoWC(int, pointer);
+static void *setWC(int, unsigned long, unsigned long, Bool, MessageType);
+static void undoWC(int, void *);
/* The file desc for /proc/mtrr. Once opened, left opened, and the mtrr
driver will clean up when we exit. */
@@ -339,7 +339,7 @@ mtrr_undo_wc_region(int screenNum, struct mtrr_wc_region *wcr)
}
}
-static pointer
+static void *
setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
MessageType from)
{
@@ -350,7 +350,7 @@ setWC(int screenNum, unsigned long base, unsigned long size, Bool enable,
}
static void
-undoWC(int screenNum, pointer regioninfo)
+undoWC(int screenNum, void *regioninfo)
{
mtrr_undo_wc_region(screenNum, regioninfo);
}
@@ -396,16 +396,16 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
/* Basically, you simply cannot do this on Sparc. You have to do something portable
* like use /dev/fb* or mmap() on /proc/bus/pci/X/Y nodes. -DaveM
*/
-static pointer
+static void *
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{
return NULL;
}
#else
-static pointer
+static void *
mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
{
- pointer base;
+ void *base;
int fd;
int mapflags = MAP_SHARED;
int prot;
@@ -460,7 +460,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
#endif /* !(__sparc__) */
static void
-unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+unmapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
uintptr_t alignOff = (uintptr_t) Base
- ((uintptr_t) Base & ~(getpagesize() - 1));
@@ -565,44 +565,44 @@ xf86DisableIO(void)
#define vuip volatile unsigned int *
-extern int readDense8(pointer Base, register unsigned long Offset);
-extern int readDense16(pointer Base, register unsigned long Offset);
-extern int readDense32(pointer Base, register unsigned long Offset);
+extern int readDense8(void *Base, register unsigned long Offset);
+extern int readDense16(void *Base, register unsigned long Offset);
+extern int readDense32(void *Base, register unsigned long Offset);
extern void
- writeDenseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB8(int Value, void *Base, register unsigned long Offset);
extern void
- writeDenseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB16(int Value, void *Base, register unsigned long Offset);
extern void
- writeDenseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeDenseNB32(int Value, void *Base, register unsigned long Offset);
extern void
- writeDense8(int Value, pointer Base, register unsigned long Offset);
+ writeDense8(int Value, void *Base, register unsigned long Offset);
extern void
- writeDense16(int Value, pointer Base, register unsigned long Offset);
+ writeDense16(int Value, void *Base, register unsigned long Offset);
extern void
- writeDense32(int Value, pointer Base, register unsigned long Offset);
+ writeDense32(int Value, void *Base, register unsigned long Offset);
-static int readSparse8(pointer Base, register unsigned long Offset);
-static int readSparse16(pointer Base, register unsigned long Offset);
-static int readSparse32(pointer Base, register unsigned long Offset);
+static int readSparse8(void *Base, register unsigned long Offset);
+static int readSparse16(void *Base, register unsigned long Offset);
+static int readSparse32(void *Base, register unsigned long Offset);
static void
- writeSparseNB8(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB8(int Value, void *Base, register unsigned long Offset);
static void
- writeSparseNB16(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB16(int Value, void *Base, register unsigned long Offset);
static void
- writeSparseNB32(int Value, pointer Base, register unsigned long Offset);
+ writeSparseNB32(int Value, void *Base, register unsigned long Offset);
static void
- writeSparse8(int Value, pointer Base, register unsigned long Offset);
+ writeSparse8(int Value, void *Base, register unsigned long Offset);
static void
- writeSparse16(int Value, pointer Base, register unsigned long Offset);
+ writeSparse16(int Value, void *Base, register unsigned long Offset);
static void
- writeSparse32(int Value, pointer Base, register unsigned long Offset);
+ writeSparse32(int Value, void *Base, register unsigned long Offset);
#define DENSE_BASE 0x2ff00000000UL
#define SPARSE_BASE 0x30000000000UL
static unsigned long msb_set = 0;
-static pointer
+static void *
mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size,
int flags)
{
@@ -689,11 +689,11 @@ mapVidMemSparse(int ScreenNum, unsigned long Base, unsigned long Size,
" to DENSE only at 0x%lx\n", Base, Size, ret);
#endif
- return (pointer) ret;
+ return (void *) ret;
}
static void
-unmapVidMemSparse(int ScreenNum, pointer Base, unsigned long Size)
+unmapVidMemSparse(int ScreenNum, void *Base, unsigned long Size)
{
unsigned long Offset = (unsigned long) Base - DENSE_BASE;
@@ -709,7 +709,7 @@ unmapVidMemSparse(int ScreenNum, pointer Base, unsigned long Size)
}
static int
-readSparse8(pointer Base, register unsigned long Offset)
+readSparse8(void *Base, register unsigned long Offset)
{
register unsigned long result, shift;
register unsigned long msb;
@@ -733,7 +733,7 @@ readSparse8(pointer Base, register unsigned long Offset)
}
static int
-readSparse16(pointer Base, register unsigned long Offset)
+readSparse16(void *Base, register unsigned long Offset)
{
register unsigned long result, shift;
register unsigned long msb;
@@ -757,7 +757,7 @@ readSparse16(pointer Base, register unsigned long Offset)
}
static int
-readSparse32(pointer Base, register unsigned long Offset)
+readSparse32(void *Base, register unsigned long Offset)
{
/* NOTE: this is really using DENSE. */
mem_barrier();
@@ -765,7 +765,7 @@ readSparse32(pointer Base, register unsigned long Offset)
}
static void
-writeSparse8(int Value, pointer Base, register unsigned long Offset)
+writeSparse8(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int b = Value & 0xffU;
@@ -786,7 +786,7 @@ writeSparse8(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparse16(int Value, pointer Base, register unsigned long Offset)
+writeSparse16(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int w = Value & 0xffffU;
@@ -807,7 +807,7 @@ writeSparse16(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparse32(int Value, pointer Base, register unsigned long Offset)
+writeSparse32(int Value, void *Base, register unsigned long Offset)
{
/* NOTE: this is really using DENSE. */
write_mem_barrier();
@@ -816,7 +816,7 @@ writeSparse32(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
+writeSparseNB8(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int b = Value & 0xffU;
@@ -834,7 +834,7 @@ writeSparseNB8(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
+writeSparseNB16(int Value, void *Base, register unsigned long Offset)
{
register unsigned long msb;
register unsigned int w = Value & 0xffffU;
@@ -852,30 +852,30 @@ writeSparseNB16(int Value, pointer Base, register unsigned long Offset)
}
static void
-writeSparseNB32(int Value, pointer Base, register unsigned long Offset)
+writeSparseNB32(int Value, void *Base, register unsigned long Offset)
{
/* NOTE: this is really using DENSE. */
*(vuip) ((unsigned long) Base + (Offset)) = Value;
return;
}
-void (*xf86WriteMmio8) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
= writeDense8;
-void (*xf86WriteMmio16) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset)
= writeDense16;
-void (*xf86WriteMmio32) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset)
= writeDense32;
-void (*xf86WriteMmioNB8) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmioNB8) (int Value, void *Base, unsigned long Offset)
= writeDenseNB8;
-void (*xf86WriteMmioNB16) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmioNB16) (int Value, void *Base, unsigned long Offset)
= writeDenseNB16;
-void (*xf86WriteMmioNB32) (int Value, pointer Base, unsigned long Offset)
+void (*xf86WriteMmioNB32) (int Value, void *Base, unsigned long Offset)
= writeDenseNB32;
-int (*xf86ReadMmio8) (pointer Base, unsigned long Offset)
+int (*xf86ReadMmio8) (void *Base, unsigned long Offset)
= readDense8;
-int (*xf86ReadMmio16) (pointer Base, unsigned long Offset)
+int (*xf86ReadMmio16) (void *Base, unsigned long Offset)
= readDense16;
-int (*xf86ReadMmio32) (pointer Base, unsigned long Offset)
+int (*xf86ReadMmio32) (void *Base, unsigned long Offset)
= readDense32;
#endif /* __alpha__ */
diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c
index 68ed30e..f473293 100644
--- a/hw/xfree86/os-support/shared/vidmem.c
+++ b/hw/xfree86/os-support/shared/vidmem.c
@@ -51,8 +51,8 @@
typedef struct {
unsigned long size;
- pointer virtBase;
- pointer mtrrInfo;
+ void *virtBase;
+ void *mtrrInfo;
} MappingRec, *MappingPtr;
typedef struct {
@@ -104,7 +104,7 @@ newMapping(VidMapPtr vp)
}
static MappingPtr
-findMapping(VidMapPtr vp, pointer vbase, unsigned long size)
+findMapping(VidMapPtr vp, void *vbase, unsigned long size)
{
int i;
@@ -165,10 +165,10 @@ xf86InitVidMem(void)
}
}
-pointer
+void *
xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
{
- pointer vbase = NULL;
+ void *vbase = NULL;
VidMapPtr vp;
MappingPtr mp;
@@ -182,7 +182,7 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
vbase = vidMemInfo.mapMem(ScreenNum, Base, Size, Flags);
- if (!vbase || vbase == (pointer) -1)
+ if (!vbase || vbase == (void *) -1)
return NULL;
vp = getVidMapRec(ScreenNum);
@@ -208,7 +208,7 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
}
void
-xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+xf86UnMapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
VidMapPtr vp;
MappingPtr mp;
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index b6a1432..38fa5ec 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -90,7 +90,7 @@ typedef struct apm_event_info {
#define APM_DEVICE "/dev/srn"
#define APM_DEVICE1 "/dev/apm"
-static pointer APMihPtr = NULL;
+static void *APMihPtr = NULL;
static void sunCloseAPM(void);
static struct {
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index 68527a5..16fc1b7 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -316,7 +316,7 @@ xf86CloseConsole(void)
" attributes (%s)\n", strerror(errno));
}
else {
- pointer fbdata;
+ void *fbdata;
fbdata = mmap(NULL, fbattr.fbtype.fb_size,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c
index 67ef176..fc46487 100644
--- a/hw/xfree86/os-support/solaris/sun_vid.c
+++ b/hw/xfree86/os-support/solaris/sun_vid.c
@@ -107,10 +107,10 @@ solOpenAperture(void)
return TRUE;
}
-static pointer
+static void *
solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
{
- pointer base;
+ void *base;
int fd;
int prot;
@@ -144,7 +144,7 @@ solMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
/* ARGSUSED */
static void
-solUnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+solUnMapVidMem(int ScreenNum, void *Base, unsigned long Size)
{
if (munmap(Base, Size) != 0) {
xf86DrvMsgVerb(ScreenNum, X_WARNING, 0,
diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h
index bd734f5..7f003e8 100644
--- a/hw/xfree86/os-support/xf86OSpriv.h
+++ b/hw/xfree86/os-support/xf86OSpriv.h
@@ -32,12 +32,12 @@
#ifndef _XF86OSPRIV_H
#define _XF86OSPRIV_H
-typedef pointer (*MapMemProcPtr) (int, unsigned long, unsigned long, int);
-typedef void (*UnmapMemProcPtr) (int, pointer, unsigned long);
-typedef pointer (*SetWCProcPtr) (int, unsigned long, unsigned long, Bool,
+typedef void *(*MapMemProcPtr) (int, unsigned long, unsigned long, int);
+typedef void (*UnmapMemProcPtr) (int, void *, unsigned long);
+typedef void *(*SetWCProcPtr) (int, unsigned long, unsigned long, Bool,
MessageType);
-typedef void (*ProtectMemProcPtr) (int, pointer, unsigned long, Bool);
-typedef void (*UndoWCProcPtr) (int, pointer);
+typedef void (*ProtectMemProcPtr) (int, void *, unsigned long, Bool);
+typedef void (*UndoWCProcPtr) (int, void *);
typedef struct {
Bool initialised;
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 106168a..8d27e8b 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -132,9 +132,9 @@ _XFUNCPROTOBEGIN
/* public functions */
extern _X_EXPORT Bool xf86LinearVidMem(void);
extern _X_EXPORT _X_DEPRECATED Bool xf86CheckMTRR(int);
-extern _X_EXPORT _X_DEPRECATED pointer xf86MapVidMem(int, int, unsigned long,
+extern _X_EXPORT _X_DEPRECATED void *xf86MapVidMem(int, int, unsigned long,
unsigned long);
-extern _X_EXPORT _X_DEPRECATED void xf86UnMapVidMem(int, pointer,
+extern _X_EXPORT _X_DEPRECATED void xf86UnMapVidMem(int, void *,
unsigned long);
extern _X_EXPORT int xf86ReadBIOS(unsigned long, unsigned long, unsigned char *,
int);
diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
index 04be141..a5d2aab 100644
--- a/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -34,7 +34,7 @@ typedef struct {
int ForceHWCursorCount;
Bool HWCursorForced;
- pointer transparentData;
+ void *transparentData;
} xf86CursorScreenRec, *xf86CursorScreenPtr;
void xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y);
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index 197abff..3b69698 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -462,9 +462,9 @@ RealizeCursorInterleave16(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
}
/* 16 bit interleave */
- DstS = (pointer) mem2;
+ DstS = (void *) mem2;
DstM = DstS + (size >> 2);
- pntr = (pointer) mem;
+ pntr = (void *) mem;
count = (size >> 1);
while (count) {
*pntr++ = *DstS++;
@@ -497,9 +497,9 @@ RealizeCursorInterleave32(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
}
/* 32 bit interleave */
- DstS = (pointer) mem2;
+ DstS = (void *) mem2;
DstM = DstS + (size >> 3);
- pntr = (pointer) mem;
+ pntr = (void *) mem;
count = (size >> 2);
while (count) {
*pntr++ = *DstS++;
@@ -532,9 +532,9 @@ RealizeCursorInterleave64(xf86CursorInfoPtr infoPtr, CursorPtr pCurs)
}
/* 64 bit interleave */
- DstS = (pointer) mem2;
+ DstS = (void *) mem2;
DstM = DstS + (size >> 3);
- pntr = (pointer) mem;
+ pntr = (void *) mem;
count = (size >> 2);
while (count) {
*pntr++ = *DstS++;
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index 6c66ffe..4352939 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -243,7 +243,7 @@ ShadowCloseScreen(ScreenPtr pScreen)
ps->Composite = pPriv->Composite;
}
- free((pointer) pPriv);
+ free((void *) pPriv);
return (*pScreen->CloseScreen) (pScreen);
}
@@ -342,7 +342,7 @@ static void ShadowValidateGC(GCPtr, unsigned long, DrawablePtr);
static void ShadowChangeGC(GCPtr, unsigned long);
static void ShadowCopyGC(GCPtr, unsigned long, GCPtr);
static void ShadowDestroyGC(GCPtr);
-static void ShadowChangeClip(GCPtr, int, pointer, int);
+static void ShadowChangeClip(GCPtr, int, void *, int);
static void ShadowDestroyClip(GCPtr);
static void ShadowCopyClip(GCPtr, GCPtr);
@@ -409,7 +409,7 @@ ShadowCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
}
static void
-ShadowChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+ShadowChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
SHADOW_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
@@ -1477,7 +1477,7 @@ ShadowImageGlyphBlt(DrawablePtr pDraw,
GCPtr pGC,
int x, int y,
unsigned int nglyphInit,
- CharInfoPtr * ppciInit, pointer pglyphBase)
+ CharInfoPtr * ppciInit, void *pglyphBase)
{
BoxRec box;
Bool boxNotEmpty = FALSE;
@@ -1538,7 +1538,7 @@ ShadowPolyGlyphBlt(DrawablePtr pDraw,
GCPtr pGC,
int x, int y,
unsigned int nglyphInit,
- CharInfoPtr * ppciInit, pointer pglyphBase)
+ CharInfoPtr * ppciInit, void *pglyphBase)
{
BoxRec box;
Bool boxNotEmpty = FALSE;
diff --git a/hw/xfree86/utils/cvt/cvt.c b/hw/xfree86/utils/cvt/cvt.c
index 5e2888e..d5df17f 100644
--- a/hw/xfree86/utils/cvt/cvt.c
+++ b/hw/xfree86/utils/cvt/cvt.c
@@ -39,10 +39,10 @@ FatalError(const char *f, ...)
}
/* xnfalloc implementation used by the server code we built in */
-pointer
+void *
XNFalloc(unsigned long n)
{
- pointer r;
+ void *r;
r = malloc(n);
if (!r) {
@@ -53,10 +53,10 @@ XNFalloc(unsigned long n)
}
/* xnfcalloc implementation used by the server code we built in */
-pointer
+void *
XNFcalloc(unsigned long n)
{
- pointer r;
+ void *r;
r = calloc(1, n);
if (!r) {
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 39f0cef..d41e61b 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -50,7 +50,7 @@ vbeInfoPtr
VBEExtendedInit(xf86Int10InfoPtr pInt, int entityIndex, int Flags)
{
int RealOff;
- pointer page = NULL;
+ void *page = NULL;
ScrnInfoPtr pScrn = xf86FindScreenForEntity(entityIndex);
vbeControllerInfoPtr vbe = NULL;
Bool init_int10 = FALSE;
@@ -259,7 +259,7 @@ static unsigned char *
vbeReadEDID(vbeInfoPtr pVbe)
{
int RealOff = pVbe->real_mode_base;
- pointer page = pVbe->memory;
+ void *page = pVbe->memory;
unsigned char *tmp = NULL;
Bool novbe = FALSE;
Bool noddc = FALSE;
@@ -319,7 +319,7 @@ vbeReadEDID(vbeInfoPtr pVbe)
}
xf86MonPtr
-vbeDoEDID(vbeInfoPtr pVbe, pointer unused)
+vbeDoEDID(vbeInfoPtr pVbe, void *unused)
{
unsigned char *DDC_data = NULL;
@@ -545,7 +545,7 @@ VBEFreeModeInfo(VbeModeInfoBlock * block)
Bool
VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function,
- pointer *memory, int *size, int *real_mode_pages)
+ void **memory, int *size, int *real_mode_pages)
{
/*
Input:
@@ -929,7 +929,7 @@ VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr,
memcpy(vbe_sr->state, vbe_sr->pstate, vbe_sr->stateSize);
ErrorF("VBESaveRestore\n");
if ((VBESaveRestore(pVbe, function,
- (pointer) &vbe_sr->state,
+ (void *) &vbe_sr->state,
&vbe_sr->stateSize, &vbe_sr->statePage))) {
if (function == MODE_SAVE) {
SaveSucc = TRUE;
@@ -1055,7 +1055,7 @@ struct vbePanelID *
VBEReadPanelID(vbeInfoPtr pVbe)
{
int RealOff = pVbe->real_mode_base;
- pointer page = pVbe->memory;
+ void *page = pVbe->memory;
void *tmp = NULL;
int screen = pVbe->pInt10->pScrn->scrnIndex;
diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h
index 3907c53..bc36533 100644
--- a/hw/xfree86/vbe/vbe.h
+++ b/hw/xfree86/vbe/vbe.h
@@ -25,7 +25,7 @@ typedef enum {
typedef struct {
xf86Int10InfoPtr pInt10;
int version;
- pointer memory;
+ void *memory;
int real_mode_base;
int num_pages;
Bool init_int10;
@@ -40,7 +40,7 @@ extern _X_EXPORT vbeInfoPtr VBEInit(xf86Int10InfoPtr pInt, int entityIndex);
extern _X_EXPORT vbeInfoPtr VBEExtendedInit(xf86Int10InfoPtr pInt,
int entityIndex, int Flags);
extern _X_EXPORT void vbeFree(vbeInfoPtr pVbe);
-extern _X_EXPORT xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule);
+extern _X_EXPORT xf86MonPtr vbeDoEDID(vbeInfoPtr pVbe, void *pDDCModule);
#pragma pack(1)
@@ -227,7 +227,7 @@ typedef enum {
extern _X_EXPORT Bool
VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction fuction,
- pointer *memory, int *size, int *real_mode_pages);
+ void **memory, int *size, int *real_mode_pages);
/*
* INT 5
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c
index e7a0d02..6e028a7 100644
--- a/hw/xfree86/vgahw/vgaCmap.c
+++ b/hw/xfree86/vgahw/vgaCmap.c
@@ -252,7 +252,7 @@ ColormapPtr pmap;
if (pmap != GetInstalledmiColormap(pmap->pScreen))
return;
- dixLookupResourceByType((pointer *) &defColormap,
+ dixLookupResourceByType((void **) &defColormap,
pmap->pScreen->defColormap, RT_COLORMAP,
serverClient, DixInstallAccess);
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
index 937a8a5..63a10f4 100644
--- a/hw/xfree86/vgahw/vgaHW.h
+++ b/hw/xfree86/vgahw/vgaHW.h
@@ -107,18 +107,18 @@ typedef void (*vgaHWMiscProcPtr) (vgaHWPtr hwp);
* via the first 17 attribute registers and not the main 8-bit palette.
*/
typedef struct _vgaHWRec {
- pointer Base; /* Address of "VGA" memory */
+ void *Base; /* Address of "VGA" memory */
int MapSize; /* Size of "VGA" memory */
unsigned long MapPhys; /* phys location of VGA mem */
int IOBase; /* I/O Base address */
CARD8 *MMIOBase; /* Pointer to MMIO start */
int MMIOOffset; /* base + offset + vgareg
= mmioreg */
- pointer FontInfo1; /* save area for fonts in
+ void *FontInfo1; /* save area for fonts in
plane 2 */
- pointer FontInfo2; /* save area for fonts in
+ void *FontInfo2; /* save area for fonts in
plane 3 */
- pointer TextInfo; /* save area for text */
+ void *TextInfo; /* save area for text */
vgaRegRec SavedReg; /* saved registers */
vgaRegRec ModeReg; /* register settings for
current mode */
@@ -148,7 +148,7 @@ typedef struct _vgaHWRec {
vgaHWWriteProcPtr writeDacReadAddr;
vgaHWWriteProcPtr writeDacData;
vgaHWReadProcPtr readDacData;
- pointer ddc;
+ void *ddc;
struct pci_io_handle *io;
vgaHWReadProcPtr readEnable;
vgaHWWriteProcPtr writeEnable;
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index 7ef137d..95c3343 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -137,7 +137,7 @@ xnestDestroyColormap(ColormapPtr pCmap)
(xnestWindow(pWin) != None && wColormap(pWin) == icws->cmapIDs[i])
static int
-xnestCountInstalledColormapWindows(WindowPtr pWin, pointer ptr)
+xnestCountInstalledColormapWindows(WindowPtr pWin, void *ptr)
{
xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *) ptr;
int i;
@@ -152,7 +152,7 @@ xnestCountInstalledColormapWindows(WindowPtr pWin, pointer ptr)
}
static int
-xnestGetInstalledColormapWindows(WindowPtr pWin, pointer ptr)
+xnestGetInstalledColormapWindows(WindowPtr pWin, void *ptr)
{
xnestInstalledColormapWindows *icws = (xnestInstalledColormapWindows *) ptr;
int i;
@@ -198,12 +198,12 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen)
sizeof(Colormap));
icws.numCmapIDs = xnestListInstalledColormaps(pScreen, icws.cmapIDs);
icws.numWindows = 0;
- WalkTree(pScreen, xnestCountInstalledColormapWindows, (pointer) &icws);
+ WalkTree(pScreen, xnestCountInstalledColormapWindows, (void *) &icws);
if (icws.numWindows) {
icws.windows =
(Window *) malloc((icws.numWindows + 1) * sizeof(Window));
icws.index = 0;
- WalkTree(pScreen, xnestGetInstalledColormapWindows, (pointer) &icws);
+ WalkTree(pScreen, xnestGetInstalledColormapWindows, (void *) &icws);
icws.windows[icws.numWindows] = xnestDefaultWindows[pScreen->myNum];
numWindows = icws.numWindows + 1;
}
@@ -252,11 +252,11 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen)
visual = xnestVisualFromID(pScreen, wVisual(pWin));
if (visual == xnestDefaultVisual(pScreen))
- dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+ dixLookupResourceByType((void **) &pCmap, wColormap(pWin),
RT_COLORMAP, serverClient,
DixUseAccess);
else
- dixLookupResourceByType((pointer *) &pCmap,
+ dixLookupResourceByType((void **) &pCmap,
pScreen->defColormap, RT_COLORMAP,
serverClient, DixUseAccess);
@@ -309,7 +309,7 @@ xnestDirectInstallColormaps(ScreenPtr pScreen)
for (i = 0; i < n; i++) {
ColormapPtr pCmap;
- dixLookupResourceByType((pointer *) &pCmap, pCmapIDs[i], RT_COLORMAP,
+ dixLookupResourceByType((void **) &pCmap, pCmapIDs[i], RT_COLORMAP,
serverClient, DixInstallAccess);
if (pCmap)
XInstallColormap(xnestDisplay, xnestColormap(pCmap));
@@ -330,7 +330,7 @@ xnestDirectUninstallColormaps(ScreenPtr pScreen)
for (i = 0; i < n; i++) {
ColormapPtr pCmap;
- dixLookupResourceByType((pointer *) &pCmap, pCmapIDs[i], RT_COLORMAP,
+ dixLookupResourceByType((void **) &pCmap, pCmapIDs[i], RT_COLORMAP,
serverClient, DixUninstallAccess);
if (pCmap)
XUninstallColormap(xnestDisplay, xnestColormap(pCmap));
@@ -347,10 +347,10 @@ xnestInstallColormap(ColormapPtr pCmap)
/* Uninstall pInstalledMap. Notify all interested parties. */
if (pOldCmap != (ColormapPtr) None)
- WalkTree(pCmap->pScreen, TellLostMap, (pointer) &pOldCmap->mid);
+ WalkTree(pCmap->pScreen, TellLostMap, (void *) &pOldCmap->mid);
SetInstalledColormap(pCmap->pScreen, pCmap);
- WalkTree(pCmap->pScreen, TellGainedMap, (pointer) &pCmap->mid);
+ WalkTree(pCmap->pScreen, TellGainedMap, (void *) &pCmap->mid);
xnestSetInstalledColormapWindows(pCmap->pScreen);
xnestDirectInstallColormaps(pCmap->pScreen);
@@ -364,7 +364,7 @@ xnestUninstallColormap(ColormapPtr pCmap)
if (pCmap == pCurCmap) {
if (pCmap->mid != pCmap->pScreen->defColormap) {
- dixLookupResourceByType((pointer *) &pCurCmap,
+ dixLookupResourceByType((void **) &pCurCmap,
pCmap->pScreen->defColormap,
RT_COLORMAP,
serverClient, DixInstallAccess);
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 1e95588..ffdfd24 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -35,7 +35,7 @@ int xnestFontPrivateIndex;
Bool
xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
{
- pointer priv;
+ void *priv;
Atom name_atom, value_atom;
int nprops;
FontPropPtr props;
@@ -64,7 +64,7 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
if (!name)
return False;
- priv = (pointer) malloc(sizeof(xnestPrivFont));
+ priv = (void *) malloc(sizeof(xnestPrivFont));
FontSetPrivate(pFont, xnestFontPrivateIndex, priv);
xnestFontPriv(pFont)->font_struct = XLoadQueryFont(xnestDisplay, name);
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index cfaf714..0ec60fc 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -188,7 +188,7 @@ xnestDestroyGC(GCPtr pGC)
}
void
-xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
+xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects)
{
int i, size;
BoxPtr pBox;
@@ -225,7 +225,7 @@ xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
* current pixmap contents.
*/
pGC->clientClip =
- (pointer) (*pGC->pScreen->BitmapToRegion) ((PixmapPtr) pValue);
+ (void *) (*pGC->pScreen->BitmapToRegion) ((PixmapPtr) pValue);
(*pGC->pScreen->DestroyPixmap) ((PixmapPtr) pValue);
pValue = pGC->clientClip;
type = CT_REGION;
@@ -269,7 +269,7 @@ xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects)
* other parts of server can only deal with CT_NONE,
* CT_PIXMAP and CT_REGION client clips.
*/
- pGC->clientClip = (pointer) RegionFromRects(nRects,
+ pGC->clientClip = (void *) RegionFromRects(nRects,
(xRectangle *) pValue,
type);
free(pValue);
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index d00511d..fa60231 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -308,7 +308,7 @@ xnestImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
void
xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr * pCharInfo,
- pointer pGlyphBase)
+ void *pGlyphBase)
{
ErrorF("xnest warning: function xnestImageGlyphBlt not implemented\n");
}
@@ -316,7 +316,7 @@ xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
void
xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr * pCharInfo,
- pointer pGlyphBase)
+ void *pGlyphBase)
{
ErrorF("xnest warning: function xnestPolyGlyphBlt not implemented\n");
}
diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h
index b1cad11..fd1f6bf 100644
--- a/hw/xnest/GCOps.h
+++ b/hw/xnest/GCOps.h
@@ -58,10 +58,10 @@ void xnestImageText16(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int count,
unsigned short *string);
void xnestImageGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr * pCharInfo,
- pointer pGlyphBase);
+ void *pGlyphBase);
void xnestPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nGlyphs, CharInfoPtr * pCharInfo,
- pointer pGlyphBase);
+ void *pGlyphBase);
void xnestPushPixels(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable,
int width, int height, int x, int y);
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index 4605b90..05d559d 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -32,14 +32,14 @@ is" without express or implied warranty.
#include "Handlers.h"
void
-xnestBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadMask)
+xnestBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadMask)
{
xnestCollectExposures();
XFlush(xnestDisplay);
}
void
-xnestWakeupHandler(pointer blockData, int result, pointer pReadMask)
+xnestWakeupHandler(void *blockData, int result, void *pReadMask)
{
xnestCollectEvents();
}
diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h
index 7160bdd..d4ad6d2 100644
--- a/hw/xnest/Handlers.h
+++ b/hw/xnest/Handlers.h
@@ -15,8 +15,8 @@ is" without express or implied warranty.
#ifndef XNESTHANDLERS_H
#define XNESTHANDLERS_H
-void xnestBlockHandler(pointer blockData, OSTimePtr pTimeout,
- pointer pReadMask);
-void xnestWakeupHandler(pointer blockData, int result, pointer pReadMask);
+void xnestBlockHandler(void *blockData, OSTimePtr pTimeout,
+ void *pReadMask);
+void xnestWakeupHandler(void *blockData, int result, void *pReadMask);
#endif /* XNESTHANDLERS_H */
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index d013dc9..2cf1624 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -59,7 +59,7 @@ extern Status XkbGetControls(Display * /* dpy */ ,
DeviceIntPtr xnestKeyboardDevice = NULL;
void
-xnestBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls)
+xnestBell(int volume, DeviceIntPtr pDev, void *ctrl, int cls)
{
XBell(xnestDisplay, volume);
}
diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h
index 45d56bc..dc5eaa2 100644
--- a/hw/xnest/Keyboard.h
+++ b/hw/xnest/Keyboard.h
@@ -20,7 +20,7 @@ is" without express or implied warranty.
extern DeviceIntPtr xnestKeyboardDevice;
-void xnestBell(int volume, DeviceIntPtr pDev, pointer ctrl, int cls);
+void xnestBell(int volume, DeviceIntPtr pDev, void *ctrl, int cls);
void xnestChangeKeyboardControl(DeviceIntPtr pDev, KeybdCtrl * ctrl);
int xnestKeyboardProc(DeviceIntPtr pDev, int onoff);
void xnestUpdateModifierState(unsigned int state);
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 2902acd..6514f3b 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -80,7 +80,7 @@ xnestDestroyPixmap(PixmapPtr pPixmap)
Bool
xnestModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
if(!xnestPixmapPriv(pPixmap)->pixmap && width > 0 && height > 0) {
xnestPixmapPriv(pPixmap)->pixmap =
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index e2b21b5..c33cbaa 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -42,7 +42,7 @@ is" without express or implied warranty.
DevPrivateKeyRec xnestWindowPrivateKeyRec;
static int
-xnestFindWindowMatch(WindowPtr pWin, pointer ptr)
+xnestFindWindowMatch(WindowPtr pWin, void *ptr)
{
xnestWindowMatch *wm = (xnestWindowMatch *) ptr;
@@ -64,7 +64,7 @@ xnestWindowPtr(Window window)
wm.window = window;
for (i = 0; i < xnestNumScreens; i++) {
- WalkTree(screenInfo.screens[i], xnestFindWindowMatch, (pointer) &wm);
+ WalkTree(screenInfo.screens[i], xnestFindWindowMatch, (void *) &wm);
if (wm.pWin)
break;
}
@@ -96,7 +96,7 @@ xnestCreateWindow(WindowPtr pWin)
xnestVisualFromID(pWin->drawable.pScreen, wVisual(pWin));
mask |= CWColormap;
if (pWin->optional->colormap) {
- dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+ dixLookupResourceByType((void **) &pCmap, wColormap(pWin),
RT_COLORMAP, serverClient,
DixUseAccess);
attributes.colormap = xnestColormap(pCmap);
@@ -109,7 +109,7 @@ xnestCreateWindow(WindowPtr pWin)
}
else { /* root windows have their own colormaps at creation time */
visual = xnestVisualFromID(pWin->drawable.pScreen, wVisual(pWin));
- dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+ dixLookupResourceByType((void **) &pCmap, wColormap(pWin),
RT_COLORMAP, serverClient, DixUseAccess);
mask |= CWColormap;
attributes.colormap = xnestColormap(pCmap);
@@ -331,7 +331,7 @@ xnestChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
if (mask & CWColormap) {
ColormapPtr pCmap;
- dixLookupResourceByType((pointer *) &pCmap, wColormap(pWin),
+ dixLookupResourceByType((void **) &pCmap, wColormap(pWin),
RT_COLORMAP, serverClient, DixUseAccess);
attributes.colormap = xnestColormap(pCmap);
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index c7c25e4..e2f10fb 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -35,7 +35,7 @@ void xnestValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
void xnestChangeGC(GCPtr pGC, unsigned long mask);
void xnestCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
void xnestDestroyGC(GCPtr pGC);
-void xnestChangeClip(GCPtr pGC, int type, pointer pValue, int nRects);
+void xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects);
void xnestDestroyClip(GCPtr pGC);
void xnestDestroyClipHelper(GCPtr pGC);
void xnestCopyClip(GCPtr pGCDst, GCPtr pGCSrc);
diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h
index 5b2e796..b7b10e9 100644
--- a/hw/xnest/XNPixmap.h
+++ b/hw/xnest/XNPixmap.h
@@ -34,7 +34,7 @@ PixmapPtr xnestCreatePixmap(ScreenPtr pScreen, int width, int height,
int depth, unsigned usage_hint);
Bool xnestDestroyPixmap(PixmapPtr pPixmap);
Bool xnestModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData);
+ int bitsPerPixel, int devKind, void *pPixData);
RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap);
#endif /* XNESTPIXMAP_H */
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index aea0a45..4409d4b 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -83,9 +83,9 @@ static XID eventResource;
static unsigned int eventMask = 0;
static int
-WMFreeClient(pointer data, XID id);
+WMFreeClient(void *data, XID id);
static int
-WMFreeEvents(pointer data, XID id);
+WMFreeEvents(void *data, XID id);
static void
SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);
@@ -175,7 +175,7 @@ updateEventMask(WMEventPtr *pHead)
/*ARGSUSED*/
static int
-WMFreeClient(pointer data, XID id)
+WMFreeClient(void *data, XID id)
{
WMEventPtr pEvent;
WMEventPtr *pHead, pCur, pPrev;
@@ -183,7 +183,7 @@ WMFreeClient(pointer data, XID id)
pEvent = (WMEventPtr)data;
i = dixLookupResourceByType(
- (pointer *)&pHead, eventResource, EventType, serverClient,
+ (void **)&pHead, eventResource, EventType, serverClient,
DixReadAccess |
DixWriteAccess | DixDestroyAccess);
if (i == Success && pHead) {
@@ -198,13 +198,13 @@ WMFreeClient(pointer data, XID id)
}
updateEventMask(pHead);
}
- free((pointer)pEvent);
+ free((void *)pEvent);
return 1;
}
/*ARGSUSED*/
static int
-WMFreeEvents(pointer data, XID id)
+WMFreeEvents(void *data, XID id)
{
WMEventPtr *pHead, pCur, pNext;
@@ -212,9 +212,9 @@ WMFreeEvents(pointer data, XID id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource(pCur->clientResource, ClientType);
- free((pointer)pCur);
+ free((void *)pCur);
}
- free((pointer)pHead);
+ free((void *)pHead);
eventMask = 0;
return 1;
}
@@ -229,7 +229,7 @@ ProcAppleWMSelectInput(register ClientPtr client)
REQUEST_SIZE_MATCH(xAppleWMSelectInputReq);
i =
- dixLookupResourceByType((pointer *)&pHead, eventResource, EventType,
+ dixLookupResourceByType((void **)&pHead, eventResource, EventType,
client,
DixWriteAccess);
if (stuff->mask != 0) {
@@ -257,7 +257,7 @@ ProcAppleWMSelectInput(register ClientPtr client)
*/
clientResource = FakeClientID(client->index);
pNewEvent->clientResource = clientResource;
- if (!AddResource(clientResource, ClientType, (pointer)pNewEvent))
+ if (!AddResource(clientResource, ClientType, (void *)pNewEvent))
return BadAlloc;
/*
* create a resource to contain a pointer to the list
@@ -268,7 +268,7 @@ ProcAppleWMSelectInput(register ClientPtr client)
if (i != Success || !pHead) {
pHead = (WMEventPtr *)malloc(sizeof(WMEventPtr));
if (!pHead ||
- !AddResource(eventResource, EventType, (pointer)pHead)) {
+ !AddResource(eventResource, EventType, (void *)pHead)) {
FreeResource(clientResource, RT_NONE);
return BadAlloc;
}
@@ -317,7 +317,7 @@ AppleWMSendEvent(int type, unsigned int mask, int which, int arg)
int i;
i =
- dixLookupResourceByType((pointer *)&pHead, eventResource, EventType,
+ dixLookupResourceByType((void **)&pHead, eventResource, EventType,
serverClient,
DixReadAccess);
if (i != Success || !pHead)
diff --git a/hw/xquartz/quartzCommon.h b/hw/xquartz/quartzCommon.h
index 813bc77..308a3f1 100644
--- a/hw/xquartz/quartzCommon.h
+++ b/hw/xquartz/quartzCommon.h
@@ -47,8 +47,8 @@ extern int aquaMenuBarHeight;
extern const char *quartzOpenGLBundle;
void
-QuartzBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask);
+QuartzBlockHandler(void *blockData, OSTimePtr pTimeout, void *pReadmask);
void
-QuartzWakeupHandler(pointer blockData, int result, pointer pReadmask);
+QuartzWakeupHandler(void *blockData, int result, void *pReadmask);
#endif /* _QUARTZCOMMON_H */
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
index adba69c..014709b 100644
--- a/hw/xquartz/xpr/dri.c
+++ b/hw/xquartz/xpr/dri.c
@@ -455,7 +455,7 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
pDRIDrawablePriv->sid), pDRIDrawablePriv);
/* track this in case this window is destroyed */
- AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
+ AddResource(id, DRIDrawablePrivResType, (void *)pDrawable);
/* Initialize shape */
DRIUpdateSurface(pDRIDrawablePriv, pDrawable);
@@ -529,7 +529,7 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
* drops to <= 0, or the window/pixmap is destroyed.
*/
Bool
-DRIDrawablePrivDelete(pointer pResource, XID id)
+DRIDrawablePrivDelete(void *pResource, XID id)
{
DrawablePtr pDrawable = (DrawablePtr)pResource;
DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
@@ -829,7 +829,7 @@ DRICreatePixmap(ScreenPtr pScreen, Drawable id,
dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, shared);
- AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
+ AddResource(id, DRIDrawablePrivResType, (void *)pDrawable);
return TRUE;
}
@@ -884,7 +884,7 @@ DRIFreePixmapImp(DrawablePtr pDrawable)
shm_unlink(shared->shmPath);
free(shared);
- dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (pointer)NULL);
+ dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (void *)NULL);
return TRUE;
}
diff --git a/hw/xquartz/xpr/dri.h b/hw/xquartz/xpr/dri.h
index 8717a51..70cb8b6 100644
--- a/hw/xquartz/xpr/dri.h
+++ b/hw/xquartz/xpr/dri.h
@@ -99,7 +99,7 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
void *data), void *notify_data);
extern Bool
-DRIDrawablePrivDelete(pointer pResource, XID id);
+DRIDrawablePrivDelete(void *pResource, XID id);
extern DRIWrappedFuncsRec *
DRIGetWrappedFuncs(ScreenPtr pScreen);
diff --git a/hw/xquartz/xpr/driWrap.c b/hw/xquartz/xpr/driWrap.c
index 5f9f3ab..42282d5 100644
--- a/hw/xquartz/xpr/driWrap.c
+++ b/hw/xquartz/xpr/driWrap.c
@@ -447,7 +447,7 @@ DRIImageText16(DrawablePtr dst, GCPtr pGC,
static void
DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyphInit,
- CharInfoPtr *ppciInit, pointer unused)
+ CharInfoPtr *ppciInit, void *unused)
{
DRISavedDrawableState saved;
@@ -465,7 +465,7 @@ DRIImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
static void
DRIPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr *ppci, pointer pglyphBase)
+ CharInfoPtr *ppci, void *pglyphBase)
{
DRISavedDrawableState saved;
diff --git a/hw/xwin/glx/indirect.c b/hw/xwin/glx/indirect.c
index 3d01bed..f130651 100644
--- a/hw/xwin/glx/indirect.c
+++ b/hw/xwin/glx/indirect.c
@@ -832,7 +832,7 @@ glxWinCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
GLWIN_TRACE_MSG("glxWinCopyWindow pWindow %p", pWindow);
- dixLookupResourceByType((pointer) &pGlxDraw, pWindow->drawable.id,
+ dixLookupResourceByType((void *) &pGlxDraw, pWindow->drawable.id,
__glXDrawableRes, NullClient, DixUnknownAccess);
/*
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index ce89348..0adb227 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -609,7 +609,7 @@ typedef struct {
#endif
typedef struct {
- pointer value;
+ void *value;
XID id;
} WindowIDPairRec, *WindowIDPairPtr;
@@ -773,7 +773,7 @@ void winSetAuthorization(void);
void
winBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadMask);
+ void *pTimeout, void *pReadMask);
#ifdef XWIN_NATIVEGDI
/*
@@ -1035,7 +1035,7 @@ winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
int iWidth, int iHeight,
int iDepth,
int iBitsPerPixel,
- int devKind, pointer pPixData);
+ int devKind, void *pPixData);
#endif
#ifdef XWIN_NATIVEGDI
@@ -1106,7 +1106,7 @@ Bool
void
winWakeupHandler(ScreenPtr pScreen,
- unsigned long ulResult, pointer pReadmask);
+ unsigned long ulResult, void *pReadmask);
/*
* winwindow.c
diff --git a/hw/xwin/winblock.c b/hw/xwin/winblock.c
index c3ef4be..07e9078 100644
--- a/hw/xwin/winblock.c
+++ b/hw/xwin/winblock.c
@@ -37,7 +37,7 @@
/* See Porting Layer Definition - p. 6 */
void
winBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadMask)
+ void *pTimeout, void *pReadMask)
{
#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
winScreenPriv(pScreen);
diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c
index 610437a..5dcc8bc 100644
--- a/hw/xwin/wincmap.c
+++ b/hw/xwin/wincmap.c
@@ -177,7 +177,7 @@ winUninstallColormap(ColormapPtr pmap)
/* Install the default cmap in place of the cmap to be uninstalled */
if (pmap->mid != pmap->pScreen->defColormap) {
- dixLookupResourceByType((pointer) &curpmap, pmap->pScreen->defColormap,
+ dixLookupResourceByType((void *) &curpmap, pmap->pScreen->defColormap,
RT_COLORMAP, NullClient, DixUnknownAccess);
(*pmap->pScreen->InstallColormap) (curpmap);
}
diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c
index 9e38113..a6d3c0a 100644
--- a/hw/xwin/winconfig.c
+++ b/hw/xwin/winconfig.c
@@ -106,7 +106,7 @@ winInfoRec g_winInfo = {
#ifdef XWIN_XF86CONFIG
serverLayoutRec g_winConfigLayout;
-static Bool ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p);
+static Bool ParseOptionValue(int scrnIndex, void *options, OptionInfoPtr p);
static Bool configLayout(serverLayoutPtr, XF86ConfLayoutPtr, char *);
static Bool configImpliedLayout(serverLayoutPtr, XF86ConfScreenPtr);
static Bool GetBoolValue(OptionInfoPtr p, const char *s);
@@ -188,7 +188,7 @@ winReadConfigfile()
/* Check if layout is given in the config file */
if (g_xf86configptr->conf_flags != NULL) {
char *dfltlayout = NULL;
- pointer optlist = g_xf86configptr->conf_flags->flg_option_lst;
+ void *optlist = g_xf86configptr->conf_flags->flg_option_lst;
if (optlist && winFindOption(optlist, "defaultserverlayout"))
dfltlayout =
@@ -588,7 +588,7 @@ winConfigScreens(void)
#ifdef XWIN_XF86CONFIG
char *
-winSetStrOption(pointer optlist, const char *name, char *deflt)
+winSetStrOption(void *optlist, const char *name, char *deflt)
{
OptionInfoRec o;
@@ -603,7 +603,7 @@ winSetStrOption(pointer optlist, const char *name, char *deflt)
}
int
-winSetBoolOption(pointer optlist, const char *name, int deflt)
+winSetBoolOption(void *optlist, const char *name, int deflt)
{
OptionInfoRec o;
@@ -615,7 +615,7 @@ winSetBoolOption(pointer optlist, const char *name, int deflt)
}
int
-winSetIntOption(pointer optlist, const char *name, int deflt)
+winSetIntOption(void *optlist, const char *name, int deflt)
{
OptionInfoRec o;
@@ -627,7 +627,7 @@ winSetIntOption(pointer optlist, const char *name, int deflt)
}
double
-winSetRealOption(pointer optlist, const char *name, double deflt)
+winSetRealOption(void *optlist, const char *name, double deflt)
{
OptionInfoRec o;
@@ -639,7 +639,7 @@ winSetRealOption(pointer optlist, const char *name, double deflt)
}
double
-winSetPercentOption(pointer optlist, const char *name, double deflt)
+winSetPercentOption(void *optlist, const char *name, double deflt)
{
OptionInfoRec o;
@@ -734,7 +734,7 @@ winFindOptionValue(XF86OptionPtr list, const char *name)
*/
static Bool
-ParseOptionValue(int scrnIndex, pointer options, OptionInfoPtr p)
+ParseOptionValue(int scrnIndex, void *options, OptionInfoPtr p)
{
char *s, *end;
diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h
index 94571ff..798c779 100644
--- a/hw/xwin/winconfig.h
+++ b/hw/xwin/winconfig.h
@@ -58,15 +58,15 @@ typedef struct {
Bool inUse;
int videoRam;
int textClockFreq;
- pointer options;
+ void *options;
int screen; /* For multi-CRTC cards */
} GDevRec, *GDevPtr;
typedef struct {
char *identifier;
char *driver;
- pointer commonOptions;
- pointer extraOptions;
+ void *commonOptions;
+ void *extraOptions;
} IDevRec, *IDevPtr;
typedef struct {
@@ -81,19 +81,19 @@ typedef struct {
rgb whiteColour;
int defaultVisual;
char **modes;
- pointer options;
+ void *options;
} DispRec, *DispPtr;
typedef struct _confxvportrec {
char *identifier;
- pointer options;
+ void *options;
} confXvPortRec, *confXvPortPtr;
typedef struct _confxvadaptrec {
char *identifier;
int numports;
confXvPortPtr ports;
- pointer options;
+ void *options;
} confXvAdaptorRec, *confXvAdaptorPtr;
typedef struct _confscreenrec {
@@ -107,7 +107,7 @@ typedef struct _confscreenrec {
DispPtr displays;
int numxvadaptors;
confXvAdaptorPtr xvadaptors;
- pointer options;
+ void *options;
} confScreenRec, *confScreenPtr;
typedef enum {
@@ -142,7 +142,7 @@ typedef struct _serverlayoutrec {
screenLayoutPtr screens;
GDevPtr inactives;
IDevPtr inputs;
- pointer options;
+ void *options;
} serverLayoutRec, *serverLayoutPtr;
/*
@@ -233,11 +233,11 @@ typedef struct {
* Function prototypes
*/
-char *winSetStrOption(pointer optlist, const char *name, char *deflt);
-int winSetBoolOption(pointer optlist, const char *name, int deflt);
-int winSetIntOption(pointer optlist, const char *name, int deflt);
-double winSetRealOption(pointer optlist, const char *name, double deflt);
-double winSetPercentOption(pointer optlist, const char *name, double deflt);
+char *winSetStrOption(void *optlist, const char *name, char *deflt);
+int winSetBoolOption(void *optlist, const char *name, int deflt);
+int winSetIntOption(void *optlist, const char *name, int deflt);
+double winSetRealOption(void *optlist, const char *name, double deflt);
+double winSetPercentOption(void *optlist, const char *name, double deflt);
#ifdef XWIN_XF86CONFIG
XF86OptionPtr winFindOption(XF86OptionPtr list, const char *name);
diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c
index 814d531..5986e0a 100644
--- a/hw/xwin/wingc.c
+++ b/hw/xwin/wingc.c
@@ -56,7 +56,7 @@ static void
#if 0
static void
- winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects);
+ winChangeClipNativeGDI(GCPtr pGC, int nType, void *pValue, int nRects);
static void
winDestroyClipNativeGDI(GCPtr pGC);
@@ -214,7 +214,7 @@ winDestroyGCNativeGDI(GCPtr pGC)
#if 0
/* See Porting Layer Definition - p. 46 */
static void
-winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects)
+winChangeClipNativeGDI(GCPtr pGC, int nType, void *pValue, int nRects)
{
}
diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c
index 9c5d4e9..b6b2086 100644
--- a/hw/xwin/winkeybd.c
+++ b/hw/xwin/winkeybd.c
@@ -51,7 +51,7 @@ static Bool g_winKeyState[NUM_KEYCODES];
*/
static void
- winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, pointer pCtrl, int iClass);
+ winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, void *pCtrl, int iClass);
static void
winKeybdCtrl(DeviceIntPtr pDevice, KeybdCtrl * pCtrl);
@@ -120,7 +120,7 @@ winTranslateKey(WPARAM wParam, LPARAM lParam)
/* Ring the keyboard bell (system speaker on PCs) */
static void
-winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, pointer pCtrl, int iClass)
+winKeybdBell(int iPercent, DeviceIntPtr pDeviceInt, void *pCtrl, int iClass)
{
/*
* We can't use Beep () here because it uses the PC speaker
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 44ad193..f2e7907 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -53,7 +53,7 @@ static void
winUpdateWindowsWindow(WindowPtr pWin);
static void
- winFindWindow(pointer value, XID id, pointer cdata);
+ winFindWindow(void *value, XID id, void *cdata);
static
void
@@ -724,7 +724,7 @@ winGetWindowID(WindowPtr pWin)
*/
static void
-winFindWindow(pointer value, XID id, pointer cdata)
+winFindWindow(void *value, XID id, void *cdata)
{
WindowIDPairPtr wi = (WindowIDPairPtr) cdata;
@@ -813,7 +813,7 @@ winMinimizeWindow(Window id)
ErrorF("winMinimizeWindow\n");
#endif
- dixLookupResourceByType((pointer) &pWin, id, RT_WINDOW, NullClient,
+ dixLookupResourceByType((void *) &pWin, id, RT_WINDOW, NullClient,
DixUnknownAccess);
if (!pWin) {
ErrorF("%s: NULL pWin. Leaving\n", __FUNCTION__);
diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c
index f870007..0106161 100644
--- a/hw/xwin/winpfbdd.c
+++ b/hw/xwin/winpfbdd.c
@@ -306,7 +306,7 @@ winCloseScreenPrimaryDD(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index d8a12d5..ef158c8 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -178,7 +178,7 @@ Bool
winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
int iWidth, int iHeight,
int iDepth,
- int iBitsPerPixel, int devKind, pointer pPixData)
+ int iBitsPerPixel, int devKind, void *pPixData)
{
FatalError("winModifyPixmapHeaderNativeGDI ()\n");
return TRUE;
diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c
index 2e70608..5f3b658 100644
--- a/hw/xwin/winshaddd.c
+++ b/hw/xwin/winshaddd.c
@@ -676,7 +676,7 @@ winCloseScreenShadowDD(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c
index 01097f2..55af5c3 100644
--- a/hw/xwin/winshadddnl.c
+++ b/hw/xwin/winshadddnl.c
@@ -703,7 +703,7 @@ winCloseScreenShadowDDNL(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
index ebc2339..2e3c64c 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -629,7 +629,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen)
pScreenInfo->pScreen = NULL;
/* Free the screen privates for this screen */
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return fReturn;
}
diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c
index 795221a..ebcb0fa 100644
--- a/hw/xwin/winwakeup.c
+++ b/hw/xwin/winwakeup.c
@@ -39,7 +39,7 @@
/* See Porting Layer Definition - p. 7 */
void
winWakeupHandler(ScreenPtr pScreen,
- unsigned long ulResult, pointer pReadmask)
+ unsigned long ulResult, void *pReadmask)
{
MSG msg;
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 029bd85..759aa5e 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -39,7 +39,7 @@
*/
static int
- winAddRgn(WindowPtr pWindow, pointer data);
+ winAddRgn(WindowPtr pWindow, void *data);
static
void
@@ -456,7 +456,7 @@ winSetShapeRootless(WindowPtr pWin, int kind)
static
int
-winAddRgn(WindowPtr pWin, pointer data)
+winAddRgn(WindowPtr pWin, void *data)
{
int iX, iY, iWidth, iHeight, iBorder;
HRGN hRgn = *(HRGN *) data;
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index be43265..c3503db 100644
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -53,8 +53,8 @@ static XID eventResource;
/* Currently selected events */
static unsigned int eventMask = 0;
-static int WMFreeClient(pointer data, XID id);
-static int WMFreeEvents(pointer data, XID id);
+static int WMFreeClient(void *data, XID id);
+static int WMFreeEvents(void *data, XID id);
static void SNotifyEvent(xWindowsWMNotifyEvent * from,
xWindowsWMNotifyEvent * to);
@@ -99,13 +99,13 @@ updateEventMask(WMEventPtr * pHead)
}
/*ARGSUSED*/ static int
-WMFreeClient(pointer data, XID id)
+WMFreeClient(void *data, XID id)
{
WMEventPtr pEvent;
WMEventPtr *pHead, pCur, pPrev;
pEvent = (WMEventPtr) data;
- dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+ dixLookupResourceByType((void *) &pHead, eventResource, eventResourceType,
NullClient, DixUnknownAccess);
if (pHead) {
pPrev = 0;
@@ -119,12 +119,12 @@ WMFreeClient(pointer data, XID id)
}
updateEventMask(pHead);
}
- free((pointer) pEvent);
+ free((void *) pEvent);
return 1;
}
/*ARGSUSED*/ static int
-WMFreeEvents(pointer data, XID id)
+WMFreeEvents(void *data, XID id)
{
WMEventPtr *pHead, pCur, pNext;
@@ -132,9 +132,9 @@ WMFreeEvents(pointer data, XID id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource(pCur->clientResource, ClientType);
- free((pointer) pCur);
+ free((void *) pCur);
}
- free((pointer) pHead);
+ free((void *) pHead);
eventMask = 0;
return 1;
}
@@ -147,7 +147,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
XID clientResource;
REQUEST_SIZE_MATCH(xWindowsWMSelectInputReq);
- dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+ dixLookupResourceByType((void *) &pHead, eventResource, eventResourceType,
client, DixWriteAccess);
if (stuff->mask != 0) {
if (pHead) {
@@ -174,7 +174,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
*/
clientResource = FakeClientID(client->index);
pNewEvent->clientResource = clientResource;
- if (!AddResource(clientResource, ClientType, (pointer) pNewEvent))
+ if (!AddResource(clientResource, ClientType, (void *) pNewEvent))
return BadAlloc;
/*
* create a resource to contain a pointer to the list
@@ -185,7 +185,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
if (!pHead) {
pHead = (WMEventPtr *) malloc(sizeof(WMEventPtr));
if (!pHead ||
- !AddResource(eventResource, eventResourceType, (pointer) pHead))
+ !AddResource(eventResource, eventResourceType, (void *) pHead))
{
FreeResource(clientResource, RT_NONE);
return BadAlloc;
@@ -239,7 +239,7 @@ winWindowsWMSendEvent(int type, unsigned int mask, int which, int arg,
ErrorF("winWindowsWMSendEvent %d %d %d %d, %d %d - %d %d\n",
type, mask, which, arg, x, y, w, h);
#endif
- dixLookupResourceByType((pointer) &pHead, eventResource, eventResourceType,
+ dixLookupResourceByType((void *) &pHead, eventResource, eventResourceType,
NullClient, DixUnknownAccess);
if (!pHead)
return;
diff --git a/include/callback.h b/include/callback.h
index b427089..df638c0 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -62,21 +62,21 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
#define _XTYPEDEF_CALLBACKLISTPTR
#endif
-typedef void (*CallbackProcPtr) (CallbackListPtr *, pointer, pointer);
+typedef void (*CallbackProcPtr) (CallbackListPtr *, void *, void *);
extern _X_EXPORT Bool AddCallback(CallbackListPtr * /*pcbl */ ,
CallbackProcPtr /*callback */ ,
- pointer /*data */ );
+ void */*data */ );
extern _X_EXPORT Bool DeleteCallback(CallbackListPtr * /*pcbl */ ,
CallbackProcPtr /*callback */ ,
- pointer /*data */ );
+ void */*data */ );
extern _X_EXPORT void _CallCallbacks(CallbackListPtr * /*pcbl */ ,
- pointer /*call_data */ );
+ void */*call_data */ );
static inline void
-CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
+CallCallbacks(CallbackListPtr *pcbl, void *call_data)
{
if (!pcbl || !*pcbl)
return;
diff --git a/include/closestr.h b/include/closestr.h
index d762891..60e6f09 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -64,7 +64,7 @@ typedef struct _LFWIstate {
int current_fpe;
int max_names;
Bool list_started;
- pointer private;
+ void *private;
} LFWIstateRec, *LFWIstatePtr;
typedef struct _LFWIclosure {
diff --git a/include/colormap.h b/include/colormap.h
index 8996cfe..22229ca 100644
--- a/include/colormap.h
+++ b/include/colormap.h
@@ -82,14 +82,14 @@ extern _X_EXPORT int CreateColormap(Colormap /*mid */ ,
int /*alloc */ ,
int /*client */ );
-extern _X_EXPORT int FreeColormap(pointer /*pmap */ ,
+extern _X_EXPORT int FreeColormap(void */*pmap */ ,
XID /*mid */ );
extern _X_EXPORT int TellLostMap(WindowPtr /*pwin */ ,
- pointer /* Colormap *pmid */ );
+ void */* Colormap *pmid */ );
extern _X_EXPORT int TellGainedMap(WindowPtr /*pwin */ ,
- pointer /* Colormap *pmid */ );
+ void */* Colormap *pmid */ );
extern _X_EXPORT int CopyColormapAndFree(Colormap /*mid */ ,
ColormapPtr /*pSrc */ ,
@@ -126,7 +126,7 @@ extern _X_EXPORT int QueryColors(ColormapPtr /*pmap */ ,
xrgb * /*prgbList */ ,
ClientPtr client);
-extern _X_EXPORT int FreeClientPixels(pointer /*pcr */ ,
+extern _X_EXPORT int FreeClientPixels(void */*pcr */ ,
XID /*fakeid */ );
extern _X_EXPORT int AllocColorCells(int /*client */ ,
diff --git a/include/cursor.h b/include/cursor.h
index 89a650f..9da08af 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -68,7 +68,7 @@ extern _X_EXPORT DevScreenPrivateKeyRec cursorScreenDevPriv;
extern _X_EXPORT CursorPtr rootCursor;
-extern _X_EXPORT int FreeCursor(pointer /*pCurs */ ,
+extern _X_EXPORT int FreeCursor(void */*pCurs */ ,
XID /*cid */ );
extern _X_EXPORT CursorPtr RefCursor(CursorPtr /* cursor */);
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 3066100..957257b 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -469,4 +469,7 @@
/* Directory for shared memory temp files */
#undef SHMDIR
+/* Don't let Xdefs.h define 'pointer' */
+#define _XTYPEDEF_POINTER 1
+
#endif /* _DIX_CONFIG_H_ */
diff --git a/include/dix.h b/include/dix.h
index 7362e07..8371df0 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -147,14 +147,14 @@ extern _X_EXPORT void UpdateCurrentTime(void);
extern _X_EXPORT void UpdateCurrentTimeIf(void);
-extern _X_EXPORT int dixDestroyPixmap(pointer /*value */ ,
+extern _X_EXPORT int dixDestroyPixmap(void */*value */ ,
XID /*pid */ );
extern _X_EXPORT void InitClient(ClientPtr /*client */ ,
int /*i */ ,
- pointer /*ospriv */ );
+ void */*ospriv */ );
-extern _X_EXPORT ClientPtr NextAvailableClient(pointer /*ospriv */ );
+extern _X_EXPORT ClientPtr NextAvailableClient(void */*ospriv */ );
extern _X_EXPORT void SendErrorToClient(ClientPtr /*client */ ,
unsigned int /*majorCode */ ,
@@ -203,11 +203,11 @@ extern _X_EXPORT int AlterSaveSetForClient(ClientPtr /*client */ ,
extern _X_EXPORT void DeleteWindowFromAnySaveSet(WindowPtr /*pWin */ );
-extern _X_EXPORT void BlockHandler(pointer /*pTimeout */ ,
- pointer /*pReadmask */ );
+extern _X_EXPORT void BlockHandler(void */*pTimeout */ ,
+ void */*pReadmask */ );
extern _X_EXPORT void WakeupHandler(int /*result */ ,
- pointer /*pReadmask */ );
+ void */*pReadmask */ );
void
EnableLimitedSchedulingLatency(void);
@@ -215,21 +215,21 @@ void
void
DisableLimitedSchedulingLatency(void);
-typedef void (*WakeupHandlerProcPtr) (pointer /* blockData */ ,
+typedef void (*WakeupHandlerProcPtr) (void */* blockData */ ,
int /* result */ ,
- pointer /* pReadmask */ );
+ void */* pReadmask */ );
extern _X_EXPORT Bool RegisterBlockAndWakeupHandlers(BlockHandlerProcPtr
/*blockHandler */ ,
WakeupHandlerProcPtr
/*wakeupHandler */ ,
- pointer /*blockData */ );
+ void */*blockData */ );
extern _X_EXPORT void RemoveBlockAndWakeupHandlers(BlockHandlerProcPtr
/*blockHandler */ ,
WakeupHandlerProcPtr
/*wakeupHandler */ ,
- pointer /*blockData */ );
+ void */*blockData */ );
extern _X_EXPORT void InitBlockAndWakeupHandlers(void);
@@ -241,18 +241,18 @@ extern _X_EXPORT Bool QueueWorkProc(Bool (* /*function */ )(
ClientPtr
/*clientUnused */
,
- pointer
+ void *
/*closure */ ),
ClientPtr /*client */ ,
- pointer /*closure */
+ void */*closure */
);
typedef Bool (*ClientSleepProcPtr) (ClientPtr /*client */ ,
- pointer /*closure */ );
+ void */*closure */ );
extern _X_EXPORT Bool ClientSleep(ClientPtr /*client */ ,
ClientSleepProcPtr /* function */ ,
- pointer /*closure */ );
+ void */*closure */ );
#ifndef ___CLIENTSIGNAL_DEFINED___
#define ___CLIENTSIGNAL_DEFINED___
@@ -444,7 +444,7 @@ extern void
RecalculateDeliverableEvents(WindowPtr /* pWin */ );
extern _X_EXPORT int
-OtherClientGone(pointer /* value */ ,
+OtherClientGone(void */* value */ ,
XID /* id */ );
extern void
diff --git a/include/dixfont.h b/include/dixfont.h
index 0598311..40d80c1 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -40,9 +40,9 @@ extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
extern _X_EXPORT void RemoveFontWakeup(FontPathElementPtr /*fpe */ );
-extern _X_EXPORT void FontWakeup(pointer /*data */ ,
+extern _X_EXPORT void FontWakeup(void */*data */ ,
int /*count */ ,
- pointer /*LastSelectMask */ );
+ void */*LastSelectMask */ );
extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
XID /*fid */ ,
@@ -50,7 +50,7 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
unsigned /*lenfname */ ,
const char * /*pfontname */ );
-extern _X_EXPORT int CloseFont(pointer /*pfont */ ,
+extern _X_EXPORT int CloseFont(void */*pfont */ ,
XID /*fid */ );
typedef struct _xQueryFontReply *xQueryFontReplyPtr;
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index ca3c95b..d78d812 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -47,7 +47,7 @@ extern GrabPtr CreateGrab(int /* client */ ,
WindowPtr /* confineTo */ ,
CursorPtr /* cursor */ );
-extern _X_EXPORT int DeletePassiveGrab(pointer /* value */ ,
+extern _X_EXPORT int DeletePassiveGrab(void */* value */ ,
XID /* id */ );
extern _X_EXPORT Bool GrabMatchesSecond(GrabPtr /* pFirstGrab */ ,
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 6f5667f..a11729b 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -74,8 +74,8 @@ typedef struct _saveSet {
#define SaveSetAssignMap(ss,m) ((ss).map = (m))
typedef struct _Client {
- pointer requestBuffer;
- pointer osPrivate; /* for OS layer, including scheduler */
+ void *requestBuffer;
+ void *osPrivate; /* for OS layer, including scheduler */
Mask clientAsMask;
short index;
unsigned char majorOp, minorOp;
@@ -149,10 +149,10 @@ SmartScheduleInit(void);
typedef struct _WorkQueue {
struct _WorkQueue *next;
Bool (*function) (ClientPtr /* pClient */ ,
- pointer /* closure */
+ void * /* closure */
);
ClientPtr client;
- pointer closure;
+ void *closure;
} WorkQueueRec;
extern _X_EXPORT TimeStamp currentTime;
@@ -166,7 +166,7 @@ ClientTimeToServerTime(CARD32 /*c */ );
typedef struct _CallbackRec {
CallbackProcPtr proc;
- pointer data;
+ void *data;
Bool deleted;
struct _CallbackRec *next;
} CallbackRec, *CallbackPtr;
diff --git a/include/extnsionst.h b/include/extnsionst.h
index 126807d..fbdb73c 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -66,7 +66,7 @@ typedef struct _ExtensionEntry {
int errorLast;
int num_aliases;
const char **aliases;
- pointer extPrivate;
+ void *extPrivate;
unsigned short (*MinorOpcode) ( /* called for errors */
ClientPtr /* client */ );
PrivateRec *devPrivates;
diff --git a/include/gc.h b/include/gc.h
index 6e5b92d..ecaa257 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -88,7 +88,7 @@ extern _X_EXPORT void ValidateGC(DrawablePtr /*pDraw */ ,
typedef union {
CARD32 val;
- pointer ptr;
+ void *ptr;
} ChangeGCVal, *ChangeGCValPtr;
extern int ChangeGCXIDs(ClientPtr /*client */ ,
@@ -112,7 +112,7 @@ extern _X_EXPORT int CopyGC(GCPtr /*pgcSrc */ ,
GCPtr /*pgcDst */ ,
BITS32 /*mask */ );
-extern _X_EXPORT int FreeGC(pointer /*pGC */ ,
+extern _X_EXPORT int FreeGC(void */*pGC */ ,
XID /*gid */ );
extern _X_EXPORT void FreeGCperDepth(int /*screenNum */ );
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 253593f..c830ccd 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -78,7 +78,7 @@ typedef struct _GCFuncs {
void (*ChangeClip) (GCPtr /*pGC */ ,
int /*type */ ,
- pointer /*pvalue */ ,
+ void */*pvalue */ ,
int /*nrects */ );
void (*DestroyClip) (GCPtr /*pGC */ );
@@ -216,7 +216,7 @@ typedef struct _GCOps {
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
- pointer /*pglyphBase */ );
+ void */*pglyphBase */ );
void (*PolyGlyphBlt) (DrawablePtr /*pDrawable */ ,
GCPtr /*pGC */ ,
@@ -224,7 +224,7 @@ typedef struct _GCOps {
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
- pointer /*pglyphBase */ );
+ void */*pglyphBase */ );
void (*PushPixels) (GCPtr /*pGC */ ,
PixmapPtr /*pBitMap */ ,
@@ -273,7 +273,7 @@ typedef struct _GC {
DDXPointRec patOrg; /* origin for (tile, stipple) */
struct _Font *font;
DDXPointRec clipOrg;
- pointer clientClip;
+ void *clientClip;
unsigned long stateChanges; /* masked with GC_<kind> */
unsigned long serialNumber;
const GCFuncs *funcs;
diff --git a/include/input.h b/include/input.h
index 042128f..455963f 100644
--- a/include/input.h
+++ b/include/input.h
@@ -163,7 +163,7 @@ typedef Bool (*PointerAccelSchemeInitProc) (DeviceIntPtr /*dev */ ,
/*protoScheme */ );
typedef struct _DeviceRec {
- pointer devicePrivate;
+ void *devicePrivate;
ProcessInputProc processInputProc; /* current */
ProcessInputProc realInputProc; /* deliver */
ProcessInputProc enqueueInputProc; /* enqueue */
@@ -316,7 +316,7 @@ extern _X_EXPORT Bool InitTouchClassDeviceStruct(DeviceIntPtr /*device */ ,
typedef void (*BellProcPtr) (int /*percent */ ,
DeviceIntPtr /*device */ ,
- pointer /*ctrl */ ,
+ void */*ctrl */ ,
int);
typedef void (*KbdCtrlProcPtr) (DeviceIntPtr /*device */ ,
diff --git a/include/inputstr.h b/include/inputstr.h
index d369c9f..dfcf7c3 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -447,7 +447,7 @@ typedef struct _XIPropertyValue {
Atom type; /* ignored by server */
short format; /* format of data for swapping - 8,16,32 */
long size; /* size of data in (format/8) bytes */
- pointer data; /* private to client */
+ void *data; /* private to client */
} XIPropertyValueRec;
typedef struct _XIProperty {
diff --git a/include/miscstruct.h b/include/miscstruct.h
index 0820e1e..dbab10f 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -56,10 +56,10 @@ typedef xPoint DDXPointRec;
typedef struct pixman_box16 BoxRec;
typedef union _DevUnion {
- pointer ptr;
+ void *ptr;
long val;
unsigned long uval;
- pointer (*fptr) (void);
+ void *(*fptr) (void);
} DevUnion;
#endif /* MISCSTRUCT_H */
diff --git a/include/os.h b/include/os.h
index 4dacc1e..e5f86d6 100644
--- a/include/os.h
+++ b/include/os.h
@@ -70,12 +70,12 @@ typedef struct _NewClientRec *NewClientPtr;
#ifndef xalloc
#define xnfalloc(size) XNFalloc((unsigned long)(size))
#define xnfcalloc(_num, _size) XNFcalloc((unsigned long)(_num)*(unsigned long)(_size))
-#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))
+#define xnfrealloc(ptr, size) XNFrealloc((void *)(ptr), (unsigned long)(size))
#define xalloc(size) Xalloc((unsigned long)(size))
#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))
-#define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))
-#define xfree(ptr) Xfree((pointer)(ptr))
+#define xrealloc(ptr, size) Xrealloc((void *)(ptr), (unsigned long)(size))
+#define xfree(ptr) Xfree((void *)(ptr))
#define xstrdup(s) Xstrdup(s)
#define xnfstrdup(s) XNFstrdup(s)
#endif
@@ -140,7 +140,7 @@ extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
char * /*auth_string */ );
extern _X_EXPORT Bool EstablishNewConnections(ClientPtr /*clientUnused */ ,
- pointer /*closure */ );
+ void */*closure */ );
extern _X_EXPORT void CheckConnections(void);
@@ -173,14 +173,14 @@ extern void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT CARD64 GetTimeInMicros(void);
-extern _X_EXPORT void AdjustWaitForDelay(pointer /*waitTime */ ,
+extern _X_EXPORT void AdjustWaitForDelay(void */*waitTime */ ,
unsigned long /*newdelay */ );
typedef struct _OsTimerRec *OsTimerPtr;
typedef CARD32 (*OsTimerCallback) (OsTimerPtr /* timer */ ,
CARD32 /* time */ ,
- pointer /* arg */ );
+ void */* arg */ );
extern _X_EXPORT void TimerInit(void);
@@ -193,7 +193,7 @@ extern _X_EXPORT OsTimerPtr TimerSet(OsTimerPtr /* timer */ ,
int /* flags */ ,
CARD32 /* millis */ ,
OsTimerCallback /* func */ ,
- pointer /* arg */ );
+ void */* arg */ );
extern _X_EXPORT void TimerCheck(void);
extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */ );
@@ -212,7 +212,7 @@ extern _X_EXPORT void ProcessCommandLine(int /*argc */ , char * /*argv */ []);
extern _X_EXPORT int set_font_authorizations(char ** /* authorizations */ ,
int * /*authlen */ ,
- pointer /* client */ );
+ void */* client */ );
#ifndef _HAVE_XALLOC_DECLS
#define _HAVE_XALLOC_DECLS
@@ -359,14 +359,14 @@ OsAbort(void)
#if !defined(WIN32)
extern _X_EXPORT int
System(const char *);
-extern _X_EXPORT pointer
+extern _X_EXPORT void *
Popen(const char *, const char *);
extern _X_EXPORT int
-Pclose(pointer);
-extern _X_EXPORT pointer
+Pclose(void *);
+extern _X_EXPORT void *
Fopen(const char *, const char *);
extern _X_EXPORT int
-Fclose(pointer);
+Fclose(void *);
#else
extern const char *
@@ -395,17 +395,17 @@ ForEachHostInFamily(int /*family */ ,
Bool (* /*func */ )(
unsigned char * /* addr */ ,
short /* len */ ,
- pointer /* closure */ ),
- pointer /*closure */ );
+ void */* closure */ ),
+ void */*closure */ );
extern _X_EXPORT int
RemoveHost(ClientPtr /*client */ ,
int /*family */ ,
unsigned /*length */ ,
- pointer /*pAddr */ );
+ void */*pAddr */ );
extern _X_EXPORT int
-GetHosts(pointer * /*data */ ,
+GetHosts(void ** /*data */ ,
int * /*pnHosts */ ,
int * /*pLen */ ,
BOOL * /*pEnabled */ );
@@ -464,7 +464,7 @@ DefineSelf(int /*fd */ );
#if XDMCP
extern _X_EXPORT void
-AugmentSelf(pointer /*from */ , int /*len */ );
+AugmentSelf(void */*from */ , int /*len */ );
extern _X_EXPORT void
RegisterAuthorizations(void);
diff --git a/include/pixmap.h b/include/pixmap.h
index 921a94d..46ec3f5 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -99,7 +99,7 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr /*pScreen */ ,
int /*depth */ ,
int /*bitsPerPixel */ ,
int /*devKind */ ,
- pointer /*pPixData */ );
+ void */*pPixData */ );
extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );
diff --git a/include/privates.h b/include/privates.h
index 0abdce7..7d1461c 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -142,10 +142,10 @@ dixGetPrivate(PrivatePtr *privates, const DevPrivateKey key)
* dixLookupPrivate(privates, key) will return 'val'.
*/
static inline void
-dixSetPrivate(PrivatePtr *privates, const DevPrivateKey key, pointer val)
+dixSetPrivate(PrivatePtr *privates, const DevPrivateKey key, void *val)
{
assert(key->size == 0);
- *(pointer *) dixGetPrivateAddr(privates, key) = val;
+ *(void **) dixGetPrivateAddr(privates, key) = val;
}
#include "dix.h"
@@ -158,7 +158,7 @@ dixSetPrivate(PrivatePtr *privates, const DevPrivateKey key, pointer val)
* storage. For privates without defined storage, return the pointer
* contents
*/
-static inline pointer
+static inline void *
dixLookupPrivate(PrivatePtr *privates, const DevPrivateKey key)
{
if (key->size)
@@ -173,11 +173,11 @@ dixLookupPrivate(PrivatePtr *privates, const DevPrivateKey key)
* This returns the place where the private pointer is stored,
* which is only valid for privates without predefined storage.
*/
-static inline pointer *
+static inline void **
dixLookupPrivateAddr(PrivatePtr *privates, const DevPrivateKey key)
{
assert(key->size == 0);
- return (pointer *) dixGetPrivateAddr(privates, key);
+ return (void **) dixGetPrivateAddr(privates, key);
}
extern _X_EXPORT Bool
@@ -204,19 +204,19 @@ dixGetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key,
static inline void
dixSetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key,
- ScreenPtr pScreen, pointer val)
+ ScreenPtr pScreen, void *val)
{
dixSetPrivate(privates, _dixGetScreenPrivateKey(key, pScreen), val);
}
-static inline pointer
+static inline void *
dixLookupScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key,
ScreenPtr pScreen)
{
return dixLookupPrivate(privates, _dixGetScreenPrivateKey(key, pScreen));
}
-static inline pointer *
+static inline void **
dixLookupScreenPrivateAddr(PrivatePtr *privates, const DevScreenPrivateKey key,
ScreenPtr pScreen)
{
diff --git a/include/property.h b/include/property.h
index 4219fc4..3b8ea8b 100644
--- a/include/property.h
+++ b/include/property.h
@@ -64,7 +64,7 @@ extern _X_EXPORT int dixChangeWindowProperty(ClientPtr /*pClient */ ,
int /*format */ ,
int /*mode */ ,
unsigned long /*len */ ,
- pointer /*value */ ,
+ void */*value */ ,
Bool /*sendevent */ );
extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ ,
@@ -73,7 +73,7 @@ extern _X_EXPORT int ChangeWindowProperty(WindowPtr /*pWin */ ,
int /*format */ ,
int /*mode */ ,
unsigned long /*len */ ,
- pointer /*value */ ,
+ void */*value */ ,
Bool /*sendevent */ );
extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
diff --git a/include/propertyst.h b/include/propertyst.h
index c12c71a..da99576 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -59,7 +59,7 @@ typedef struct _Property {
ATOM type; /* ignored by server */
uint32_t format; /* format of data for swapping - 8,16,32 */
uint32_t size; /* size of data in (format/8) bytes */
- pointer data; /* private to client */
+ void *data; /* private to client */
PrivateRec *devPrivates;
} PropertyRec;
diff --git a/include/resource.h b/include/resource.h
index 4a8dc31..db44aef 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -133,24 +133,24 @@ typedef struct {
ResourceState state;
XID id;
RESTYPE type;
- pointer value;
+ void *value;
} ResourceStateInfoRec;
-typedef int (*DeleteType) (pointer /*value */ ,
+typedef int (*DeleteType) (void */*value */ ,
XID /*id */ );
-typedef void (*FindResType) (pointer /*value */ ,
+typedef void (*FindResType) (void */*value */ ,
XID /*id */ ,
- pointer /*cdata */ );
+ void */*cdata */ );
-typedef void (*FindAllRes) (pointer /*value */ ,
+typedef void (*FindAllRes) (void */*value */ ,
XID /*id */ ,
RESTYPE /*type */ ,
- pointer /*cdata */ );
+ void */*cdata */ );
-typedef Bool (*FindComplexResType) (pointer /*value */ ,
+typedef Bool (*FindComplexResType) (void */*value */ ,
XID /*id */ ,
- pointer /*cdata */ );
+ void */*cdata */ );
/* Structure for estimating resource memory usage. Memory usage
* consists of space allocated for the resource itself and of
@@ -166,16 +166,16 @@ typedef struct {
unsigned long refCnt;
} ResourceSizeRec, *ResourceSizePtr;
-typedef void (*SizeType)(pointer /*value*/,
+typedef void (*SizeType)(void */*value*/,
XID /*id*/,
ResourceSizePtr /*size*/);
extern _X_EXPORT RESTYPE CreateNewResourceType(DeleteType /*deleteFunc */ ,
const char * /*name */ );
-typedef void (*FindTypeSubResources)(pointer /* value */,
+typedef void (*FindTypeSubResources)(void */* value */,
FindAllRes /* func */,
- pointer /* cdata */);
+ void */* cdata */);
extern _X_EXPORT SizeType GetResourceTypeSizeFunc(
RESTYPE /*type*/);
@@ -202,7 +202,7 @@ extern _X_EXPORT XID FakeClientID(int /*client */ );
#endif
extern _X_EXPORT Bool AddResource(XID /*id */ ,
RESTYPE /*type */ ,
- pointer /*value */ );
+ void */*value */ );
extern _X_EXPORT void FreeResource(XID /*id */ ,
RESTYPE /*skipDeleteFuncType */ );
@@ -213,25 +213,25 @@ extern _X_EXPORT void FreeResourceByType(XID /*id */ ,
extern _X_EXPORT Bool ChangeResourceValue(XID /*id */ ,
RESTYPE /*rtype */ ,
- pointer /*value */ );
+ void */*value */ );
extern _X_EXPORT void FindClientResourcesByType(ClientPtr /*client */ ,
RESTYPE /*type */ ,
FindResType /*func */ ,
- pointer /*cdata */ );
+ void */*cdata */ );
extern _X_EXPORT void FindAllClientResources(ClientPtr /*client */ ,
FindAllRes /*func */ ,
- pointer /*cdata */ );
+ void */*cdata */ );
/** @brief Iterate through all subresources of a resource.
@note The XID argument provided to the FindAllRes function
may be 0 for subresources that don't have an XID */
-extern _X_EXPORT void FindSubResources(pointer /*resource*/,
+extern _X_EXPORT void FindSubResources(void */*resource*/,
RESTYPE /*type*/,
FindAllRes /*func*/,
- pointer /*cdata*/);
+ void */*cdata*/);
extern _X_EXPORT void FreeClientNeverRetainResources(ClientPtr /*client */ );
@@ -242,18 +242,18 @@ extern _X_EXPORT void FreeAllResources(void);
extern _X_EXPORT Bool LegalNewID(XID /*id */ ,
ClientPtr /*client */ );
-extern _X_EXPORT pointer LookupClientResourceComplex(ClientPtr client,
+extern _X_EXPORT void *LookupClientResourceComplex(ClientPtr client,
RESTYPE type,
FindComplexResType func,
- pointer cdata);
+ void *cdata);
-extern _X_EXPORT int dixLookupResourceByType(pointer *result,
+extern _X_EXPORT int dixLookupResourceByType(void **result,
XID id,
RESTYPE rtype,
ClientPtr client,
Mask access_mode);
-extern _X_EXPORT int dixLookupResourceByClass(pointer *result,
+extern _X_EXPORT int dixLookupResourceByClass(void **result,
XID id,
RESTYPE rclass,
ClientPtr client,
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index df74073..86da789 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -260,12 +260,12 @@ typedef void (*SendGraphicsExposeProcPtr) (ClientPtr /*client */ ,
int /*minor */ );
typedef void (*ScreenBlockHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
- pointer /*pTimeout */ ,
- pointer /*pReadmask */ );
+ void */*pTimeout */ ,
+ void */*pReadmask */ );
typedef void (*ScreenWakeupHandlerProcPtr) (ScreenPtr /*pScreen*/ ,
unsigned long /*result */ ,
- pointer /*pReadMask */ );
+ void */*pReadMask */ );
typedef Bool (*CreateScreenResourcesProcPtr) (ScreenPtr /*pScreen */ );
@@ -275,7 +275,7 @@ typedef Bool (*ModifyPixmapHeaderProcPtr) (PixmapPtr /*pPixmap */ ,
int /*depth */ ,
int /*bitsPerPixel */ ,
int /*devKind */ ,
- pointer /*pPixData */ );
+ void */*pPixData */ );
typedef PixmapPtr (*GetWindowPixmapProcPtr) (WindowPtr /*pWin */ );
@@ -375,7 +375,7 @@ typedef struct _Screen {
a standard one.
*/
PixmapPtr PixmapPerDepth[1];
- pointer devPrivate;
+ void *devPrivate;
short numVisuals;
VisualPtr visuals;
WindowPtr root;
diff --git a/include/window.h b/include/window.h
index b6d61c3..b5a937e 100644
--- a/include/window.h
+++ b/include/window.h
@@ -73,15 +73,15 @@ typedef struct _BackingStore *BackingStorePtr;
typedef struct _Window *WindowPtr;
typedef int (*VisitWindowProcPtr) (WindowPtr /*pWin */ ,
- pointer /*data */ );
+ void */*data */ );
extern _X_EXPORT int TraverseTree(WindowPtr /*pWin */ ,
VisitWindowProcPtr /*func */ ,
- pointer /*data */ );
+ void */*data */ );
extern _X_EXPORT int WalkTree(ScreenPtr /*pScreen */ ,
VisitWindowProcPtr /*func */ ,
- pointer /*data */ );
+ void */*data */ );
extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ );
@@ -108,7 +108,7 @@ extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ ,
VisualID /*visual */ ,
int * /*error */ );
-extern _X_EXPORT int DeleteWindow(pointer /*pWin */ ,
+extern _X_EXPORT int DeleteWindow(void */*pWin */ ,
XID /*wid */ );
extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ ,
diff --git a/include/windowstr.h b/include/windowstr.h
index a1e608f..6b79bbd 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -144,7 +144,7 @@ typedef struct _Window {
Mask eventMask; /* mask from the creating client */
PixUnion background;
PixUnion border;
- pointer backStorage; /* null when BS disabled */
+ void *backStorage; /* null when BS disabled */
WindowOptPtr optional;
unsigned backgroundState:2; /* None, Relative, Pixel, Pixmap */
unsigned borderIsPixel:1;
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index fbfe403..0b9ca06 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -281,7 +281,7 @@ extern _X_EXPORT DevPrivateKeyRec xkbDevicePrivateKeyRec;
#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))
-extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, pointer);
+extern void xkbUnwrapProc(DeviceIntPtr, DeviceHandleProc, void *);
/***====================================================================***/
@@ -600,7 +600,7 @@ extern _X_EXPORT void XkbHandleBell(BOOL /* force */ ,
BOOL /* eventOnly */ ,
DeviceIntPtr /* kbd */ ,
CARD8 /* percent */ ,
- pointer /* ctrl */ ,
+ void */* ctrl */ ,
CARD8 /* class */ ,
Atom /* name */ ,
WindowPtr /* pWin */ ,
diff --git a/mi/mi.h b/mi/mi.h
index 638fc6b..950ee38 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -271,7 +271,7 @@ extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr /*pDrawable */ ,
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
- pointer /*pglyphBase */
+ void */*pglyphBase */
);
extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ ,
@@ -280,7 +280,7 @@ extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ ,
int /*y */ ,
unsigned int /*nglyph */ ,
CharInfoPtr * /*ppci */ ,
- pointer /*pglyphBase */
+ void */*pglyphBase */
);
/* mipoly.c */
@@ -387,7 +387,7 @@ extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr /*pPixmap */ ,
int /*depth */ ,
int /*bitsPerPixel */ ,
int /*devKind */ ,
- pointer /*pPixData */
+ void */*pPixData */
);
extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
@@ -395,11 +395,11 @@ extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr /*pScreen */ ,
int /*width */ ,
- pointer /*pbits */
+ void */*pbits */
);
extern _X_EXPORT Bool miScreenInit(ScreenPtr /*pScreen */ ,
- pointer /*pbits */ ,
+ void */*pbits */ ,
int /*xsize */ ,
int /*ysize */ ,
int /*dpix */ ,
diff --git a/mi/miarc.c b/mi/miarc.c
index 0f6448b..0f56c7d 100644
--- a/mi/miarc.c
+++ b/mi/miarc.c
@@ -1489,7 +1489,7 @@ miGetArcPts(SppArcPtr parc, /* points to an arc */
count++;
cdt = 2 * miDcos(dt);
- if (!(poly = (SppPointPtr) realloc((pointer) *ppPts,
+ if (!(poly = (SppPointPtr) realloc((void *) *ppPts,
(cpt + count) * sizeof(SppPointRec))))
return 0;
*ppPts = poly;
diff --git a/mi/micmap.c b/mi/micmap.c
index 3ef0c8c..4648b9a 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -75,7 +75,7 @@ miUninstallColormap(ColormapPtr pmap)
if (pmap == curpmap) {
if (pmap->mid != pmap->pScreen->defColormap) {
- dixLookupResourceByType((pointer *) &curpmap,
+ dixLookupResourceByType((void **) &curpmap,
pmap->pScreen->defColormap,
RT_COLORMAP, serverClient, DixUseAccess);
(*pmap->pScreen->InstallColormap) (curpmap);
diff --git a/mi/midispcur.c b/mi/midispcur.c
index edca969..8cca5fe 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -79,7 +79,7 @@ typedef struct {
(miDCBufferPtr)dixLookupScreenPrivate(&GetMaster(dev, MASTER_POINTER)->devPrivates, miDCDeviceKey, screen))
/*
- * The core pointer buffer will point to the index of the virtual core pointer
+ * The core pointer buffer will point to the index of the virtual pointer
* in the pCursorBuffers array.
*/
typedef struct {
@@ -114,7 +114,7 @@ miDCInitialize(ScreenPtr pScreen, miPointerScreenFuncPtr screenFuncs)
dixSetPrivate(&pScreen->devPrivates, miDCScreenKey, pScreenPriv);
if (!miSpriteInitialize(pScreen, screenFuncs)) {
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return FALSE;
}
return TRUE;
@@ -152,7 +152,7 @@ miDCCloseScreen(ScreenPtr pScreen)
pScreen->CloseScreen = pScreenPriv->CloseScreen;
miDCSwitchScreenCursor(pScreen, NULL, NULL, NULL, NULL);
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
return (*pScreen->CloseScreen) (pScreen);
}
diff --git a/mi/miexpose.c b/mi/miexpose.c
index 8b7c93f..198c433 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -610,7 +610,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
gcmask |= GCPlaneMask;
#endif
gcval[c++].val = FillTiled;
- gcval[c++].ptr = (pointer) fill.pixmap;
+ gcval[c++].ptr = (void *) fill.pixmap;
gcval[c++].val = tile_x_off;
gcval[c++].val = tile_y_off;
gcmask |= GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin;
diff --git a/mi/migc.c b/mi/migc.c
index c9cdd12..9bbe884 100644
--- a/mi/migc.c
+++ b/mi/migc.c
@@ -72,12 +72,12 @@ miDestroyClip(GCPtr pGC)
}
void
-miChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+miChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
(*pGC->funcs->DestroyClip) (pGC);
if (type == CT_PIXMAP) {
/* convert the pixmap to a region */
- pGC->clientClip = (pointer) BitmapToRegion(pGC->pScreen,
+ pGC->clientClip = (void *) BitmapToRegion(pGC->pScreen,
(PixmapPtr) pvalue);
(*pGC->pScreen->DestroyPixmap) (pvalue);
}
@@ -86,7 +86,7 @@ miChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
pGC->clientClip = pvalue;
}
else if (type != CT_NONE) {
- pGC->clientClip = (pointer) RegionFromRects(nrects,
+ pGC->clientClip = (void *) RegionFromRects(nrects,
(xRectangle *) pvalue,
type);
free(pvalue);
@@ -112,7 +112,7 @@ miCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
case CT_REGION:
prgnNew = RegionCreate(NULL, 1);
RegionCopy(prgnNew, (RegionPtr) (pgcSrc->clientClip));
- (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (pointer) prgnNew, 0);
+ (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (void *) prgnNew, 0);
break;
}
}
diff --git a/mi/migc.h b/mi/migc.h
index 8c13b2e..fb9f35c 100644
--- a/mi/migc.h
+++ b/mi/migc.h
@@ -38,7 +38,7 @@ extern _X_EXPORT void miDestroyClip(GCPtr /*pGC */
extern _X_EXPORT void miChangeClip(GCPtr /*pGC */ ,
int /*type */ ,
- pointer /*pvalue */ ,
+ void */*pvalue */ ,
int /*nrects */
);
diff --git a/mi/miglblt.c b/mi/miglblt.c
index 1a70911..b53ab9c 100644
--- a/mi/miglblt.c
+++ b/mi/miglblt.c
@@ -81,7 +81,7 @@ with the sample server.
void
miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci, /* array of character info */
- pointer pglyphBase /* start of array of glyphs */
+ void *pglyphBase /* start of array of glyphs */
)
{
int width, height;
@@ -182,7 +182,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyp
void
miImageGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int nglyph, CharInfoPtr * ppci, /* array of character info */
- pointer pglyphBase /* start of array of glyphs */
+ void *pglyphBase /* start of array of glyphs */
)
{
ExtentInfoRec info; /* used by QueryGlyphExtents() */
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 2bfd5e4..7f502fa 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -1050,7 +1050,7 @@ typedef struct {
} miOverlayTwoRegions;
static int
-miOverlayRecomputeExposures(WindowPtr pWin, pointer value)
+miOverlayRecomputeExposures(WindowPtr pWin, void *value)
{
miOverlayTwoRegions *pValid = (miOverlayTwoRegions *) value;
miOverlayTreePtr pTree = MIOVERLAY_GET_WINDOW_TREE(pWin);
@@ -1404,7 +1404,7 @@ miOverlayResizeWindow(WindowPtr pWin,
TwoRegions.under = gravitate2[g];
TraverseTree(pChild, miOverlayRecomputeExposures,
- (pointer) (&TwoRegions));
+ (void *) (&TwoRegions));
}
/*
diff --git a/mi/mipointer.c b/mi/mipointer.c
index df027a7..6fa416d 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -152,7 +152,7 @@ miPointerCloseScreen(ScreenPtr pScreen)
SetupScreen(pScreen);
pScreen->CloseScreen = pScreenPriv->CloseScreen;
- free((pointer) pScreenPriv);
+ free((void *) pScreenPriv);
FreeEventList(mipointermove_events, GetMaximumEventsNum());
mipointermove_events = NULL;
return (*pScreen->CloseScreen) (pScreen);
diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c
index a0e88d2..e316ae0 100644
--- a/mi/mipolyrect.c
+++ b/mi/mipolyrect.c
@@ -148,7 +148,7 @@ miPolyRectangle(DrawablePtr pDraw, GCPtr pGC, int nrects, xRectangle *pRects)
}
}
(*pGC->ops->PolyFillRect) (pDraw, pGC, t - tmp, tmp);
- free((pointer) tmp);
+ free((void *) tmp);
}
else {
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index 4698b53..6aed52f 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -53,14 +53,14 @@ from The Open Group.
*/
typedef struct {
- pointer pbits; /* pointer to framebuffer */
+ void *pbits; /* pointer to framebuffer */
int width; /* delta to add to a framebuffer addr to move one row down */
} miScreenInitParmsRec, *miScreenInitParmsPtr;
/* this plugs into pScreen->ModifyPixmapHeader */
Bool
miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth,
- int bitsPerPixel, int devKind, pointer pPixData)
+ int bitsPerPixel, int devKind, void *pPixData)
{
if (!pPixmap)
return FALSE;
@@ -135,7 +135,7 @@ Bool
miCreateScreenResources(ScreenPtr pScreen)
{
miScreenInitParmsPtr pScrInitParms;
- pointer value;
+ void *value;
pScrInitParms = (miScreenInitParmsPtr) pScreen->devPrivate;
@@ -161,7 +161,7 @@ miCreateScreenResources(ScreenPtr pScreen)
pScreen->rootDepth),
pScrInitParms->pbits))
return FALSE;
- value = (pointer) pPixmap;
+ value = (void *) pPixmap;
}
else {
value = pScrInitParms->pbits;
@@ -172,7 +172,7 @@ miCreateScreenResources(ScreenPtr pScreen)
}
Bool
-miScreenDevPrivateInit(ScreenPtr pScreen, int width, pointer pbits)
+miScreenDevPrivateInit(ScreenPtr pScreen, int width, void *pbits)
{
miScreenInitParmsPtr pScrInitParms;
@@ -185,7 +185,7 @@ miScreenDevPrivateInit(ScreenPtr pScreen, int width, pointer pbits)
return FALSE;
pScrInitParms->pbits = pbits;
pScrInitParms->width = width;
- pScreen->devPrivate = (pointer) pScrInitParms;
+ pScreen->devPrivate = (void *) pScrInitParms;
return TRUE;
}
@@ -199,11 +199,11 @@ static void
miSetScreenPixmap(PixmapPtr pPix)
{
if (pPix)
- pPix->drawable.pScreen->devPrivate = (pointer) pPix;
+ pPix->drawable.pScreen->devPrivate = (void *) pPix;
}
Bool
-miScreenInit(ScreenPtr pScreen, pointer pbits, /* pointer to screen bits */
+miScreenInit(ScreenPtr pScreen, void *pbits, /* pointer to screen bits */
int xsize, int ysize, /* in pixels */
int dpix, int dpiy, /* dots per inch */
int width, /* pixel width of frame buffer */
diff --git a/mi/misprite.c b/mi/misprite.c
index 85ca022..eea731a 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -199,7 +199,7 @@ static void miSpriteSourceValidate(DrawablePtr pDrawable, int x, int y,
static void miSpriteCopyWindow(WindowPtr pWindow,
DDXPointRec ptOldOrg, RegionPtr prgnSrc);
static void miSpriteBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadMask);
+ void *pTimeout, void *pReadMask);
static void miSpriteInstallColormap(ColormapPtr pMap);
static void miSpriteStoreColors(ColormapPtr pMap, int ndef, xColorItem * pdef);
@@ -512,8 +512,8 @@ miSpriteCopyWindow(WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
}
static void
-miSpriteBlockHandler(ScreenPtr pScreen, pointer pTimeout,
- pointer pReadmask)
+miSpriteBlockHandler(ScreenPtr pScreen, void *pTimeout,
+ void *pReadmask)
{
miSpriteScreenPtr pPriv = GetSpriteScreen(pScreen);
DeviceIntPtr pDev;
diff --git a/mi/miwindow.c b/mi/miwindow.c
index 8dd99db..697ffbc 100644
--- a/mi/miwindow.c
+++ b/mi/miwindow.c
@@ -305,7 +305,7 @@ miMoveWindow(WindowPtr pWin, int x, int y, WindowPtr pNextSib, VTKind kind)
*/
static int
-miRecomputeExposures(WindowPtr pWin, pointer value)
+miRecomputeExposures(WindowPtr pWin, void *value)
{ /* must conform to VisitWindowProcPtr */
RegionPtr pValid = (RegionPtr) value;
@@ -584,7 +584,7 @@ miSlideAndSizeWindow(WindowPtr pWin,
if (pChild->winGravity != g)
continue;
RegionIntersect(pRegion, &pChild->borderClip, gravitate[g]);
- TraverseTree(pChild, miRecomputeExposures, (pointer) pRegion);
+ TraverseTree(pChild, miRecomputeExposures, (void *) pRegion);
}
/*
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 55d8c41..9bd9c84 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -326,7 +326,7 @@ static void damageValidateGC(GCPtr, unsigned long, DrawablePtr);
static void damageChangeGC(GCPtr, unsigned long);
static void damageCopyGC(GCPtr, unsigned long, GCPtr);
static void damageDestroyGC(GCPtr);
-static void damageChangeClip(GCPtr, int, pointer, int);
+static void damageChangeClip(GCPtr, int, void *, int);
static void damageDestroyClip(GCPtr);
static void damageCopyClip(GCPtr, GCPtr);
@@ -410,7 +410,7 @@ damageCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
}
static void
-damageChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+damageChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
DAMAGE_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);
@@ -1366,7 +1366,7 @@ damageImageGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase)
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase)
{
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
@@ -1381,7 +1381,7 @@ damagePolyGlyphBlt(DrawablePtr pDrawable,
GCPtr pGC,
int x,
int y,
- unsigned int nglyph, CharInfoPtr * ppci, pointer pglyphBase)
+ unsigned int nglyph, CharInfoPtr * ppci, void *pglyphBase)
{
DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable);
damageDamageChars(pDrawable, pGC->font, x + pDrawable->x, y + pDrawable->y,
diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c
index d8f43bd..5043627 100644
--- a/miext/rootless/rootlessCommon.c
+++ b/miext/rootless/rootlessCommon.c
@@ -202,7 +202,7 @@ RootlessStartDrawing(WindowPtr pWindow)
* damaged regions are flushed to the screen.
*/
static int
-RestorePreDrawingPixmapVisitor(WindowPtr pWindow, pointer data)
+RestorePreDrawingPixmapVisitor(WindowPtr pWindow, void *data)
{
RootlessWindowRec *winRec = (RootlessWindowRec *) data;
ScreenPtr pScreen = pWindow->drawable.pScreen;
@@ -249,7 +249,7 @@ RootlessStopDrawing(WindowPtr pWindow, Bool flush)
SCREENREC(pScreen)->imp->StopDrawing(winRec->wid, flush);
FreeScratchPixmapHeader(winRec->pixmap);
- TraverseTree(top, RestorePreDrawingPixmapVisitor, (pointer) winRec);
+ TraverseTree(top, RestorePreDrawingPixmapVisitor, (void *) winRec);
winRec->pixmap = NULL;
winRec->is_drawing = FALSE;
diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c
index 9328995..23ff393 100644
--- a/miext/rootless/rootlessGC.c
+++ b/miext/rootless/rootlessGC.c
@@ -55,7 +55,7 @@ static void RootlessValidateGC(GCPtr pGC, unsigned long changes,
static void RootlessChangeGC(GCPtr pGC, unsigned long mask);
static void RootlessCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
static void RootlessDestroyGC(GCPtr pGC);
-static void RootlessChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects);
+static void RootlessChangeClip(GCPtr pGC, int type, void *pvalue, int nrects);
static void RootlessDestroyClip(GCPtr pGC);
static void RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
@@ -113,10 +113,10 @@ static void RootlessImageText16(DrawablePtr dst, GCPtr pGC, int x, int y,
int count, unsigned short *chars);
static void RootlessImageGlyphBlt(DrawablePtr dst, GCPtr pGC, int x, int y,
unsigned int nglyphInit,
- CharInfoPtr * ppciInit, pointer unused);
+ CharInfoPtr * ppciInit, void *unused);
static void RootlessPolyGlyphBlt(DrawablePtr dst, GCPtr pGC, int x, int y,
unsigned int nglyph, CharInfoPtr * ppci,
- pointer pglyphBase);
+ void *pglyphBase);
static void RootlessPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr dst,
int dx, int dy, int xOrg, int yOrg);
@@ -368,7 +368,7 @@ RootlessDestroyGC(GCPtr pGC)
}
static void
-RootlessChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
+RootlessChangeClip(GCPtr pGC, int type, void *pvalue, int nrects)
{
GCFUNC_UNWRAP(pGC);
pGC->funcs->ChangeClip(pGC, type, pvalue, nrects);
@@ -1356,7 +1356,7 @@ RootlessPolyText16(DrawablePtr dst, GCPtr pGC,
static void
RootlessImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyphInit,
- CharInfoPtr * ppciInit, pointer unused)
+ CharInfoPtr * ppciInit, void *unused)
{
GC_SAVE(pGC);
GCOP_UNWRAP(pGC);
@@ -1419,7 +1419,7 @@ RootlessImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
static void
RootlessPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
int x, int y, unsigned int nglyph,
- CharInfoPtr * ppci, pointer pglyphBase)
+ CharInfoPtr * ppci, void *pglyphBase)
{
GCOP_UNWRAP(pGC);
RL_DEBUG_MSG("polyglyph start ");
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index a1af3e7..6226ee8 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -603,7 +603,7 @@ RootlessQueueRedisplay(ScreenPtr pScreen)
* on select().
*/
static void
-RootlessBlockHandler(pointer pbdata, OSTimePtr pTimeout, pointer pReadmask)
+RootlessBlockHandler(void *pbdata, OSTimePtr pTimeout, void *pReadmask)
{
ScreenPtr pScreen = pbdata;
RootlessScreenRec *screenRec = SCREENREC(pScreen);
@@ -616,7 +616,7 @@ RootlessBlockHandler(pointer pbdata, OSTimePtr pTimeout, pointer pReadmask)
}
static void
-RootlessWakeupHandler(pointer data, int i, pointer LastSelectMask)
+RootlessWakeupHandler(void *data, int i, void *LastSelectMask)
{
// nothing here
}
@@ -728,7 +728,7 @@ RootlessInit(ScreenPtr pScreen, RootlessFrameProcsPtr procs)
if (!RegisterBlockAndWakeupHandlers(RootlessBlockHandler,
RootlessWakeupHandler,
- (pointer) pScreen)) {
+ (void *) pScreen)) {
return FALSE;
}
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 7e3c281..3dbd588 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -625,7 +625,7 @@ RootlessRestackWindow(WindowPtr pWin, WindowPtr pOldNextSib)
*/
// Globals needed during window resize and move.
-static pointer gResizeDeathBits = NULL;
+static void *gResizeDeathBits = NULL;
static int gResizeDeathCount = 0;
static PixmapPtr gResizeDeathPix[2] = { NULL, NULL };
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
index 1a9088c..522e21b 100644
--- a/miext/shadow/shadow.c
+++ b/miext/shadow/shadow.c
@@ -65,7 +65,7 @@ shadowRedisplay(ScreenPtr pScreen)
}
static void
-shadowBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead)
+shadowBlockHandler(void *data, OSTimePtr pTimeout, void *pRead)
{
ScreenPtr pScreen = (ScreenPtr) data;
@@ -73,7 +73,7 @@ shadowBlockHandler(pointer data, OSTimePtr pTimeout, pointer pRead)
}
static void
-shadowWakeupHandler(pointer data, int i, pointer LastSelectMask)
+shadowWakeupHandler(void *data, int i, void *LastSelectMask)
{
}
@@ -183,7 +183,7 @@ shadowAdd(ScreenPtr pScreen, PixmapPtr pPixmap, ShadowUpdateProc update,
shadowBuf(pScreen);
if (!RegisterBlockAndWakeupHandlers(shadowBlockHandler, shadowWakeupHandler,
- (pointer) pScreen))
+ (void *) pScreen))
return FALSE;
/*
@@ -228,7 +228,7 @@ shadowRemove(ScreenPtr pScreen, PixmapPtr pPixmap)
}
RemoveBlockAndWakeupHandlers(shadowBlockHandler, shadowWakeupHandler,
- (pointer) pScreen);
+ (void *) pScreen);
}
Bool
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 39fedd9..3eb15b9 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -118,7 +118,7 @@ struct _OsTimerRec {
CARD32 expires;
CARD32 delta;
OsTimerCallback callback;
- pointer arg;
+ void *arg;
};
static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev);
@@ -212,7 +212,7 @@ WaitForSomething(int *pClientsReady)
XFD_COPYSET(&AllSockets, &LastSelectMask);
}
- BlockHandler((pointer) &wt, (pointer) &LastSelectMask);
+ BlockHandler((void *) &wt, (void *) &LastSelectMask);
if (NewOutputPending)
FlushAllOutput();
/* keep this check close to select() call to minimize race */
@@ -226,7 +226,7 @@ WaitForSomething(int *pClientsReady)
i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt);
}
selecterr = GetErrno();
- WakeupHandler(i, (pointer) &LastSelectMask);
+ WakeupHandler(i, (void *) &LastSelectMask);
if (i <= 0) { /* An error or timeout occurred */
if (dispatchException)
return 0;
@@ -303,7 +303,7 @@ WaitForSomething(int *pClientsReady)
XFD_ANDSET(&tmp_set, &LastSelectMask, &WellKnownConnections);
if (XFD_ANYSET(&tmp_set))
QueueWorkProc(EstablishNewConnections, NULL,
- (pointer) &LastSelectMask);
+ (void *) &LastSelectMask);
if (XFD_ANYSET(&devicesReadable) || XFD_ANYSET(&clientsReadable))
break;
@@ -416,7 +416,7 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
OsTimerPtr
TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
- OsTimerCallback func, pointer arg)
+ OsTimerCallback func, void *arg)
{
register OsTimerPtr *prev;
CARD32 now = GetTimeInMillis();
@@ -564,7 +564,7 @@ NextDPMSTimeout(INT32 timeout)
#endif /* DPMSExtension */
static CARD32
-ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
INT32 timeout = now - LastEventTime(XIAllDevices).milliseconds;
CARD32 nextTimeout = 0;
diff --git a/os/access.c b/os/access.c
index c55b0ef..e8c0781 100644
--- a/os/access.c
+++ b/os/access.c
@@ -186,7 +186,7 @@ Bool defeatAccessControl = FALSE;
static int ConvertAddr(struct sockaddr * /*saddr */ ,
int * /*len */ ,
- pointer * /*addr */ );
+ void ** /*addr */ );
static int CheckAddr(int /*family */ ,
const void * /*pAddr */ ,
@@ -226,7 +226,7 @@ static int LocalHostRequested = FALSE;
static int UsingXdmcp = FALSE;
/* FamilyServerInterpreted implementation */
-static Bool siAddrMatch(int family, pointer addr, int len, HOST * host,
+static Bool siAddrMatch(int family, void *addr, int len, HOST * host,
ClientPtr client);
static int siCheckAddr(const char *addrString, int length);
static void siTypesInitialize(void);
@@ -258,7 +258,7 @@ DisableLocalHost(void)
for (self = selfhosts; self; self = self->next) {
if (!self->requested) /* Fix for XFree86 bug #156 */
(void) RemoveHost((ClientPtr) NULL, self->family, self->len,
- (pointer) self->addr);
+ (void *) self->addr);
}
}
@@ -382,7 +382,7 @@ DefineSelf(int fd)
default:
goto DefineLocalHost;
}
- family = ConvertAddr(&(saddr.sa), &len, (pointer *) &addr);
+ family = ConvertAddr(&(saddr.sa), &len, (void **) &addr);
if (family != -1 && family != FamilyLocal) {
for (host = selfhosts;
host && !addrEqual(family, addr, len, host);
@@ -545,7 +545,7 @@ DefineSelf(int fd)
#define IFR_IFR_NAME ifr->ifr_name
#endif
- if (ifioctl(fd, IFC_IOCTL_REQ, (pointer) &ifc) < 0)
+ if (ifioctl(fd, IFC_IOCTL_REQ, (void *) &ifc) < 0)
ErrorF("Getting interface configuration (4): %s\n", strerror(errno));
cplim = (char *) IFC_IFC_REQ + IFC_IFC_LEN;
@@ -554,7 +554,7 @@ DefineSelf(int fd)
ifr = (ifr_type *) cp;
len = ifraddr_size(IFR_IFR_ADDR);
family = ConvertAddr((struct sockaddr *) &IFR_IFR_ADDR,
- &len, (pointer *) &addr);
+ &len, (void **) &addr);
if (family == -1 || family == FamilyLocal)
continue;
#if defined(IPv6) && defined(AF_INET6)
@@ -649,12 +649,12 @@ DefineSelf(int fd)
struct ifreq broad_req;
broad_req = *ifr;
- if (ifioctl(fd, SIOCGIFFLAGS, (pointer) &broad_req) != -1 &&
+ if (ifioctl(fd, SIOCGIFFLAGS, (void *) &broad_req) != -1 &&
(broad_req.ifr_flags & IFF_BROADCAST) &&
(broad_req.ifr_flags & IFF_UP)
) {
broad_req = *ifr;
- if (ifioctl(fd, SIOCGIFBRDADDR, (pointer) &broad_req) != -1)
+ if (ifioctl(fd, SIOCGIFBRDADDR, (void *) &broad_req) != -1)
broad_addr = broad_req.ifr_addr;
else
continue;
@@ -679,7 +679,7 @@ DefineSelf(int fd)
continue;
len = sizeof(*(ifr->ifa_addr));
family = ConvertAddr((struct sockaddr *) ifr->ifa_addr, &len,
- (pointer *) &addr);
+ (void **) &addr);
if (family == -1 || family == FamilyLocal)
continue;
#if defined(IPv6) && defined(AF_INET6)
@@ -775,13 +775,13 @@ DefineSelf(int fd)
#ifdef XDMCP
void
-AugmentSelf(pointer from, int len)
+AugmentSelf(void *from, int len)
{
int family;
- pointer addr;
+ void *addr;
register HOST *host;
- family = ConvertAddr(from, &len, (pointer *) &addr);
+ family = ConvertAddr(from, &len, (void **) &addr);
if (family == -1 || family == FamilyLocal)
return;
for (host = selfhosts; host; host = host->next) {
@@ -835,7 +835,7 @@ ResetHosts(const char *display)
} saddr;
#endif
int family = 0;
- pointer addr;
+ void *addr;
int len;
siTypesInitialize();
@@ -927,7 +927,7 @@ ResetHosts(const char *display)
for (a = addresses; a != NULL; a = a->ai_next) {
len = a->ai_addrlen;
f = ConvertAddr(a->ai_addr, &len,
- (pointer *) &addr);
+ (void **) &addr);
if ((family == f) ||
((family == FamilyWild) && (f != -1))) {
NewHost(f, addr, len, FALSE);
@@ -950,15 +950,15 @@ ResetHosts(const char *display)
len = sizeof(saddr.sa);
if ((family =
ConvertAddr(&saddr.sa, &len,
- (pointer *) &addr)) != -1) {
+ (void **) &addr)) != -1) {
#ifdef h_addr /* new 4.3bsd version of gethostent */
char **list;
/* iterate over the addresses */
for (list = hp->h_addr_list; *list; list++)
- (void) NewHost(family, (pointer) *list, len, FALSE);
+ (void) NewHost(family, (void *) *list, len, FALSE);
#else
- (void) NewHost(family, (pointer) hp->h_addr, len,
+ (void) NewHost(family, (void *) hp->h_addr, len,
FALSE);
#endif
}
@@ -978,7 +978,7 @@ ComputeLocalClient(ClientPtr client)
{
int alen, family, notused;
Xtransaddr *from = NULL;
- pointer addr;
+ void *addr;
register HOST *host;
OsCommPtr oc = (OsCommPtr) client->osPrivate;
@@ -987,7 +987,7 @@ ComputeLocalClient(ClientPtr client)
if (!_XSERVTransGetPeerAddr(oc->trans_conn, ¬used, &alen, &from)) {
family = ConvertAddr((struct sockaddr *) from,
- &alen, (pointer *) &addr);
+ &alen, (void **) &addr);
if (family == -1) {
free(from);
return FALSE;
@@ -1219,8 +1219,8 @@ AddHost(ClientPtr client, int family, unsigned length, /* of bytes in pAddr */
Bool
ForEachHostInFamily(int family, Bool (*func) (unsigned char * /* addr */ ,
short /* len */ ,
- pointer /* closure */ ),
- pointer closure)
+ void */* closure */ ),
+ void *closure)
{
HOST *host;
@@ -1264,7 +1264,7 @@ NewHost(int family, const void *addr, int len, int addingLocalHosts)
int
RemoveHost(ClientPtr client, int family, unsigned length, /* of bytes in pAddr */
- pointer pAddr)
+ void *pAddr)
{
int rc, len;
register HOST *host, **prev;
@@ -1311,7 +1311,7 @@ RemoveHost(ClientPtr client, int family, unsigned length, /* of bytes in p
/* Get all hosts in the access control list */
int
-GetHosts(pointer *data, int *pnHosts, int *pLen, BOOL * pEnabled)
+GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
{
int len;
register int n = 0;
@@ -1386,12 +1386,12 @@ int
InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
{
int family;
- pointer addr;
+ void *addr;
register HOST *selfhost, *host;
if (!AccessEnabled) /* just let them in */
return 0;
- family = ConvertAddr(saddr, &len, (pointer *) &addr);
+ family = ConvertAddr(saddr, &len, (void **) &addr);
if (family == -1)
return 1;
if (family == FamilyLocal) {
@@ -1427,7 +1427,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
}
static int
-ConvertAddr(register struct sockaddr *saddr, int *len, pointer *addr)
+ConvertAddr(register struct sockaddr *saddr, int *len, void **addr)
{
if (*len == 0)
return FamilyLocal;
@@ -1444,7 +1444,7 @@ ConvertAddr(register struct sockaddr *saddr, int *len, pointer *addr)
return FamilyLocal;
#endif
*len = sizeof(struct in_addr);
- *addr = (pointer) &(((struct sockaddr_in *) saddr)->sin_addr);
+ *addr = (void *) &(((struct sockaddr_in *) saddr)->sin_addr);
return FamilyInternet;
#if defined(IPv6) && defined(AF_INET6)
case AF_INET6:
@@ -1453,12 +1453,12 @@ ConvertAddr(register struct sockaddr *saddr, int *len, pointer *addr)
if (IN6_IS_ADDR_V4MAPPED(&(saddr6->sin6_addr))) {
*len = sizeof(struct in_addr);
- *addr = (pointer) &(saddr6->sin6_addr.s6_addr[12]);
+ *addr = (void *) &(saddr6->sin6_addr.s6_addr[12]);
return FamilyInternet;
}
else {
*len = sizeof(struct in6_addr);
- *addr = (pointer) &(saddr6->sin6_addr);
+ *addr = (void *) &(saddr6->sin6_addr);
return FamilyInternet6;
}
}
@@ -1505,7 +1505,7 @@ GetAccessControl(void)
* future to enable loading additional host types, but that was not done for
* the initial implementation.
*/
-typedef Bool (*siAddrMatchFunc) (int family, pointer addr, int len,
+typedef Bool (*siAddrMatchFunc) (int family, void *addr, int len,
const char *siAddr, int siAddrlen,
ClientPtr client, void *siTypePriv);
typedef int (*siCheckAddrFunc) (const char *addrString, int length,
@@ -1558,7 +1558,7 @@ siTypeAdd(const char *typeName, siAddrMatchFunc addrMatch,
/* Checks to see if a host matches a server-interpreted host entry */
static Bool
-siAddrMatch(int family, pointer addr, int len, HOST * host, ClientPtr client)
+siAddrMatch(int family, void *addr, int len, HOST * host, ClientPtr client)
{
Bool matches = FALSE;
struct siType *s;
@@ -1659,7 +1659,7 @@ siCheckAddr(const char *addrString, int length)
#endif
static Bool
-siHostnameAddrMatch(int family, pointer addr, int len,
+siHostnameAddrMatch(int family, void *addr, int len,
const char *siAddr, int siAddrLen, ClientPtr client,
void *typePriv)
{
@@ -1675,7 +1675,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
struct addrinfo *addresses;
struct addrinfo *a;
int f, hostaddrlen;
- pointer hostaddr;
+ void *hostaddr;
if (siAddrLen >= sizeof(hostname))
return FALSE;
@@ -1704,7 +1704,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
#endif
char hostname[SI_HOSTNAME_MAXLEN];
int f, hostaddrlen;
- pointer hostaddr;
+ void *hostaddr;
const char **addrlist;
if (siAddrLen >= sizeof(hostname))
@@ -1808,7 +1808,7 @@ siHostnameCheckAddr(const char *valueString, int length, void *typePriv)
#define SI_IPv6_MAXLEN INET6_ADDRSTRLEN
static Bool
-siIPv6AddrMatch(int family, pointer addr, int len,
+siIPv6AddrMatch(int family, void *addr, int len,
const char *siAddr, int siAddrlen, ClientPtr client,
void *typePriv)
{
@@ -1934,7 +1934,7 @@ siLocalCredGetId(const char *addr, int len, siLocalCredPrivPtr lcPriv, int *id)
}
static Bool
-siLocalCredAddrMatch(int family, pointer addr, int len,
+siLocalCredAddrMatch(int family, void *addr, int len,
const char *siAddr, int siAddrlen, ClientPtr client,
void *typePriv)
{
diff --git a/os/connection.c b/os/connection.c
index 162e1d9..ddf4f0a 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -760,7 +760,7 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time)
oc->output = (ConnectionOutputPtr) NULL;
oc->auth_id = None;
oc->conn_time = conn_time;
- if (!(client = NextAvailableClient((pointer) oc))) {
+ if (!(client = NextAvailableClient((void *) oc))) {
free(oc);
return NullClient;
}
@@ -798,7 +798,7 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time)
*****************/
/*ARGSUSED*/ Bool
-EstablishNewConnections(ClientPtr clientUnused, pointer closure)
+EstablishNewConnections(ClientPtr clientUnused, void *closure)
{
fd_set readyconnections; /* set of listeners that are ready */
int curconn; /* fd of listener that's ready */
@@ -1046,7 +1046,7 @@ CloseDownConnection(ClientPtr client)
CloseDownFileDescriptor(oc);
FreeOsBuffers(oc);
free(client->osPrivate);
- client->osPrivate = (pointer) NULL;
+ client->osPrivate = (void *) NULL;
if (auditTrailLevel > 1)
AuditF("client %d disconnected\n", client->index);
}
diff --git a/os/io.c b/os/io.c
index 922a8eb..cf5e8f9 100644
--- a/os/io.c
+++ b/os/io.c
@@ -481,7 +481,7 @@ ReadRequestFromClient(ClientPtr client)
oci->lenLastReq -= (sizeof(xBigReq) - sizeof(xReq));
client->req_len -= bytes_to_int32(sizeof(xBigReq) - sizeof(xReq));
}
- client->requestBuffer = (pointer) oci->bufptr;
+ client->requestBuffer = (void *) oci->bufptr;
#ifdef DEBUG_COMMUNICATION
{
xReq *req = client->requestBuffer;
@@ -809,7 +809,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
who->replyBytesRemaining -= count + padBytes;
replyinfo.startOfReply = FALSE;
replyinfo.bytesRemaining = who->replyBytesRemaining;
- CallCallbacks((&ReplyCallback), (pointer) &replyinfo);
+ CallCallbacks((&ReplyCallback), (void *) &replyinfo);
}
else if (who->clientState == ClientStateRunning && buf[0] == X_Reply) { /* start of new reply */
CARD32 replylen;
@@ -821,7 +821,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
bytesleft = (replylen * 4) + SIZEOF(xReply) - count - padBytes;
replyinfo.startOfReply = TRUE;
replyinfo.bytesRemaining = who->replyBytesRemaining = bytesleft;
- CallCallbacks((&ReplyCallback), (pointer) &replyinfo);
+ CallCallbacks((&ReplyCallback), (void *) &replyinfo);
}
}
#ifdef DEBUG_COMMUNICATION
diff --git a/os/log.c b/os/log.c
index 53b3586..792b79e 100644
--- a/os/log.c
+++ b/os/log.c
@@ -826,7 +826,7 @@ AuditF(const char *f, ...)
}
static CARD32
-AuditFlush(OsTimerPtr timer, CARD32 now, pointer arg)
+AuditFlush(OsTimerPtr timer, CARD32 now, void *arg)
{
char *prefix;
diff --git a/os/rpcauth.c b/os/rpcauth.c
index bd219ac..d60ea35 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -113,7 +113,7 @@ authdes_ezdecode(const char *inmsg, int len)
static XID rpc_id = (XID) ~0L;
static Bool
-CheckNetName(unsigned char *addr, short len, pointer closure)
+CheckNetName(unsigned char *addr, short len, void *closure)
{
return (len == strlen((char *) closure) &&
strncmp((char *) addr, (char *) closure, len) == 0);
@@ -159,7 +159,7 @@ _X_HIDDEN int
SecureRPCAdd(unsigned short data_length, const char *data, XID id)
{
if (data_length)
- AddHost((pointer) 0, FamilyNetname, data_length, data);
+ AddHost((void *) 0, FamilyNetname, data_length, data);
rpc_id = id;
return 1;
}
diff --git a/os/utils.c b/os/utils.c
index e81dc5f..6f83a08 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -490,7 +490,7 @@ GetTimeInMicros(void)
#endif
void
-AdjustWaitForDelay(pointer waitTime, unsigned long newdelay)
+AdjustWaitForDelay(void *waitTime, unsigned long newdelay)
{
static struct timeval delay_val;
struct timeval **wt = (struct timeval **) waitTime;
@@ -986,7 +986,7 @@ ProcessCommandLine(int argc, char *argv[])
/* Implement a simple-minded font authorization scheme. The authorization
name is "hp-hostname-1", the contents are simply the host name. */
int
-set_font_authorizations(char **authorizations, int *authlen, pointer client)
+set_font_authorizations(char **authorizations, int *authlen, void *client)
{
#define AUTHORIZATION_NAME "hp-hostname-1"
#if defined(TCPCONN) || defined(STREAMSCONN)
@@ -1385,7 +1385,7 @@ static struct pid {
OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */
-pointer
+void *
Popen(const char *command, const char *type)
{
struct pid *cur;
@@ -1473,7 +1473,7 @@ Popen(const char *command, const char *type)
}
/* fopen that drops privileges */
-pointer
+void *
Fopen(const char *file, const char *type)
{
FILE *iop;
@@ -1568,7 +1568,7 @@ Fopen(const char *file, const char *type)
}
int
-Pclose(pointer iop)
+Pclose(void *iop)
{
struct pid *cur, *last;
int pstat;
@@ -1605,7 +1605,7 @@ Pclose(pointer iop)
}
int
-Fclose(pointer iop)
+Fclose(void *iop)
{
#ifdef HAS_SAVED_IDS_AND_SETEUID
return fclose(iop);
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 11f1133..da509e4 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -189,13 +189,13 @@ static void timeout(void);
static void restart(void);
-static void XdmcpBlockHandler(pointer /*data */ ,
+static void XdmcpBlockHandler(void */*data */ ,
struct timeval ** /*wt */ ,
- pointer /*LastSelectMask */ );
+ void */*LastSelectMask */ );
-static void XdmcpWakeupHandler(pointer /*data */ ,
+static void XdmcpWakeupHandler(void */*data */ ,
int /*i */ ,
- pointer /*LastSelectMask */ );
+ void */*LastSelectMask */ );
/*
* Register the Manufacturer display ID
@@ -578,7 +578,7 @@ XdmcpInit(void)
strlen(defaultDisplayClass));
AccessUsingXdmcp();
RegisterBlockAndWakeupHandlers(XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
DisplayNumber = (CARD16) atoi(display);
get_xdmcp_sock();
@@ -592,7 +592,7 @@ XdmcpReset(void)
state = XDM_INIT_STATE;
if (state != XDM_OFF) {
RegisterBlockAndWakeupHandlers(XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
send_packet();
}
@@ -635,8 +635,8 @@ XdmcpCloseDisplay(int sock)
*/
/*ARGSUSED*/ static void
-XdmcpBlockHandler(pointer data, /* unused */
- struct timeval **wt, pointer pReadmask)
+XdmcpBlockHandler(void *data, /* unused */
+ struct timeval **wt, void *pReadmask)
{
fd_set *LastSelectMask = (fd_set *) pReadmask;
CARD32 millisToGo;
@@ -663,8 +663,8 @@ XdmcpBlockHandler(pointer data, /* unused */
*/
/*ARGSUSED*/ static void
-XdmcpWakeupHandler(pointer data, /* unused */
- int i, pointer pReadmask)
+XdmcpWakeupHandler(void *data, /* unused */
+ int i, void *pReadmask)
{
fd_set *LastSelectMask = (fd_set *) pReadmask;
fd_set devicesReadable;
diff --git a/present/present.c b/present/present.c
index 30cd3b9..73d5f69 100644
--- a/present/present.c
+++ b/present/present.c
@@ -318,7 +318,7 @@ struct pixmap_visit {
};
static int
-present_set_tree_pixmap_visit(WindowPtr window, pointer data)
+present_set_tree_pixmap_visit(WindowPtr window, void *data)
{
struct pixmap_visit *visit = data;
ScreenPtr screen = window->drawable.pScreen;
diff --git a/present/present_event.c b/present/present_event.c
index f0d509e..ff57eba 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -29,7 +29,7 @@
RESTYPE present_event_type;
static int
-present_free_event(pointer data, XID id)
+present_free_event(void *data, XID id)
{
present_event_ptr present_event = (present_event_ptr) data;
present_window_priv_ptr window_priv = present_window_priv(present_event->window);
@@ -41,7 +41,7 @@ present_free_event(pointer data, XID id)
break;
}
}
- free((pointer) present_event);
+ free((void *) present_event);
return 1;
}
@@ -229,7 +229,7 @@ present_select_input(ClientPtr client, XID eid, WindowPtr window, CARD32 mask)
event->next = window_priv->events;
window_priv->events = event;
- if (!AddResource(event->id, present_event_type, (pointer) event))
+ if (!AddResource(event->id, present_event_type, (void *) event))
return BadAlloc;
return Success;
diff --git a/present/present_fake.c b/present/present_fake.c
index e550e98..4985c81 100644
--- a/present/present_fake.c
+++ b/present/present_fake.c
@@ -58,7 +58,7 @@ present_fake_notify(ScreenPtr screen, uint64_t event_id)
static CARD32
present_fake_do_timer(OsTimerPtr timer,
CARD32 time,
- pointer arg)
+ void *arg)
{
present_fake_vblank_ptr fake_vblank = arg;
diff --git a/present/present_request.c b/present/present_request.c
index 1064dcb..835890d 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -89,7 +89,7 @@ proc_present_pixmap(ClientPtr client)
ret = dixLookupWindow(&window, stuff->window, client, DixWriteAccess);
if (ret != Success)
return ret;
- ret = dixLookupResourceByType((pointer *) &pixmap, stuff->pixmap, RT_PIXMAP, client, DixReadAccess);
+ ret = dixLookupResourceByType((void **) &pixmap, stuff->pixmap, RT_PIXMAP, client, DixReadAccess);
if (ret != Success)
return ret;
diff --git a/randr/randr.c b/randr/randr.c
index 3c51427..3c97714 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -60,7 +60,7 @@ DevPrivateKeyRec RRClientPrivateKeyRec;
DevPrivateKeyRec rrPrivKeyRec;
static void
-RRClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+RRClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -338,7 +338,7 @@ RRScreenInit(ScreenPtr pScreen)
}
/*ARGSUSED*/ static int
-RRFreeClient(pointer data, XID id)
+RRFreeClient(void *data, XID id)
{
RREventPtr pRREvent;
WindowPtr pWin;
@@ -346,7 +346,7 @@ RRFreeClient(pointer data, XID id)
pRREvent = (RREventPtr) data;
pWin = pRREvent->window;
- dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
RREventType, serverClient, DixDestroyAccess);
if (pHead) {
pPrev = 0;
@@ -359,12 +359,12 @@ RRFreeClient(pointer data, XID id)
*pHead = pRREvent->next;
}
}
- free((pointer) pRREvent);
+ free((void *) pRREvent);
return 1;
}
/*ARGSUSED*/ static int
-RRFreeEvents(pointer data, XID id)
+RRFreeEvents(void *data, XID id)
{
RREventPtr *pHead, pCur, pNext;
@@ -372,9 +372,9 @@ RRFreeEvents(pointer data, XID id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource(pCur->clientResource, RRClientType);
- free((pointer) pCur);
+ free((void *) pCur);
}
- free((pointer) pHead);
+ free((void *) pHead);
return 1;
}
@@ -447,7 +447,7 @@ RRDeliverResourceEvent(ClientPtr client, WindowPtr pWin)
}
static int
-TellChanged(WindowPtr pWin, pointer value)
+TellChanged(WindowPtr pWin, void *value)
{
RREventPtr *pHead, pRREvent;
ClientPtr client;
@@ -458,7 +458,7 @@ TellChanged(WindowPtr pWin, pointer value)
rrScrPriv(pScreen);
int i;
- dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
RREventType, serverClient, DixReadAccess);
if (!pHead)
return WT_WALKCHILDREN;
@@ -589,7 +589,7 @@ RRTellChanged(ScreenPtr pScreen)
pScrPriv->changed = FALSE;
mastersp->changed = FALSE;
- WalkTree(master, TellChanged, (pointer) master);
+ WalkTree(master, TellChanged, (void *) master);
mastersp->resourcesChanged = FALSE;
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 15299fd..e142232 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -92,7 +92,7 @@ struct _rrPropertyValue {
Atom type; /* ignored by server */
short format; /* format of data for swapping - 8,16,32 */
long size; /* size of data in (format/8) bytes */
- pointer data; /* private to client */
+ void *data; /* private to client */
};
struct _rrProperty {
@@ -385,7 +385,7 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType;
#define VERIFY_RR_OUTPUT(id, ptr, a)\
{\
- int rc = dixLookupResourceByType((pointer *)&(ptr), id,\
+ int rc = dixLookupResourceByType((void **)&(ptr), id,\
RROutputType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
@@ -395,7 +395,7 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType;
#define VERIFY_RR_CRTC(id, ptr, a)\
{\
- int rc = dixLookupResourceByType((pointer *)&(ptr), id,\
+ int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRCrtcType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
@@ -405,7 +405,7 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType;
#define VERIFY_RR_MODE(id, ptr, a)\
{\
- int rc = dixLookupResourceByType((pointer *)&(ptr), id,\
+ int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRModeType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
@@ -415,7 +415,7 @@ extern _X_EXPORT RESTYPE RRCrtcType, RRModeType, RROutputType, RRProviderType;
#define VERIFY_RR_PROVIDER(id, ptr, a)\
{\
- int rc = dixLookupResourceByType((pointer *)&(ptr), id,\
+ int rc = dixLookupResourceByType((void **)&(ptr), id,\
RRProviderType, client, a);\
if (rc != Success) {\
client->errorValue = id;\
@@ -871,7 +871,7 @@ extern _X_EXPORT int
RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
int format, int mode, unsigned long len,
- pointer value, Bool sendevent, Bool pending);
+ void *value, Bool sendevent, Bool pending);
extern _X_EXPORT int
@@ -948,7 +948,7 @@ extern _X_EXPORT void
extern _X_EXPORT int
RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
int format, int mode, unsigned long len,
- pointer value, Bool sendevent, Bool pending);
+ void *value, Bool sendevent, Bool pending);
extern _X_EXPORT int
RRConfigureProviderProperty(RRProviderPtr provider, Atom property,
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 99b3dca..df1e3f1 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -95,7 +95,7 @@ RRCrtcCreate(ScreenPtr pScreen, void *devPrivate)
pixman_f_transform_init_identity(&crtc->f_transform);
pixman_f_transform_init_identity(&crtc->f_inverse);
- if (!AddResource(crtc->id, RRCrtcType, (pointer) crtc))
+ if (!AddResource(crtc->id, RRCrtcType, (void *) crtc))
return NULL;
/* attach the screen and crtc together */
@@ -654,7 +654,7 @@ RRCrtcDestroy(RRCrtcPtr crtc)
}
static int
-RRCrtcDestroyResource(pointer value, XID pid)
+RRCrtcDestroyResource(void *value, XID pid)
{
RRCrtcPtr crtc = (RRCrtcPtr) value;
ScreenPtr pScreen = crtc->pScreen;
@@ -1026,7 +1026,7 @@ ProcRRSetCrtcConfig(ClientPtr client)
outputIds = (RROutput *) (stuff + 1);
for (i = 0; i < numOutputs; i++) {
- ret = dixLookupResourceByType((pointer *) (outputs + i), outputIds[i],
+ ret = dixLookupResourceByType((void **) (outputs + i), outputIds[i],
RROutputType, client, DixSetAttrAccess);
if (ret != Success) {
free(outputs);
diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c
index 7fbc9f0..b9346d3 100644
--- a/randr/rrdispatch.c
+++ b/randr/rrdispatch.c
@@ -83,7 +83,7 @@ ProcRRSelectInput(ClientPtr client)
rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
if (rc != Success)
return rc;
- rc = dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ rc = dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
RREventType, client, DixWriteAccess);
if (rc != Success && rc != BadValue)
return rc;
@@ -120,7 +120,7 @@ ProcRRSelectInput(ClientPtr client)
*/
clientResource = FakeClientID(client->index);
pRREvent->clientResource = clientResource;
- if (!AddResource(clientResource, RRClientType, (pointer) pRREvent))
+ if (!AddResource(clientResource, RRClientType, (void *) pRREvent))
return BadAlloc;
/*
* create a resource to contain a pointer to the list
@@ -132,7 +132,7 @@ ProcRRSelectInput(ClientPtr client)
pHead = (RREventPtr *) malloc(sizeof(RREventPtr));
if (!pHead ||
!AddResource(pWin->drawable.id, RREventType,
- (pointer) pHead)) {
+ (void *) pHead)) {
FreeResource(clientResource, RT_NONE);
return BadAlloc;
}
diff --git a/randr/rrmode.c b/randr/rrmode.c
index f5d3f9e..befac47 100644
--- a/randr/rrmode.c
+++ b/randr/rrmode.c
@@ -89,7 +89,7 @@ RRModeCreate(xRRModeInfo * modeInfo, const char *name, ScreenPtr userScreen)
}
mode->mode.id = FakeClientID(0);
- if (!AddResource(mode->mode.id, RRModeType, (pointer) mode)) {
+ if (!AddResource(mode->mode.id, RRModeType, (void *) mode)) {
free(newModes);
return NULL;
}
@@ -250,7 +250,7 @@ RRModeDestroy(RRModePtr mode)
}
static int
-RRModeDestroyResource(pointer value, XID pid)
+RRModeDestroyResource(void *value, XID pid)
{
RRModeDestroy((RRModePtr) value);
return 1;
diff --git a/randr/rroutput.c b/randr/rroutput.c
index 2b0b82f..f824f50 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -97,7 +97,7 @@ RROutputCreate(ScreenPtr pScreen,
output->changed = FALSE;
output->devPrivate = devPrivate;
- if (!AddResource(output->id, RROutputType, (pointer) output))
+ if (!AddResource(output->id, RROutputType, (void *) output))
return NULL;
pScrPriv->outputs[pScrPriv->numOutputs++] = output;
@@ -337,7 +337,7 @@ RROutputDestroy(RROutputPtr output)
}
static int
-RROutputDestroyResource(pointer value, XID pid)
+RROutputDestroyResource(void *value, XID pid)
{
RROutputPtr output = (RROutputPtr) value;
ScreenPtr pScreen = output->pScreen;
diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 67b5467..e385e15 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -30,7 +30,7 @@ DeliverPropertyEvent(WindowPtr pWin, void *value)
xRROutputPropertyNotifyEvent *event = value;
RREventPtr *pHead, pRREvent;
- dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
RREventType, serverClient, DixReadAccess);
if (!pHead)
return WT_WALKCHILDREN;
@@ -135,7 +135,7 @@ RRDeleteOutputProperty(RROutputPtr output, Atom property)
int
RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
int format, int mode, unsigned long len,
- pointer value, Bool sendevent, Bool pending)
+ void *value, Bool sendevent, Bool pending)
{
RRPropertyPtr prop;
rrScrPrivPtr pScrPriv = rrGetScrPriv(output->pScreen);
@@ -178,10 +178,10 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
total_len = prop_value->size + len;
if (mode == PropModeReplace || len > 0) {
- pointer new_data = NULL, old_data = NULL;
+ void *new_data = NULL, *old_data = NULL;
total_size = total_len * size_in_bytes;
- new_value.data = (pointer) malloc(total_size);
+ new_value.data = (void *) malloc(total_size);
if (!new_value.data && total_size) {
if (add)
RRDestroyOutputProperty(prop);
@@ -197,13 +197,13 @@ RRChangeOutputProperty(RROutputPtr output, Atom property, Atom type,
old_data = NULL;
break;
case PropModeAppend:
- new_data = (pointer) (((char *) new_value.data) +
+ new_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
old_data = new_value.data;
break;
case PropModePrepend:
new_data = new_value.data;
- old_data = (pointer) (((char *) new_value.data) +
+ old_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
break;
}
@@ -538,7 +538,7 @@ ProcRRChangeOutputProperty(ClientPtr client)
err = RRChangeOutputProperty(output, stuff->property,
stuff->type, (int) format,
- (int) mode, len, (pointer) &stuff[1], TRUE,
+ (int) mode, len, (void *) &stuff[1], TRUE,
TRUE);
if (err != Success)
return err;
diff --git a/randr/rrprovider.c b/randr/rrprovider.c
index 2334ad2..3ce7d75 100644
--- a/randr/rrprovider.c
+++ b/randr/rrprovider.c
@@ -365,7 +365,7 @@ RRProviderCreate(ScreenPtr pScreen, const char *name,
provider->name[nameLength] = '\0';
provider->changed = FALSE;
- if (!AddResource (provider->id, RRProviderType, (pointer) provider))
+ if (!AddResource (provider->id, RRProviderType, (void *) provider))
return NULL;
pScrPriv->provider = provider;
return provider;
@@ -387,7 +387,7 @@ RRProviderSetCapabilities(RRProviderPtr provider, uint32_t capabilities)
}
static int
-RRProviderDestroyResource (pointer value, XID pid)
+RRProviderDestroyResource (void *value, XID pid)
{
RRProviderPtr provider = (RRProviderPtr)value;
ScreenPtr pScreen = provider->pScreen;
diff --git a/randr/rrproviderproperty.c b/randr/rrproviderproperty.c
index ab601da..ff2c614 100644
--- a/randr/rrproviderproperty.c
+++ b/randr/rrproviderproperty.c
@@ -30,7 +30,7 @@ DeliverPropertyEvent(WindowPtr pWin, void *value)
xRRProviderPropertyNotifyEvent *event = value;
RREventPtr *pHead, pRREvent;
- dixLookupResourceByType((pointer *) &pHead, pWin->drawable.id,
+ dixLookupResourceByType((void **) &pHead, pWin->drawable.id,
RREventType, serverClient, DixReadAccess);
if (!pHead)
return WT_WALKCHILDREN;
@@ -135,7 +135,7 @@ RRDeleteProviderProperty(RRProviderPtr provider, Atom property)
int
RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
int format, int mode, unsigned long len,
- pointer value, Bool sendevent, Bool pending)
+ void *value, Bool sendevent, Bool pending)
{
RRPropertyPtr prop;
rrScrPrivPtr pScrPriv = rrGetScrPriv(provider->pScreen);
@@ -178,10 +178,10 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
total_len = prop_value->size + len;
if (mode == PropModeReplace || len > 0) {
- pointer new_data = NULL, old_data = NULL;
+ void *new_data = NULL, *old_data = NULL;
total_size = total_len * size_in_bytes;
- new_value.data = (pointer) malloc(total_size);
+ new_value.data = (void *) malloc(total_size);
if (!new_value.data && total_size) {
if (add)
RRDestroyProviderProperty(prop);
@@ -197,13 +197,13 @@ RRChangeProviderProperty(RRProviderPtr provider, Atom property, Atom type,
old_data = NULL;
break;
case PropModeAppend:
- new_data = (pointer) (((char *) new_value.data) +
+ new_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
old_data = new_value.data;
break;
case PropModePrepend:
new_data = new_value.data;
- old_data = (pointer) (((char *) new_value.data) +
+ old_data = (void *) (((char *) new_value.data) +
(prop_value->size * size_in_bytes));
break;
}
@@ -534,7 +534,7 @@ ProcRRChangeProviderProperty(ClientPtr client)
err = RRChangeProviderProperty(provider, stuff->property,
stuff->type, (int) format,
- (int) mode, len, (pointer) &stuff[1], TRUE,
+ (int) mode, len, (void *) &stuff[1], TRUE,
TRUE);
if (err != Success)
return err;
diff --git a/record/record.c b/record/record.c
index 2c70460..8217a44 100644
--- a/record/record.c
+++ b/record/record.c
@@ -130,13 +130,13 @@ static int numEnabledRCAPs;
* returns an error.
*/
#define VERIFY_CONTEXT(_pContext, _contextid, _client) { \
- int rc = dixLookupResourceByType((pointer *)&(_pContext), _contextid, \
+ int rc = dixLookupResourceByType((void **)&(_pContext), _contextid, \
RTContext, _client, DixUseAccess); \
if (rc != Success) \
return rc; \
}
-static int RecordDeleteContext(pointer /*value */ ,
+static int RecordDeleteContext(void */*value */ ,
XID /*id */
);
@@ -232,7 +232,7 @@ RecordFindContextOnAllContexts(RecordContextPtr pContext)
*/
static void
RecordFlushReplyBuffer(RecordContextPtr pContext,
- pointer data1, int len1, pointer data2, int len2)
+ void *data1, int len1, void *data2, int len2)
{
if (!pContext->pRecordingClient || pContext->pRecordingClient->clientGone ||
pContext->inFlush)
@@ -279,7 +279,7 @@ RecordFlushReplyBuffer(RecordContextPtr pContext,
*/
static void
RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient,
- int category, pointer data, int datalen, int padlen,
+ int category, void *data, int datalen, int padlen,
int futurelen)
{
CARD32 elemHeaderData[2];
@@ -390,8 +390,8 @@ RecordAProtocolElement(RecordContextPtr pContext, ClientPtr pClient,
}
}
else {
- RecordFlushReplyBuffer(pContext, (pointer) elemHeaderData,
- numElemHeaders, (pointer) data,
+ RecordFlushReplyBuffer(pContext, (void *) elemHeaderData,
+ numElemHeaders, (void *) data,
datalen - padlen);
}
} /* RecordAProtocolElement */
@@ -463,20 +463,20 @@ RecordABigRequest(RecordContextPtr pContext, ClientPtr client, xReq * stuff)
/* record the request header */
bytesLeft = client->req_len << 2;
RecordAProtocolElement(pContext, client, XRecordFromClient,
- (pointer) stuff, SIZEOF(xReq), 0, bytesLeft);
+ (void *) stuff, SIZEOF(xReq), 0, bytesLeft);
/* reinsert the extended length field that was squished out */
bigLength = client->req_len + bytes_to_int32(sizeof(bigLength));
if (client->swapped)
swapl(&bigLength);
RecordAProtocolElement(pContext, client, XRecordFromClient,
- (pointer) &bigLength, sizeof(bigLength), 0,
+ (void *) &bigLength, sizeof(bigLength), 0,
/* continuation */ -1);
bytesLeft -= sizeof(bigLength);
/* record the rest of the request after the length */
RecordAProtocolElement(pContext, client, XRecordFromClient,
- (pointer) (stuff + 1), bytesLeft, 0,
+ (void *) (stuff + 1), bytesLeft, 0,
/* continuation */ -1);
} /* RecordABigRequest */
@@ -520,7 +520,7 @@ RecordARequest(ClientPtr client)
RecordABigRequest(pContext, client, stuff);
else
RecordAProtocolElement(pContext, client, XRecordFromClient,
- (pointer) stuff,
+ (void *) stuff,
client->req_len << 2, 0, 0);
}
else { /* extension, check minor opcode */
@@ -543,7 +543,7 @@ RecordARequest(ClientPtr client)
else
RecordAProtocolElement(pContext, client,
XRecordFromClient,
- (pointer) stuff,
+ (void *) stuff,
client->req_len << 2, 0, 0);
break;
}
@@ -576,7 +576,7 @@ RecordARequest(ClientPtr client)
* chunk of data belonging to this reply, it is set to 0.
*/
static void
-RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
+RecordAReply(CallbackListPtr *pcbl, void *nulldata, void *calldata)
{
RecordContextPtr pContext;
RecordClientsAndProtocolPtr pRCAP;
@@ -592,7 +592,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
if (pContext->continuedReply) {
RecordAProtocolElement(pContext, client, XRecordFromServer,
- (pointer) pri->replyData,
+ (void *) pri->replyData,
pri->dataLenBytes, pri->padBytes,
/* continuation */ -1);
if (!pri->bytesRemaining)
@@ -602,7 +602,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
RecordIsMemberOfSet(pRCAP->pReplyMajorOpSet, majorop)) {
if (majorop <= 127) { /* core reply */
RecordAProtocolElement(pContext, client, XRecordFromServer,
- (pointer) pri->replyData,
+ (void *) pri->replyData,
pri->dataLenBytes, 0,
pri->bytesRemaining);
if (pri->bytesRemaining)
@@ -625,7 +625,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
minorop)) {
RecordAProtocolElement(pContext, client,
XRecordFromServer,
- (pointer) pri->replyData,
+ (void *) pri->replyData,
pri->dataLenBytes, 0,
pri->bytesRemaining);
if (pri->bytesRemaining)
@@ -655,8 +655,8 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
* it for this client.
*/
static void
-RecordADeliveredEventOrError(CallbackListPtr *pcbl, pointer nulldata,
- pointer calldata)
+RecordADeliveredEventOrError(CallbackListPtr *pcbl, void *nulldata,
+ void *calldata)
{
EventInfoRec *pei = (EventInfoRec *) calldata;
RecordContextPtr pContext;
@@ -766,7 +766,7 @@ RecordSendProtocolEvents(RecordClientsAndProtocolPtr pRCAP,
* it for this client.
*/
static void
-RecordADeviceEvent(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
+RecordADeviceEvent(CallbackListPtr *pcbl, void *nulldata, void *calldata)
{
DeviceEventInfoRec *pei = (DeviceEventInfoRec *) calldata;
RecordContextPtr pContext;
@@ -812,7 +812,7 @@ RecordADeviceEvent(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
*/
static void
RecordFlushAllContexts(CallbackListPtr *pcbl,
- pointer nulldata, pointer calldata)
+ void *nulldata, void *calldata)
{
int eci; /* enabled context index */
RecordContextPtr pContext;
@@ -1143,7 +1143,7 @@ RecordSanityCheckClientSpecifiers(ClientPtr client, XID *clientspecs,
int i;
int clientIndex;
int rc;
- pointer value;
+ void *value;
for (i = 0; i < nspecs; i++) {
if (clientspecs[i] == XRecordCurrentClients ||
@@ -1880,7 +1880,7 @@ ProcRecordCreateContext(ClientPtr client)
return Success;
}
else {
- RecordDeleteContext((pointer) pContext, pContext->id);
+ RecordDeleteContext((void *) pContext, pContext->id);
return BadAlloc;
}
bailout:
@@ -2416,7 +2416,7 @@ ProcRecordDisableContext(ClientPtr client)
* it from the ppAllContexts array.
*/
static int
-RecordDeleteContext(pointer value, XID id)
+RecordDeleteContext(void *value, XID id)
{
int i;
RecordContextPtr pContext = (RecordContextPtr) value;
@@ -2535,7 +2535,7 @@ SProcRecordCreateContext(ClientPtr client)
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xRecordCreateContextReq);
- if ((status = SwapCreateRegister((pointer) stuff)) != Success)
+ if ((status = SwapCreateRegister((void *) stuff)) != Success)
return status;
return ProcRecordCreateContext(client);
} /* SProcRecordCreateContext */
@@ -2548,7 +2548,7 @@ SProcRecordRegisterClients(ClientPtr client)
swaps(&stuff->length);
REQUEST_AT_LEAST_SIZE(xRecordRegisterClientsReq);
- if ((status = SwapCreateRegister((pointer) stuff)) != Success)
+ if ((status = SwapCreateRegister((void *) stuff)) != Success)
return status;
return ProcRecordRegisterClients(client);
} /* SProcRecordRegisterClients */
@@ -2664,7 +2664,7 @@ RecordConnectionSetupInfo(RecordContextPtr pContext, NewClientInfoRec * pci)
SwapConnSetupInfo((char *) pci->setup,
(char *) (pConnSetup + prefixsize));
RecordAProtocolElement(pContext, pci->client, XRecordClientStarted,
- (pointer) pConnSetup, prefixsize + restsize, 0,
+ (void *) pConnSetup, prefixsize + restsize, 0,
0);
free(pConnSetup);
}
@@ -2673,9 +2673,9 @@ RecordConnectionSetupInfo(RecordContextPtr pContext, NewClientInfoRec * pci)
* data in two pieces
*/
RecordAProtocolElement(pContext, pci->client, XRecordClientStarted,
- (pointer) pci->prefix, prefixsize, 0, restsize);
+ (void *) pci->prefix, prefixsize, 0, restsize);
RecordAProtocolElement(pContext, pci->client, XRecordClientStarted,
- (pointer) pci->setup, restsize, 0,
+ (void *) pci->setup, restsize, 0,
/* continuation */ -1);
}
} /* RecordConnectionSetupInfo */
@@ -2704,8 +2704,8 @@ RecordConnectionSetupInfo(RecordContextPtr pContext, NewClientInfoRec * pci)
*/
static void
-RecordAClientStateChange(CallbackListPtr *pcbl, pointer nulldata,
- pointer calldata)
+RecordAClientStateChange(CallbackListPtr *pcbl, void *nulldata,
+ void *calldata)
{
NewClientInfoRec *pci = (NewClientInfoRec *) calldata;
int i;
diff --git a/render/animcur.c b/render/animcur.c
index 038c5b9..69f9f88 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -136,7 +136,7 @@ AnimCurCursorLimits(DeviceIntPtr pDev,
static void
AnimCurScreenBlockHandler(ScreenPtr pScreen,
- pointer pTimeout, pointer pReadmask)
+ void *pTimeout, void *pReadmask)
{
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
DeviceIntPtr dev;
diff --git a/render/glyph.c b/render/glyph.c
index e1dc662..ae38121 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -97,7 +97,7 @@ GlyphUninit(ScreenPtr pScreen)
glyph = globalGlyphs[fdepth].table[i].glyph;
if (glyph && glyph != DeletedGlyph) {
if (GetGlyphPicture(glyph, pScreen)) {
- FreePicture((pointer) GetGlyphPicture(glyph, pScreen), 0);
+ FreePicture((void *) GetGlyphPicture(glyph, pScreen), 0);
SetGlyphPicture(glyph, pScreen, NULL);
}
(*ps->UnrealizeGlyph) (pScreen, glyph);
@@ -237,7 +237,7 @@ FreeGlyphPicture(GlyphPtr glyph)
ScreenPtr pScreen = screenInfo.screens[i];
if (GetGlyphPicture(glyph, pScreen))
- FreePicture((pointer) GetGlyphPicture(glyph, pScreen), 0);
+ FreePicture((void *) GetGlyphPicture(glyph, pScreen), 0);
ps = GetPictureScreenIfSet(pScreen);
if (ps)
@@ -467,7 +467,7 @@ AllocateGlyphSet(int fdepth, PictFormatPtr format)
}
int
-FreeGlyphSet(pointer value, XID gid)
+FreeGlyphSet(void *value, XID gid)
{
GlyphSetPtr glyphSet = (GlyphSetPtr) value;
@@ -678,7 +678,7 @@ miGlyphs(CARD8 op,
pDst,
xSrc + x - xDst,
ySrc + y - yDst, 0, 0, x, y, width, height);
- FreePicture((pointer) pMask, (XID) 0);
+ FreePicture((void *) pMask, (XID) 0);
(*pScreen->DestroyPixmap) (pMaskPixmap);
}
}
diff --git a/render/glyphstr.h b/render/glyphstr.h
index 7d178be..835c1a7 100644
--- a/render/glyphstr.h
+++ b/render/glyphstr.h
@@ -131,7 +131,7 @@ extern _X_EXPORT Bool
extern _X_EXPORT GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format);
extern _X_EXPORT int
- FreeGlyphSet(pointer value, XID gid);
+ FreeGlyphSet(void *value, XID gid);
#define GLYPH_HAS_GLYPH_PICTURE_ACCESSOR 1 /* used for api compat */
extern _X_EXPORT PicturePtr
diff --git a/render/mipict.c b/render/mipict.c
index 2e64b20..3959fc4 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -69,17 +69,17 @@ miDestroyPictureClip(PicturePtr pPicture)
}
int
-miChangePictureClip(PicturePtr pPicture, int type, pointer value, int n)
+miChangePictureClip(PicturePtr pPicture, int type, void *value, int n)
{
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
PictureScreenPtr ps = GetPictureScreen(pScreen);
- pointer clientClip;
+ void *clientClip;
int clientClipType;
switch (type) {
case CT_PIXMAP:
/* convert the pixmap to a region */
- clientClip = (pointer) BitmapToRegion(pScreen, (PixmapPtr) value);
+ clientClip = (void *) BitmapToRegion(pScreen, (PixmapPtr) value);
if (!clientClip)
return BadAlloc;
clientClipType = CT_REGION;
@@ -94,7 +94,7 @@ miChangePictureClip(PicturePtr pPicture, int type, pointer value, int n)
clientClipType = CT_NONE;
break;
default:
- clientClip = (pointer) RegionFromRects(n, (xRectangle *) value, type);
+ clientClip = (void *) RegionFromRects(n, (xRectangle *) value, type);
if (!clientClip)
return BadAlloc;
clientClipType = CT_REGION;
diff --git a/render/mipict.h b/render/mipict.h
index 9436228..a16dd31 100644
--- a/render/mipict.h
+++ b/render/mipict.h
@@ -57,7 +57,7 @@ extern _X_EXPORT void
miDestroyPictureClip(PicturePtr pPicture);
extern _X_EXPORT int
- miChangePictureClip(PicturePtr pPicture, int type, pointer value, int n);
+ miChangePictureClip(PicturePtr pPicture, int type, void *value, int n);
extern _X_EXPORT void
miChangePicture(PicturePtr pPicture, Mask mask);
diff --git a/render/mirect.c b/render/mirect.c
index 357d528..4e76972 100644
--- a/render/mirect.c
+++ b/render/mirect.c
@@ -156,7 +156,7 @@ miCompositeRects(CARD8 op,
rects++;
}
- FreePicture((pointer) pSrc, 0);
+ FreePicture((void *) pSrc, 0);
bail4:
FreeScratchGC(pGC);
bail3:
diff --git a/render/picture.c b/render/picture.c
index 2908b76..7da9310 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -70,7 +70,7 @@ PictureDestroyWindow(WindowPtr pWindow)
SetPictureWindow(pWindow, pPicture->pNext);
if (pPicture->id)
FreeResource(pPicture->id, PictureType);
- FreePicture((pointer) pPicture, pPicture->id);
+ FreePicture((void *) pPicture, pPicture->id);
}
pScreen->DestroyWindow = ps->DestroyWindow;
ret = (*pScreen->DestroyWindow) (pWindow);
@@ -445,7 +445,7 @@ PictureInitIndexedFormat(ScreenPtr pScreen, PictFormatPtr format)
return TRUE;
if (format->index.vid == pScreen->rootVisual) {
- dixLookupResourceByType((pointer *) &format->index.pColormap,
+ dixLookupResourceByType((void **) &format->index.pColormap,
pScreen->defColormap, RT_COLORMAP,
serverClient, DixGetAttrAccess);
}
@@ -601,7 +601,7 @@ PictureParseCmapPolicy(const char *name)
/** @see GetDefaultBytes */
static void
-GetPictureBytes(pointer value, XID id, ResourceSizePtr size)
+GetPictureBytes(void *value, XID id, ResourceSizePtr size)
{
PicturePtr picture = value;
@@ -655,7 +655,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
}
for (n = 0; n < nformats; n++) {
if (!AddResource
- (formats[n].id, PictFormatType, (pointer) (formats + n))) {
+ (formats[n].id, PictFormatType, (void *) (formats + n))) {
free(formats);
return FALSE;
}
@@ -1054,7 +1054,7 @@ ChangePicture(PicturePtr pPicture,
if (pid == None)
pAlpha = 0;
else {
- error = dixLookupResourceByType((pointer *) &pAlpha, pid,
+ error = dixLookupResourceByType((void **) &pAlpha, pid,
PictureType, client,
DixReadAccess);
if (error != Success) {
@@ -1075,7 +1075,7 @@ ChangePicture(PicturePtr pPicture,
if (pAlpha && pAlpha->pDrawable->type == DRAWABLE_PIXMAP)
pAlpha->refcnt++;
if (pPicture->alphaMap)
- FreePicture((pointer) pPicture->alphaMap, (XID) 0);
+ FreePicture((void *) pPicture->alphaMap, (XID) 0);
pPicture->alphaMap = pAlpha;
}
}
@@ -1113,7 +1113,7 @@ ChangePicture(PicturePtr pPicture,
}
else {
clipType = CT_PIXMAP;
- error = dixLookupResourceByType((pointer *) &pPixmap, pid,
+ error = dixLookupResourceByType((void **) &pPixmap, pid,
RT_PIXMAP, client,
DixReadAccess);
if (error != Success) {
@@ -1143,7 +1143,7 @@ ChangePicture(PicturePtr pPicture,
}
}
error = (*ps->ChangePictureClip) (pPicture, clipType,
- (pointer) pPixmap, 0);
+ (void *) pPixmap, 0);
break;
}
case CPGraphicsExposure:
@@ -1240,7 +1240,7 @@ SetPictureClipRects(PicturePtr pPicture,
if (!clientClip)
return BadAlloc;
result = (*ps->ChangePictureClip) (pPicture, CT_REGION,
- (pointer) clientClip, 0);
+ (void *) clientClip, 0);
if (result == Success) {
pPicture->clipOrigin.x = xOrigin;
pPicture->clipOrigin.y = yOrigin;
@@ -1276,7 +1276,7 @@ SetPictureClipRegion(PicturePtr pPicture,
clientClip = 0;
}
- result = (*ps->ChangePictureClip) (pPicture, type, (pointer) clientClip, 0);
+ result = (*ps->ChangePictureClip) (pPicture, type, (void *) clientClip, 0);
if (result == Success) {
pPicture->clipOrigin.x = xOrigin;
pPicture->clipOrigin.y = yOrigin;
@@ -1354,7 +1354,7 @@ CopyPicture(PicturePtr pSrc, Mask mask, PicturePtr pDst)
pSrc->alphaMap->pDrawable->type == DRAWABLE_PIXMAP)
pSrc->alphaMap->refcnt++;
if (pDst->alphaMap)
- FreePicture((pointer) pDst->alphaMap, (XID) 0);
+ FreePicture((void *) pDst->alphaMap, (XID) 0);
pDst->alphaMap = pSrc->alphaMap;
break;
case CPAlphaXOrigin:
@@ -1435,7 +1435,7 @@ ValidatePicture(PicturePtr pPicture)
}
int
-FreePicture(pointer value, XID pid)
+FreePicture(void *value, XID pid)
{
PicturePtr pPicture = (PicturePtr) value;
@@ -1454,7 +1454,7 @@ FreePicture(pointer value, XID pid)
PictureScreenPtr ps = GetPictureScreen(pScreen);
if (pPicture->alphaMap)
- FreePicture((pointer) pPicture->alphaMap, (XID) 0);
+ FreePicture((void *) pPicture->alphaMap, (XID) 0);
(*ps->DestroyPicture) (pPicture);
(*ps->DestroyPictureClip) (pPicture);
if (pPicture->pDrawable->type == DRAWABLE_WINDOW) {
@@ -1480,7 +1480,7 @@ FreePicture(pointer value, XID pid)
}
int
-FreePictFormat(pointer pPictFormat, XID pid)
+FreePictFormat(void *pPictFormat, XID pid)
{
return Success;
}
diff --git a/render/picturestr.h b/render/picturestr.h
index 5644f28..8c8100d 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -145,7 +145,7 @@ typedef struct _Picture {
DDXPointRec alphaOrigin;
DDXPointRec clipOrigin;
- pointer clientClip;
+ void *clientClip;
unsigned long serialNumber;
@@ -189,7 +189,7 @@ typedef struct {
typedef int (*CreatePictureProcPtr) (PicturePtr pPicture);
typedef void (*DestroyPictureProcPtr) (PicturePtr pPicture);
typedef int (*ChangePictureClipProcPtr) (PicturePtr pPicture,
- int clipType, pointer value, int n);
+ int clipType, void *value, int n);
typedef void (*DestroyPictureClipProcPtr) (PicturePtr pPicture);
typedef int (*ChangePictureTransformProcPtr) (PicturePtr pPicture,
@@ -363,7 +363,7 @@ extern _X_EXPORT RESTYPE GlyphSetType;
#define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p)
#define VERIFY_PICTURE(pPicture, pid, client, mode) {\
- int tmprc = dixLookupResourceByType((pointer)&(pPicture), pid,\
+ int tmprc = dixLookupResourceByType((void *)&(pPicture), pid,\
PictureType, client, mode);\
if (tmprc != Success)\
return tmprc;\
@@ -482,10 +482,10 @@ extern _X_EXPORT void
ValidatePicture(PicturePtr pPicture);
extern _X_EXPORT int
- FreePicture(pointer pPicture, XID pid);
+ FreePicture(void *pPicture, XID pid);
extern _X_EXPORT int
- FreePictFormat(pointer pPictFormat, XID pid);
+ FreePictFormat(void *pPictFormat, XID pid);
extern _X_EXPORT void
diff --git a/render/render.c b/render/render.c
index 51f75ae..3b7151a 100644
--- a/render/render.c
+++ b/render/render.c
@@ -220,7 +220,7 @@ typedef struct _RenderClient {
#define GetRenderClient(pClient) ((RenderClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RenderClientPrivateKey))
static void
-RenderClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+RenderClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
@@ -520,7 +520,7 @@ ProcRenderQueryPictIndexValues(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xRenderQueryPictIndexValuesReq);
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->format,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->format,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -587,7 +587,7 @@ ProcRenderCreatePicture(ClientPtr client)
if (rc != Success)
return rc;
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->format,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->format,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -604,7 +604,7 @@ ProcRenderCreatePicture(ClientPtr client)
stuff->mask, (XID *) (stuff + 1), client, &error);
if (!pPicture)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -744,7 +744,7 @@ ProcRenderTrapezoids(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -783,7 +783,7 @@ ProcRenderTriangles(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -822,7 +822,7 @@ ProcRenderTriStrip(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -861,7 +861,7 @@ ProcRenderTriFan(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -909,7 +909,7 @@ ProcRenderCreateGlyphSet(ClientPtr client)
REQUEST_SIZE_MATCH(xRenderCreateGlyphSetReq);
LEGAL_NEW_RESOURCE(stuff->gsid, client);
- rc = dixLookupResourceByType((pointer *) &format, stuff->format,
+ rc = dixLookupResourceByType((void **) &format, stuff->format,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -943,7 +943,7 @@ ProcRenderCreateGlyphSet(ClientPtr client)
glyphSet, RT_NONE, NULL, DixCreateAccess);
if (rc != Success)
return rc;
- if (!AddResource(stuff->gsid, GlyphSetType, (pointer) glyphSet))
+ if (!AddResource(stuff->gsid, GlyphSetType, (void *) glyphSet))
return BadAlloc;
return Success;
}
@@ -960,14 +960,14 @@ ProcRenderReferenceGlyphSet(ClientPtr client)
LEGAL_NEW_RESOURCE(stuff->gsid, client);
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->existing,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->existing,
GlyphSetType, client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->existing;
return rc;
}
glyphSet->refcnt++;
- if (!AddResource(stuff->gsid, GlyphSetType, (pointer) glyphSet))
+ if (!AddResource(stuff->gsid, GlyphSetType, (void *) glyphSet))
return BadAlloc;
return Success;
}
@@ -984,7 +984,7 @@ ProcRenderFreeGlyphSet(ClientPtr client)
REQUEST(xRenderFreeGlyphSetReq);
REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixDestroyAccess);
if (rc != Success) {
client->errorValue = stuff->glyphset;
@@ -1024,7 +1024,7 @@ ProcRenderAddGlyphs(ClientPtr client)
REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq);
err =
- dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixAddAccess);
if (err != Success) {
client->errorValue = stuff->glyphset;
@@ -1157,7 +1157,7 @@ ProcRenderAddGlyphs(ClientPtr client)
pSrc,
None, pDst, 0, 0, 0, 0, 0, 0, width, height);
- FreePicture((pointer) pSrc, 0);
+ FreePicture((void *) pSrc, 0);
pSrc = NULL;
FreeScratchPixmapHeader(pSrcPix);
pSrcPix = NULL;
@@ -1189,7 +1189,7 @@ ProcRenderAddGlyphs(ClientPtr client)
return Success;
bail:
if (pSrc)
- FreePicture((pointer) pSrc, 0);
+ FreePicture((void *) pSrc, 0);
if (pSrcPix)
FreeScratchPixmapHeader(pSrcPix);
for (i = 0; i < nglyphs; i++)
@@ -1216,7 +1216,7 @@ ProcRenderFreeGlyphs(ClientPtr client)
CARD32 glyph;
REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixRemoveAccess);
if (rc != Success) {
client->errorValue = stuff->glyphset;
@@ -1282,7 +1282,7 @@ ProcRenderCompositeGlyphs(ClientPtr client)
if (pSrc->pDrawable && pSrc->pDrawable->pScreen != pDst->pDrawable->pScreen)
return BadMatch;
if (stuff->maskFormat) {
- rc = dixLookupResourceByType((pointer *) &pFormat, stuff->maskFormat,
+ rc = dixLookupResourceByType((void **) &pFormat, stuff->maskFormat,
PictFormatType, client, DixReadAccess);
if (rc != Success)
return rc;
@@ -1290,7 +1290,7 @@ ProcRenderCompositeGlyphs(ClientPtr client)
else
pFormat = 0;
- rc = dixLookupResourceByType((pointer *) &glyphSet, stuff->glyphset,
+ rc = dixLookupResourceByType((void **) &glyphSet, stuff->glyphset,
GlyphSetType, client, DixUseAccess);
if (rc != Success)
return rc;
@@ -1341,7 +1341,7 @@ ProcRenderCompositeGlyphs(ClientPtr client)
if (elt->len == 0xff) {
if (buffer + sizeof(GlyphSet) < end) {
memcpy(&gs, buffer, sizeof(GlyphSet));
- rc = dixLookupResourceByType((pointer *) &glyphSet, gs,
+ rc = dixLookupResourceByType((void **) &glyphSet, gs,
GlyphSetType, client,
DixUseAccess);
if (rc != Success)
@@ -1508,7 +1508,7 @@ ProcRenderCreateCursor(ClientPtr client)
if (pSrc->format == PICT_a8r8g8b8) {
(*pScreen->GetImage) (pSrc->pDrawable,
0, 0, width, height, ZPixmap,
- 0xffffffff, (pointer) argbbits);
+ 0xffffffff, (void *) argbbits);
}
else {
PixmapPtr pPixmap;
@@ -1544,7 +1544,7 @@ ProcRenderCreateCursor(ClientPtr client)
pSrc, 0, pPicture, 0, 0, 0, 0, 0, 0, width, height);
(*pScreen->GetImage) (pPicture->pDrawable,
0, 0, width, height, ZPixmap,
- 0xffffffff, (pointer) argbbits);
+ 0xffffffff, (void *) argbbits);
FreePicture(pPicture, 0);
}
/*
@@ -1633,7 +1633,7 @@ ProcRenderCreateCursor(ClientPtr client)
&pCursor, client, stuff->cid);
if (rc != Success)
goto bail;
- if (!AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor)) {
+ if (!AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) {
rc = BadAlloc;
goto bail;
}
@@ -1799,7 +1799,7 @@ ProcRenderCreateAnimCursor(ClientPtr client)
deltas = (CARD32 *) (cursors + ncursor);
elt = (xAnimCursorElt *) (stuff + 1);
for (i = 0; i < ncursor; i++) {
- ret = dixLookupResourceByType((pointer *) (cursors + i), elt->cursor,
+ ret = dixLookupResourceByType((void **) (cursors + i), elt->cursor,
RT_CURSOR, client, DixReadAccess);
if (ret != Success) {
free(cursors);
@@ -1814,7 +1814,7 @@ ProcRenderCreateAnimCursor(ClientPtr client)
if (ret != Success)
return ret;
- if (AddResource(stuff->cid, RT_CURSOR, (pointer) pCursor))
+ if (AddResource(stuff->cid, RT_CURSOR, (void *) pCursor))
return Success;
return BadAlloc;
}
@@ -1861,7 +1861,7 @@ ProcRenderCreateSolidFill(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -1900,7 +1900,7 @@ ProcRenderCreateLinearGradient(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -1938,7 +1938,7 @@ ProcRenderCreateRadialGradient(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -1975,7 +1975,7 @@ ProcRenderCreateConicalGradient(ClientPtr client)
pPicture, RT_NONE, NULL, DixCreateAccess);
if (error != Success)
return error;
- if (!AddResource(stuff->pid, PictureType, (pointer) pPicture))
+ if (!AddResource(stuff->pid, PictureType, (void *) pPicture))
return BadAlloc;
return Success;
}
@@ -2566,7 +2566,7 @@ SProcRenderDispatch(ClientPtr client)
#ifdef PANORAMIX
#define VERIFY_XIN_PICTURE(pPicture, pid, client, mode) {\
- int rc = dixLookupResourceByType((pointer *)&(pPicture), pid,\
+ int rc = dixLookupResourceByType((void **)&(pPicture), pid,\
XRT_PICTURE, client, mode);\
if (rc != Success)\
return rc;\
@@ -2590,7 +2590,7 @@ PanoramiXRenderCreatePicture(ClientPtr client)
int result, j;
REQUEST_AT_LEAST_SIZE(xRenderCreatePictureReq);
- result = dixLookupResourceByClass((pointer *) &refDraw, stuff->drawable,
+ result = dixLookupResourceByClass((void **) &refDraw, stuff->drawable,
XRC_DRAWABLE, client, DixWriteAccess);
if (result != Success)
return (result == BadValue) ? BadDrawable : result;
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index 0947898..e171115 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -251,7 +251,7 @@ init_simple(void)
init_window(&window, &root, CLIENT_WINDOW_ID);
serverClient = &server_client;
- InitClient(serverClient, 0, (pointer) NULL);
+ InitClient(serverClient, 0, (void *) NULL);
if (!InitClientResources(serverClient)) /* for root resources */
FatalError("couldn't init server resources");
SyncExtensionInit();
diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
index f27f248..d303068 100644
--- a/test/xi2/protocol-common.h
+++ b/test/xi2/protocol-common.h
@@ -148,7 +148,7 @@ int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client,
Mask access);
int __real_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client,
Mask access);
-Bool __wrap_AddResource(XID id, RESTYPE type, pointer value);
+Bool __wrap_AddResource(XID id, RESTYPE type, void *value);
int __wrap_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
int __real_dixLookupClient(ClientPtr *c, XID id, ClientPtr client, Mask access);
diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c
index fc33aa5..bedc217 100644
--- a/test/xi2/protocol-xigetselectedevents.c
+++ b/test/xi2/protocol-xigetselectedevents.c
@@ -82,7 +82,7 @@ __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access)
/* AddResource is called from XISetSEventMask, we don't need this */
Bool
-__wrap_AddResource(XID id, RESTYPE type, pointer value)
+__wrap_AddResource(XID id, RESTYPE type, void *value)
{
return TRUE;
}
diff --git a/test/xtest.c b/test/xtest.c
index e5e5241..e9fabfb 100644
--- a/test/xtest.c
+++ b/test/xtest.c
@@ -71,7 +71,7 @@ xtest_init_devices(void)
screen.DeviceCursorCleanup = device_cursor_cleanup;
dixResetPrivates();
serverClient = &server_client;
- InitClient(serverClient, 0, (pointer) NULL);
+ InitClient(serverClient, 0, (void *) NULL);
if (!InitClientResources(serverClient)) /* for root resources */
FatalError("couldn't init server resources");
InitAtoms();
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 753d5f7..2c4b57c 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -72,7 +72,7 @@ static void deleteCursorHideCountsForScreen(ScreenPtr pScreen);
#define VERIFY_CURSOR(pCursor, cursor, client, access) \
do { \
int err; \
- err = dixLookupResourceByType((pointer *) &pCursor, cursor, \
+ err = dixLookupResourceByType((void **) &pCursor, cursor, \
RT_CURSOR, client, access); \
if (err != Success) { \
client->errorValue = cursor; \
@@ -195,7 +195,7 @@ static int
XFixesSelectCursorInput(ClientPtr pClient, WindowPtr pWindow, CARD32 eventMask)
{
CursorEventPtr *prev, e;
- pointer val;
+ void *val;
int rc;
for (prev = &cursorEvents; (e = *prev); prev = &e->next) {
@@ -228,12 +228,12 @@ XFixesSelectCursorInput(ClientPtr pClient, WindowPtr pWindow, CARD32 eventMask)
DixGetAttrAccess);
if (rc != Success)
if (!AddResource(pWindow->drawable.id, CursorWindowType,
- (pointer) pWindow)) {
+ (void *) pWindow)) {
free(e);
return BadAlloc;
}
- if (!AddResource(e->clientResource, CursorClientType, (pointer) e))
+ if (!AddResource(e->clientResource, CursorClientType, (void *) e))
return BadAlloc;
*prev = e;
@@ -568,13 +568,13 @@ SProcXFixesGetCursorImageAndName(ClientPtr client)
* whether it should be replaced with a reference to pCursor.
*/
-typedef Bool (*TestCursorFunc) (CursorPtr pOld, pointer closure);
+typedef Bool (*TestCursorFunc) (CursorPtr pOld, void *closure);
typedef struct {
RESTYPE type;
TestCursorFunc testCursor;
CursorPtr pNew;
- pointer closure;
+ void *closure;
} ReplaceCursorLookupRec, *ReplaceCursorLookupPtr;
static const RESTYPE CursorRestypes[] = {
@@ -584,7 +584,7 @@ static const RESTYPE CursorRestypes[] = {
#define NUM_CURSOR_RESTYPES (sizeof (CursorRestypes) / sizeof (CursorRestypes[0]))
static Bool
-ReplaceCursorLookup(pointer value, XID id, pointer closure)
+ReplaceCursorLookup(void *value, XID id, void *closure)
{
ReplaceCursorLookupPtr rcl = (ReplaceCursorLookupPtr) closure;
WindowPtr pWin;
@@ -626,7 +626,7 @@ ReplaceCursorLookup(pointer value, XID id, pointer closure)
}
static void
-ReplaceCursor(CursorPtr pCursor, TestCursorFunc testCursor, pointer closure)
+ReplaceCursor(CursorPtr pCursor, TestCursorFunc testCursor, void *closure)
{
int clientIndex;
int resIndex;
@@ -652,7 +652,7 @@ ReplaceCursor(CursorPtr pCursor, TestCursorFunc testCursor, pointer closure)
*/
LookupClientResourceComplex(clients[clientIndex],
rcl.type,
- ReplaceCursorLookup, (pointer) &rcl);
+ ReplaceCursorLookup, (void *) &rcl);
}
}
/* this "knows" that WindowHasNewCursor doesn't depend on it's argument */
@@ -660,7 +660,7 @@ ReplaceCursor(CursorPtr pCursor, TestCursorFunc testCursor, pointer closure)
}
static Bool
-TestForCursor(CursorPtr pCursor, pointer closure)
+TestForCursor(CursorPtr pCursor, void *closure)
{
return (pCursor == (CursorPtr) closure);
}
@@ -678,7 +678,7 @@ ProcXFixesChangeCursor(ClientPtr client)
VERIFY_CURSOR(pDestination, stuff->destination, client,
DixWriteAccess | DixSetAttrAccess);
- ReplaceCursor(pSource, TestForCursor, (pointer) pDestination);
+ ReplaceCursor(pSource, TestForCursor, (void *) pDestination);
return Success;
}
@@ -695,7 +695,7 @@ SProcXFixesChangeCursor(ClientPtr client)
}
static Bool
-TestForCursorName(CursorPtr pCursor, pointer closure)
+TestForCursorName(CursorPtr pCursor, void *closure)
{
Atom *pName = closure;
@@ -776,7 +776,7 @@ createCursorHideCount(ClientPtr pClient, ScreenPtr pScreen)
* Create a resource for this element so it can be deleted
* when the client goes away.
*/
- if (!AddResource(pChc->resource, CursorHideCountType, (pointer) pChc)) {
+ if (!AddResource(pChc->resource, CursorHideCountType, (void *) pChc)) {
free(pChc);
return BadAlloc;
}
@@ -841,7 +841,7 @@ ProcXFixesHideCursor(ClientPtr client)
REQUEST_SIZE_MATCH(xXFixesHideCursorReq);
- ret = dixLookupResourceByType((pointer *) &pWin, stuff->window, RT_WINDOW,
+ ret = dixLookupResourceByType((void **) &pWin, stuff->window, RT_WINDOW,
client, DixGetAttrAccess);
if (ret != Success) {
client->errorValue = stuff->window;
@@ -905,7 +905,7 @@ ProcXFixesShowCursor(ClientPtr client)
REQUEST_SIZE_MATCH(xXFixesShowCursorReq);
- rc = dixLookupResourceByType((pointer *) &pWin, stuff->window, RT_WINDOW,
+ rc = dixLookupResourceByType((void **) &pWin, stuff->window, RT_WINDOW,
client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->window;
@@ -946,7 +946,7 @@ SProcXFixesShowCursor(ClientPtr client)
}
static int
-CursorFreeClient(pointer data, XID id)
+CursorFreeClient(void *data, XID id)
{
CursorEventPtr old = (CursorEventPtr) data;
CursorEventPtr *prev, e;
@@ -962,7 +962,7 @@ CursorFreeClient(pointer data, XID id)
}
static int
-CursorFreeHideCount(pointer data, XID id)
+CursorFreeHideCount(void *data, XID id)
{
CursorHideCountPtr pChc = (CursorHideCountPtr) data;
ScreenPtr pScreen = pChc->pScreen;
@@ -978,7 +978,7 @@ CursorFreeHideCount(pointer data, XID id)
}
static int
-CursorFreeWindow(pointer data, XID id)
+CursorFreeWindow(void *data, XID id)
{
WindowPtr pWindow = (WindowPtr) data;
CursorEventPtr e, next;
diff --git a/xfixes/region.c b/xfixes/region.c
index 14a02ba..cc8f1a5 100644
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -35,7 +35,7 @@
RESTYPE RegionResType;
static int
-RegionResFree(pointer data, XID id)
+RegionResFree(void *data, XID id)
{
RegionPtr pRegion = (RegionPtr) data;
@@ -85,7 +85,7 @@ ProcXFixesCreateRegion(ClientPtr client)
pRegion = RegionFromRects(things, (xRectangle *) (stuff + 1), CT_UNSORTED);
if (!pRegion)
return BadAlloc;
- if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@@ -115,7 +115,7 @@ ProcXFixesCreateRegionFromBitmap(ClientPtr client)
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromBitmapReq);
LEGAL_NEW_RESOURCE(stuff->region, client);
- rc = dixLookupResourceByType((pointer *) &pPixmap, stuff->bitmap, RT_PIXMAP,
+ rc = dixLookupResourceByType((void **) &pPixmap, stuff->bitmap, RT_PIXMAP,
client, DixReadAccess);
if (rc != Success) {
client->errorValue = stuff->bitmap;
@@ -129,7 +129,7 @@ ProcXFixesCreateRegionFromBitmap(ClientPtr client)
if (!pRegion)
return BadAlloc;
- if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@@ -159,7 +159,7 @@ ProcXFixesCreateRegionFromWindow(ClientPtr client)
REQUEST_SIZE_MATCH(xXFixesCreateRegionFromWindowReq);
LEGAL_NEW_RESOURCE(stuff->region, client);
- rc = dixLookupResourceByType((pointer *) &pWin, stuff->window, RT_WINDOW,
+ rc = dixLookupResourceByType((void **) &pWin, stuff->window, RT_WINDOW,
client, DixGetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->window;
@@ -188,7 +188,7 @@ ProcXFixesCreateRegionFromWindow(ClientPtr client)
pRegion = XFixesRegionCopy(pRegion);
if (!pRegion)
return BadAlloc;
- if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@@ -238,7 +238,7 @@ ProcXFixesCreateRegionFromGC(ClientPtr client)
return BadImplementation; /* assume sane server bits */
}
- if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@@ -285,7 +285,7 @@ ProcXFixesCreateRegionFromPicture(ClientPtr client)
return BadImplementation; /* assume sane server bits */
}
- if (!AddResource(stuff->region, RegionResType, (pointer) pRegion))
+ if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
return BadAlloc;
return Success;
@@ -629,7 +629,7 @@ ProcXFixesSetGCClipRegion(ClientPtr client)
vals[1].val = stuff->yOrigin;
ChangeGC(NullClient, pGC, GCClipXOrigin | GCClipYOrigin, vals);
(*pGC->funcs->ChangeClip) (pGC, pRegion ? CT_REGION : CT_NONE,
- (pointer) pRegion, 0);
+ (void *) pRegion, 0);
return Success;
}
@@ -661,7 +661,7 @@ ProcXFixesSetWindowShapeRegion(ClientPtr client)
REQUEST(xXFixesSetWindowShapeRegionReq);
REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq);
- rc = dixLookupResourceByType((pointer *) &pWin, stuff->dest, RT_WINDOW,
+ rc = dixLookupResourceByType((void **) &pWin, stuff->dest, RT_WINDOW,
client, DixSetAttrAccess);
if (rc != Success) {
client->errorValue = stuff->dest;
diff --git a/xfixes/select.c b/xfixes/select.c
index ee8ed6f..c088ed3 100644
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -51,7 +51,7 @@ typedef struct _SelectionEvent {
static SelectionEventPtr selectionEvents;
static void
-XFixesSelectionCallback(CallbackListPtr *callbacks, pointer data, pointer args)
+XFixesSelectionCallback(CallbackListPtr *callbacks, void *data, void *args)
{
SelectionEventPtr e;
SelectionInfoRec *info = (SelectionInfoRec *) args;
@@ -119,7 +119,7 @@ static int
XFixesSelectSelectionInput(ClientPtr pClient,
Atom selection, WindowPtr pWindow, CARD32 eventMask)
{
- pointer val;
+ void *val;
int rc;
SelectionEventPtr *prev, e;
@@ -159,12 +159,12 @@ XFixesSelectSelectionInput(ClientPtr pClient,
DixGetAttrAccess);
if (rc != Success)
if (!AddResource(pWindow->drawable.id, SelectionWindowType,
- (pointer) pWindow)) {
+ (void *) pWindow)) {
free(e);
return BadAlloc;
}
- if (!AddResource(e->clientResource, SelectionClientType, (pointer) e))
+ if (!AddResource(e->clientResource, SelectionClientType, (void *) e))
return BadAlloc;
*prev = e;
@@ -222,7 +222,7 @@ SXFixesSelectionNotifyEvent(xXFixesSelectionNotifyEvent * from,
}
static int
-SelectionFreeClient(pointer data, XID id)
+SelectionFreeClient(void *data, XID id)
{
SelectionEventPtr old = (SelectionEventPtr) data;
SelectionEventPtr *prev, e;
@@ -239,7 +239,7 @@ SelectionFreeClient(pointer data, XID id)
}
static int
-SelectionFreeWindow(pointer data, XID id)
+SelectionFreeWindow(void *data, XID id)
{
WindowPtr pWindow = (WindowPtr) data;
SelectionEventPtr e, next;
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index 48af9ea..3307f87 100644
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -213,7 +213,7 @@ SProcXFixesDispatch(ClientPtr client)
}
static void
-XFixesClientCallback(CallbackListPtr *list, pointer closure, pointer data)
+XFixesClientCallback(CallbackListPtr *list, void *closure, void *data)
{
NewClientInfoRec *clientinfo = (NewClientInfoRec *) data;
ClientPtr pClient = clientinfo->client;
diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index 9882871..fdcf44f 100644
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -35,7 +35,7 @@ extern _X_EXPORT int XFixesErrorBase;
#define VERIFY_REGION(pRegion, rid, client, mode) \
do { \
int err; \
- err = dixLookupResourceByType((pointer *) &pRegion, rid, \
+ err = dixLookupResourceByType((void **) &pRegion, rid, \
RegionResType, client, mode); \
if (err != Success) { \
client->errorValue = rid; \
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index f95d0ee..caf78c9 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -113,7 +113,7 @@ _XkbDDXBeepInitAtoms(void)
}
static CARD32
-_XkbDDXBeepExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+_XkbDDXBeepExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
DeviceIntPtr dev = (DeviceIntPtr) arg;
KbdFeedbackPtr feed;
@@ -300,11 +300,11 @@ _XkbDDXBeepExpire(OsTimerPtr timer, CARD32 now, pointer arg)
ctrl->bell_duration = duration;
ctrl->bell_pitch = pitch;
if (xkbInfo->beepCount == 0) {
- XkbHandleBell(0, 0, dev, ctrl->bell, (pointer) ctrl,
+ XkbHandleBell(0, 0, dev, ctrl->bell, (void *) ctrl,
KbdFeedbackClass, name, None, NULL);
}
else if (xkbInfo->desc->ctrls->enabled_ctrls & XkbAudibleBellMask) {
- (*dev->kbdfeed->BellProc) (ctrl->bell, dev, (pointer) ctrl,
+ (*dev->kbdfeed->BellProc) (ctrl->bell, dev, (void *) ctrl,
KbdFeedbackClass);
}
ctrl->bell_duration = oldDuration;
@@ -340,11 +340,11 @@ XkbDDXAccessXBeep(DeviceIntPtr dev, unsigned what, unsigned which)
xkbInfo->beepType = what;
xkbInfo->beepCount = 0;
- next = _XkbDDXBeepExpire(NULL, 0, (pointer) dev);
+ next = _XkbDDXBeepExpire(NULL, 0, (void *) dev);
if (next > 0) {
xkbInfo->beepTimer = TimerSet(xkbInfo->beepTimer,
0, next,
- _XkbDDXBeepExpire, (pointer) dev);
+ _XkbDDXBeepExpire, (void *) dev);
}
return 1;
}
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 27e761c..31bb8d3 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -370,7 +370,7 @@ _XkbBell(ClientPtr client, DeviceIntPtr dev, WindowPtr pWin,
int percent, int forceSound, int eventOnly, Atom name)
{
int base;
- pointer ctrl;
+ void *ctrl;
int oldPitch, oldDuration;
int newPercent;
@@ -390,7 +390,7 @@ _XkbBell(ClientPtr client, DeviceIntPtr dev, WindowPtr pWin,
return BadValue;
}
base = k->ctrl.bell;
- ctrl = (pointer) &(k->ctrl);
+ ctrl = (void *) &(k->ctrl);
oldPitch = k->ctrl.bell_pitch;
oldDuration = k->ctrl.bell_duration;
if (pitch != 0) {
@@ -422,7 +422,7 @@ _XkbBell(ClientPtr client, DeviceIntPtr dev, WindowPtr pWin,
return BadValue;
}
base = b->ctrl.percent;
- ctrl = (pointer) &(b->ctrl);
+ ctrl = (void *) &(b->ctrl);
oldPitch = b->ctrl.pitch;
oldDuration = b->ctrl.duration;
if (pitch != 0) {
@@ -6820,7 +6820,7 @@ ProcXkbDispatch(ClientPtr client)
}
static int
-XkbClientGone(pointer data, XID id)
+XkbClientGone(void *data, XID id)
{
DevicePtr pXDev = (DevicePtr) data;
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 13051e0..cb4bca0 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -279,7 +279,7 @@ AccessXStickyKeysTurnOff(DeviceIntPtr dev, xkbControlsNotify * pCN)
} /* AccessXStickyKeysTurnOff */
static CARD32
-AccessXKRGExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+AccessXKRGExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
xkbControlsNotify cn;
DeviceIntPtr dev = arg;
@@ -309,7 +309,7 @@ AccessXKRGExpire(OsTimerPtr timer, CARD32 now, pointer arg)
}
static CARD32
-AccessXRepeatKeyExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+AccessXRepeatKeyExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
DeviceIntPtr dev = (DeviceIntPtr) arg;
XkbSrvInfoPtr xkbi = dev->key->xkbInfo;
@@ -331,7 +331,7 @@ AccessXCancelRepeatKey(XkbSrvInfoPtr xkbi, KeyCode key)
}
static CARD32
-AccessXSlowKeyExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+AccessXSlowKeyExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
DeviceIntPtr keybd;
XkbSrvInfoPtr xkbi;
@@ -370,7 +370,7 @@ AccessXSlowKeyExpire(OsTimerPtr timer, CARD32 now, pointer arg)
xkbi->repeatKeyTimer = TimerSet(xkbi->repeatKeyTimer,
0, ctrls->repeat_delay,
AccessXRepeatKeyExpire,
- (pointer) keybd);
+ (void *) keybd);
}
}
}
@@ -378,7 +378,7 @@ AccessXSlowKeyExpire(OsTimerPtr timer, CARD32 now, pointer arg)
}
static CARD32
-AccessXBounceKeyExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+AccessXBounceKeyExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
XkbSrvInfoPtr xkbi = ((DeviceIntPtr) arg)->key->xkbInfo;
@@ -387,7 +387,7 @@ AccessXBounceKeyExpire(OsTimerPtr timer, CARD32 now, pointer arg)
}
static CARD32
-AccessXTimeoutExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+AccessXTimeoutExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
DeviceIntPtr dev = (DeviceIntPtr) arg;
XkbSrvInfoPtr xkbi = dev->key->xkbInfo;
@@ -467,12 +467,12 @@ AccessXFilterPressEvent(DeviceEvent *event, DeviceIntPtr keybd)
if (XkbAX_NeedFeedback(ctrls, XkbAX_SlowWarnFBMask)) {
xkbi->krgTimerActive = _KRG_WARN_TIMER;
xkbi->krgTimer = TimerSet(xkbi->krgTimer, 0, 4000,
- AccessXKRGExpire, (pointer) keybd);
+ AccessXKRGExpire, (void *) keybd);
}
else {
xkbi->krgTimerActive = _KRG_TIMER;
xkbi->krgTimer = TimerSet(xkbi->krgTimer, 0, 8000,
- AccessXKRGExpire, (pointer) keybd);
+ AccessXKRGExpire, (void *) keybd);
}
if (!(ctrls->enabled_ctrls & XkbSlowKeysMask)) {
CARD32 now = GetTimeInMillis();
@@ -514,7 +514,7 @@ AccessXFilterPressEvent(DeviceEvent *event, DeviceIntPtr keybd)
xkbi->slowKey = key;
xkbi->slowKeysTimer = TimerSet(xkbi->slowKeysTimer,
0, ctrls->slow_keys_delay,
- AccessXSlowKeyExpire, (pointer) keybd);
+ AccessXSlowKeyExpire, (void *) keybd);
ignoreKeyEvent = TRUE;
}
@@ -546,7 +546,7 @@ AccessXFilterPressEvent(DeviceEvent *event, DeviceIntPtr keybd)
xkbi->repeatKeyTimer = TimerSet(xkbi->repeatKeyTimer,
0, ctrls->repeat_delay,
AccessXRepeatKeyExpire,
- (pointer) keybd);
+ (void *) keybd);
}
}
}
@@ -608,7 +608,7 @@ AccessXFilterReleaseEvent(DeviceEvent *event, DeviceIntPtr keybd)
xkbi->bounceKeysTimer = TimerSet(xkbi->bounceKeysTimer, 0,
ctrls->debounce_delay,
AccessXBounceKeyExpire,
- (pointer) keybd);
+ (void *) keybd);
}
/* Don't transmit the KeyRelease if SlowKeys is turned on and
@@ -651,7 +651,7 @@ AccessXFilterReleaseEvent(DeviceEvent *event, DeviceIntPtr keybd)
xkbi->lastPtrEventTime = 0;
xkbi->krgTimer = TimerSet(xkbi->krgTimer, 0,
ctrls->ax_timeout * 1000,
- AccessXTimeoutExpire, (pointer) keybd);
+ AccessXTimeoutExpire, (void *) keybd);
xkbi->krgTimerActive = _ALL_TIMEOUT_TIMER;
}
else if (xkbi->krgTimerActive != _OFF_TIMER) {
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index e32005c..1443498 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -51,7 +51,7 @@ static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags, int x,
int y);
void
-xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, pointer data)
+xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, void *data)
{
xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(device);
ProcessInputProc backupproc;
@@ -470,7 +470,7 @@ _XkbFilterISOLock(XkbSrvInfoPtr xkbi,
}
static CARD32
-_XkbPtrAccelExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+_XkbPtrAccelExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
XkbSrvInfoPtr xkbi = (XkbSrvInfoPtr) arg;
XkbControlsPtr ctrls = xkbi->desc->ctrls;
@@ -540,7 +540,7 @@ _XkbFilterPointerMove(XkbSrvInfoPtr xkbi,
xkbi->mouseKeysDY = XkbPtrActionY(&pAction->ptr);
xkbi->mouseKeyTimer = TimerSet(xkbi->mouseKeyTimer, 0,
xkbi->desc->ctrls->mk_delay,
- _XkbPtrAccelExpire, (pointer) xkbi);
+ _XkbPtrAccelExpire, (void *) xkbi);
}
else if (filter->keycode == keycode) {
filter->active = 0;
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 87a4485..210d8eb 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -482,7 +482,7 @@ XkbHandleBell(BOOL force,
BOOL eventOnly,
DeviceIntPtr kbd,
CARD8 percent,
- pointer pCtrl,
+ void *pCtrl,
CARD8 class, Atom name, WindowPtr pWin, ClientPtr pClient)
{
xkbBellNotify bn;
@@ -502,7 +502,7 @@ XkbHandleBell(BOOL force,
if ((force || (xkbi->desc->ctrls->enabled_ctrls & XkbAudibleBellMask)) &&
(!eventOnly)) {
if (kbd->kbdfeed->BellProc)
- (*kbd->kbdfeed->BellProc) (percent, kbd, (pointer) pCtrl, class);
+ (*kbd->kbdfeed->BellProc) (percent, kbd, (void *) pCtrl, class);
}
interest = kbd->xkb_interest;
if ((!interest) || (force))
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index ca3831c..22b971f 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -142,7 +142,7 @@ XkbFreeRMLVOSet(XkbRMLVOSet * rmlvo, Bool freeRMLVO)
}
static Bool
-XkbWriteRulesProp(ClientPtr client, pointer closure)
+XkbWriteRulesProp(ClientPtr client, void *closure)
{
int len, out;
Atom name;
commit 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 11 12:18:49 2013 -0800
Don't build dmx by default
It's clearly un-loved, having piles and piles of warnings. If someone
wants to fix it up to compile without warnings, we can re-enable it.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/configure.ac b/configure.ac
index c9f0192..234cf21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -632,7 +632,7 @@ AC_ARG_ENABLE(linux_apm, AC_HELP_STRING([--disable-linux-apm], [Disable building
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
-AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])
+AC_ARG_ENABLE(dmx, AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=no])
AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
commit 319dff750f99a28a1544bcb81d52172c641ad1ca
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 11 12:18:16 2013 -0800
hw/xfree86: nobus.c shouldn't define a static function
Having this function be static generates a compiler warning.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/os-support/bus/nobus.c b/hw/xfree86/os-support/bus/nobus.c
index dc36ecd..4872c5b 100644
--- a/hw/xfree86/os-support/bus/nobus.c
+++ b/hw/xfree86/os-support/bus/nobus.c
@@ -1,4 +1,7 @@
-static void
+void
+__noop_to_appease_ar__(void);
+
+void
__noop_to_appease_ar__(void)
{
return;
commit 7915791bac3ff609e94f355fbb637d7c570a5b32
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 11 12:17:45 2013 -0800
kdrive/ephyr; Don't redeclare monitorResolution
It's already declared in globals.h
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index 3e01a47..44ad8e2 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -85,8 +85,6 @@ static int HostXWantDamageDebug = 0;
extern EphyrKeySyms ephyrKeySyms;
-extern int monitorResolution;
-
extern Bool EphyrWantResize;
char *ephyrResName = NULL;
commit aa47a4409660634d80c3423ad49b70ca929a8756
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 11 12:16:51 2013 -0800
kdrive/ephyr: ddxUseMsg is supposed to return
I'm not sure why ephyr thinks that ddxUseMsg shouldn't return, but
it's not declared to exit.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index cf8bc90..3230e70 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -149,8 +149,6 @@ ddxUseMsg(void)
ErrorF
("-title [title] set the window title in the WM_NAME property\n");
ErrorF("\n");
-
- exit(1);
}
void
commit 86d68825c2b75ea9e10954fec00b44b33b38d8b2
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 11 11:55:01 2013 -0800
vfb: Remove unused pXWDCmap variable
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 97eccfd..ec3c47a 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -404,7 +404,6 @@ vfbInstallColormap(ColormapPtr pmap)
if (pmap != oldpmap) {
int entries;
XWDFileHeader *pXWDHeader;
- XWDColor *pXWDCmap;
VisualPtr pVisual;
Pixel *ppix;
xrgb *prgb;
@@ -419,7 +418,6 @@ vfbInstallColormap(ColormapPtr pmap)
entries = pmap->pVisual->ColormapEntries;
pXWDHeader = vfbScreens[pmap->pScreen->myNum].pXWDHeader;
- pXWDCmap = vfbScreens[pmap->pScreen->myNum].pXWDCmap;
pVisual = pmap->pVisual;
swapcopy32(pXWDHeader->visual_class, pVisual->class);
commit 7353ec7cb6fc235b03e59e35425201429c83ee72
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 11 11:32:19 2013 -0800
xfree86: Switch int10 code to stdint types
CARD32 is not type compatible with uint32_t and ends up generating a
pile of warnings. Fix this by replacing all of the CARD* types with
stdint types.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index d7594de..41e348c 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -20,12 +20,12 @@
#define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
-static CARD8 read_b(xf86Int10InfoPtr pInt, int addr);
-static CARD16 read_w(xf86Int10InfoPtr pInt, int addr);
-static CARD32 read_l(xf86Int10InfoPtr pInt, int addr);
-static void write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val);
-static void write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val);
-static void write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val);
+static uint8_t read_b(xf86Int10InfoPtr pInt, int addr);
+static uint16_t read_w(xf86Int10InfoPtr pInt, int addr);
+static uint32_t read_l(xf86Int10InfoPtr pInt, int addr);
+static void write_b(xf86Int10InfoPtr pInt, int addr, uint8_t val);
+static void write_w(xf86Int10InfoPtr pInt, int addr, uint16_t val);
+static void write_l(xf86Int10InfoPtr pInt, int addr, uint32_t val);
/*
* the emulator cannot pass a pointer to the current xf86Int10InfoRec
@@ -339,39 +339,39 @@ xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
#define VRAM(addr) ((addr >= V_RAM) && (addr < (V_RAM + VRAM_SIZE)))
#define V_ADDR_RB(addr) \
- (VRAM(addr)) ? MMIO_IN8((CARD8*)VRAM_BASE,VRAM_ADDR(addr)) \
- : *(CARD8*) V_ADDR(addr)
+ (VRAM(addr)) ? MMIO_IN8((uint8_t*)VRAM_BASE,VRAM_ADDR(addr)) \
+ : *(uint8_t*) V_ADDR(addr)
#define V_ADDR_RW(addr) \
- (VRAM(addr)) ? MMIO_IN16((CARD16*)VRAM_BASE,VRAM_ADDR(addr)) \
+ (VRAM(addr)) ? MMIO_IN16((uint16_t*)VRAM_BASE,VRAM_ADDR(addr)) \
: ldw_u((pointer)V_ADDR(addr))
#define V_ADDR_RL(addr) \
- (VRAM(addr)) ? MMIO_IN32((CARD32*)VRAM_BASE,VRAM_ADDR(addr)) \
+ (VRAM(addr)) ? MMIO_IN32((uint32_t*)VRAM_BASE,VRAM_ADDR(addr)) \
: ldl_u((pointer)V_ADDR(addr))
#define V_ADDR_WB(addr,val) \
if(VRAM(addr)) \
- MMIO_OUT8((CARD8*)VRAM_BASE,VRAM_ADDR(addr),val); \
+ MMIO_OUT8((uint8_t*)VRAM_BASE,VRAM_ADDR(addr),val); \
else \
- *(CARD8*) V_ADDR(addr) = val;
+ *(uint8_t*) V_ADDR(addr) = val;
#define V_ADDR_WW(addr,val) \
if(VRAM(addr)) \
- MMIO_OUT16((CARD16*)VRAM_BASE,VRAM_ADDR(addr),val); \
+ MMIO_OUT16((uint16_t*)VRAM_BASE,VRAM_ADDR(addr),val); \
else \
stw_u((val),(pointer)(V_ADDR(addr)));
#define V_ADDR_WL(addr,val) \
if (VRAM(addr)) \
- MMIO_OUT32((CARD32*)VRAM_BASE,VRAM_ADDR(addr),val); \
+ MMIO_OUT32((uint32_t*)VRAM_BASE,VRAM_ADDR(addr),val); \
else \
stl_u(val,(pointer)(V_ADDR(addr)));
-static CARD8
+static uint8_t
read_b(xf86Int10InfoPtr pInt, int addr)
{
return V_ADDR_RB(addr);
}
-static CARD16
+static uint16_t
read_w(xf86Int10InfoPtr pInt, int addr)
{
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
@@ -381,7 +381,7 @@ read_w(xf86Int10InfoPtr pInt, int addr)
return V_ADDR_RB(addr) | (V_ADDR_RB(addr + 1) << 8);
}
-static CARD32
+static uint32_t
read_l(xf86Int10InfoPtr pInt, int addr)
{
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
@@ -394,7 +394,7 @@ read_l(xf86Int10InfoPtr pInt, int addr)
}
static void
-write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val)
+write_b(xf86Int10InfoPtr pInt, int addr, uint8_t val)
{
V_ADDR_WB(addr, val);
}
@@ -412,7 +412,7 @@ write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
}
static void
-write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
+write_l(xf86Int10InfoPtr pInt, int addr, uint32_t val)
{
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
if (OFF(addr + 3) > 2) {
@@ -426,7 +426,7 @@ write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
}
pointer
-xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr)
+xf86int10Addr(xf86Int10InfoPtr pInt, uint32_t addr)
{
return V_ADDR(addr);
}
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 925da3c..6a83f42 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -37,12 +37,12 @@
#endif
#include <pciaccess.h>
-static int pciCfg1in(CARD16 addr, CARD32 *val);
-static int pciCfg1out(CARD16 addr, CARD32 val);
-static int pciCfg1inw(CARD16 addr, CARD16 *val);
-static int pciCfg1outw(CARD16 addr, CARD16 val);
-static int pciCfg1inb(CARD16 addr, CARD8 *val);
-static int pciCfg1outb(CARD16 addr, CARD8 val);
+static int pciCfg1in(uint16_t addr, uint32_t *val);
+static int pciCfg1out(uint16_t addr, uint32_t val);
+static int pciCfg1inw(uint16_t addr, uint16_t *val);
+static int pciCfg1outw(uint16_t addr, uint16_t val);
+static int pciCfg1inb(uint16_t addr, uint8_t *val);
+static int pciCfg1outb(uint16_t addr, uint8_t val);
#if defined (_PC)
static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);
@@ -58,13 +58,13 @@ setup_int(xf86Int10InfoPtr pInt)
return -1;
Int10Current = pInt;
}
- X86_EAX = (CARD32) pInt->ax;
- X86_EBX = (CARD32) pInt->bx;
- X86_ECX = (CARD32) pInt->cx;
- X86_EDX = (CARD32) pInt->dx;
- X86_ESI = (CARD32) pInt->si;
- X86_EDI = (CARD32) pInt->di;
- X86_EBP = (CARD32) pInt->bp;
+ X86_EAX = (uint32_t) pInt->ax;
+ X86_EBX = (uint32_t) pInt->bx;
+ X86_ECX = (uint32_t) pInt->cx;
+ X86_EDX = (uint32_t) pInt->dx;
+ X86_ESI = (uint32_t) pInt->si;
+ X86_EDI = (uint32_t) pInt->di;
+ X86_EBP = (uint32_t) pInt->bp;
X86_ESP = 0x1000;
X86_SS = pInt->stackseg >> 4;
X86_EIP = 0x0600;
@@ -86,15 +86,15 @@ void
finish_int(xf86Int10InfoPtr pInt, int sig)
{
OsReleaseSignals();
- pInt->ax = (CARD32) X86_EAX;
- pInt->bx = (CARD32) X86_EBX;
- pInt->cx = (CARD32) X86_ECX;
- pInt->dx = (CARD32) X86_EDX;
- pInt->si = (CARD32) X86_ESI;
- pInt->di = (CARD32) X86_EDI;
- pInt->es = (CARD16) X86_ES;
- pInt->bp = (CARD32) X86_EBP;
- pInt->flags = (CARD32) X86_FLAGS;
+ pInt->ax = (uint32_t) X86_EAX;
+ pInt->bx = (uint32_t) X86_EBX;
+ pInt->cx = (uint32_t) X86_ECX;
+ pInt->dx = (uint32_t) X86_EDX;
+ pInt->si = (uint32_t) X86_ESI;
+ pInt->di = (uint32_t) X86_EDI;
+ pInt->es = (uint16_t) X86_ES;
+ pInt->bp = (uint32_t) X86_EBP;
+ pInt->flags = (uint32_t) X86_FLAGS;
#if defined (_PC)
if (pInt->Flags & RESTORE_BIOS_SCRATCH)
SetResetBIOSVars(pInt, FALSE);
@@ -102,23 +102,23 @@ finish_int(xf86Int10InfoPtr pInt, int sig)
}
/* general software interrupt handler */
-CARD32
+uint32_t
getIntVect(xf86Int10InfoPtr pInt, int num)
{
return MEM_RW(pInt, num << 2) + (MEM_RW(pInt, (num << 2) + 2) << 4);
}
void
-pushw(xf86Int10InfoPtr pInt, CARD16 val)
+pushw(xf86Int10InfoPtr pInt, uint16_t val)
{
X86_ESP -= 2;
- MEM_WW(pInt, ((CARD32) X86_SS << 4) + X86_SP, val);
+ MEM_WW(pInt, ((uint32_t) X86_SS << 4) + X86_SP, val);
}
int
run_bios_int(int num, xf86Int10InfoPtr pInt)
{
- CARD32 eflags;
+ uint32_t eflags;
#ifndef _PC
/* check if bios vector is initialized */
@@ -167,7 +167,7 @@ void
dump_code(xf86Int10InfoPtr pInt)
{
int i;
- CARD32 lina = SEG_ADR((CARD32), X86_CS, IP);
+ uint32_t lina = SEG_ADR((uint32_t), X86_CS, IP);
xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_INFO, 3, "code at 0x%8.8" PRIx32 ":\n",
(unsigned) lina);
@@ -203,8 +203,8 @@ void
stack_trace(xf86Int10InfoPtr pInt)
{
int i = 0;
- unsigned long stack = SEG_ADR((CARD32), X86_SS, SP);
- unsigned long tail = (CARD32) ((X86_SS << 4) + 0x1000);
+ unsigned long stack = SEG_ADR((uint32_t), X86_SS, SP);
+ unsigned long tail = (uint32_t) ((X86_SS << 4) + 0x1000);
if (stack >= tail)
return;
@@ -222,10 +222,10 @@ stack_trace(xf86Int10InfoPtr pInt)
int
port_rep_inb(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count)
+ uint16_t port, uint32_t base, int d_f, uint32_t count)
{
register int inc = d_f ? -1 : 1;
- CARD32 dst = base;
+ uint32_t dst = base;
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_insb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
@@ -239,10 +239,10 @@ port_rep_inb(xf86Int10InfoPtr pInt,
int
port_rep_inw(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count)
+ uint16_t port, uint32_t base, int d_f, uint32_t count)
{
register int inc = d_f ? -2 : 2;
- CARD32 dst = base;
+ uint32_t dst = base;
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_insw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
@@ -256,10 +256,10 @@ port_rep_inw(xf86Int10InfoPtr pInt,
int
port_rep_inl(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count)
+ uint16_t port, uint32_t base, int d_f, uint32_t count)
{
register int inc = d_f ? -4 : 4;
- CARD32 dst = base;
+ uint32_t dst = base;
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_insl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
@@ -273,10 +273,10 @@ port_rep_inl(xf86Int10InfoPtr pInt,
int
port_rep_outb(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count)
+ uint16_t port, uint32_t base, int d_f, uint32_t count)
{
register int inc = d_f ? -1 : 1;
- CARD32 dst = base;
+ uint32_t dst = base;
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_outb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
@@ -290,10 +290,10 @@ port_rep_outb(xf86Int10InfoPtr pInt,
int
port_rep_outw(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count)
+ uint16_t port, uint32_t base, int d_f, uint32_t count)
{
register int inc = d_f ? -2 : 2;
- CARD32 dst = base;
+ uint32_t dst = base;
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_outw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
@@ -307,10 +307,10 @@ port_rep_outw(xf86Int10InfoPtr pInt,
int
port_rep_outl(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count)
+ uint16_t port, uint32_t base, int d_f, uint32_t count)
{
register int inc = d_f ? -4 : 4;
- CARD32 dst = base;
+ uint32_t dst = base;
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_outl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
@@ -322,14 +322,14 @@ port_rep_outl(xf86Int10InfoPtr pInt,
return dst - base;
}
-CARD8
-x_inb(CARD16 port)
+uint8_t
+x_inb(uint16_t port)
{
- CARD8 val;
+ uint8_t val;
if (port == 0x40) {
Int10Current->inb40time++;
- val = (CARD8) (Int10Current->inb40time >>
+ val = (uint8_t) (Int10Current->inb40time >>
((Int10Current->inb40time & 1) << 3));
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" inb(%#x) = %2.2x\n", port, val);
@@ -353,10 +353,10 @@ x_inb(CARD16 port)
return val;
}
-CARD16
-x_inw(CARD16 port)
+uint16_t
+x_inw(uint16_t port)
{
- CARD16 val;
+ uint16_t val;
if (port == 0x5c) {
struct timeval tv;
@@ -366,7 +366,7 @@ x_inw(CARD16 port)
* Approximate this by dividing by 3.
*/
X_GETTIMEOFDAY(&tv);
- val = (CARD16) (tv.tv_usec / 3);
+ val = (uint16_t) (tv.tv_usec / 3);
}
else if (!pciCfg1inw(port, &val)) {
val = pci_io_read16(Int10Current->io, port);
@@ -377,7 +377,7 @@ x_inw(CARD16 port)
}
void
-x_outb(CARD16 port, CARD8 val)
+x_outb(uint16_t port, uint8_t val)
{
if ((port == 0x43) && (val == 0)) {
struct timeval tv;
@@ -389,7 +389,7 @@ x_outb(CARD16 port, CARD8 val)
* the bottom bit as a byte select. See inb(0x40) above.
*/
X_GETTIMEOFDAY(&tv);
- Int10Current->inb40time = (CARD16) (tv.tv_usec | 1);
+ Int10Current->inb40time = (uint16_t) (tv.tv_usec | 1);
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" outb(%#x, %2.2x)\n", port, val);
#ifdef __NOT_YET__
@@ -411,7 +411,7 @@ x_outb(CARD16 port, CARD8 val)
}
void
-x_outw(CARD16 port, CARD16 val)
+x_outw(uint16_t port, uint16_t val)
{
if (!pciCfg1outw(port, val)) {
@@ -421,10 +421,10 @@ x_outw(CARD16 port, CARD16 val)
}
}
-CARD32
-x_inl(CARD16 port)
+uint32_t
+x_inl(uint16_t port)
{
- CARD32 val;
+ uint32_t val;
if (!pciCfg1in(port, &val)) {
val = pci_io_read32(Int10Current->io, port);
@@ -435,7 +435,7 @@ x_inl(CARD16 port)
}
void
-x_outl(CARD16 port, CARD32 val)
+x_outl(uint16_t port, uint32_t val)
{
if (!pciCfg1out(port, val)) {
if (PRINT_PORT && DEBUG_IO_TRACE())
@@ -444,43 +444,43 @@ x_outl(CARD16 port, CARD32 val)
}
}
-CARD8
-Mem_rb(CARD32 addr)
+uint8_t
+Mem_rb(uint32_t addr)
{
return (*Int10Current->mem->rb) (Int10Current, addr);
}
-CARD16
-Mem_rw(CARD32 addr)
+uint16_t
+Mem_rw(uint32_t addr)
{
return (*Int10Current->mem->rw) (Int10Current, addr);
}
-CARD32
-Mem_rl(CARD32 addr)
+uint32_t
+Mem_rl(uint32_t addr)
{
return (*Int10Current->mem->rl) (Int10Current, addr);
}
void
-Mem_wb(CARD32 addr, CARD8 val)
+Mem_wb(uint32_t addr, uint8_t val)
{
(*Int10Current->mem->wb) (Int10Current, addr, val);
}
void
-Mem_ww(CARD32 addr, CARD16 val)
+Mem_ww(uint32_t addr, uint16_t val)
{
(*Int10Current->mem->ww) (Int10Current, addr, val);
}
void
-Mem_wl(CARD32 addr, CARD32 val)
+Mem_wl(uint32_t addr, uint32_t val)
{
(*Int10Current->mem->wl) (Int10Current, addr, val);
}
-static CARD32 PciCfg1Addr = 0;
+static uint32_t PciCfg1Addr = 0;
#define PCI_DOM_FROM_TAG(tag) (((tag) >> 24) & (PCI_DOM_MASK))
#define PCI_BUS_FROM_TAG(tag) (((tag) >> 16) & (PCI_DOMBUS_MASK))
@@ -491,10 +491,10 @@ static CARD32 PciCfg1Addr = 0;
#define PCI_TAG(x) ((x) & 0x7fffff00)
static struct pci_device *
-pci_device_for_cfg_address(CARD32 addr)
+pci_device_for_cfg_address(uint32_t addr)
{
struct pci_device *dev = NULL;
- CARD32 tag = PCI_TAG(addr);
+ uint32_t tag = PCI_TAG(addr);
struct pci_slot_match slot_match = {
.domain = PCI_DOM_FROM_TAG(tag),
@@ -516,7 +516,7 @@ pci_device_for_cfg_address(CARD32 addr)
}
static int
-pciCfg1in(CARD16 addr, CARD32 *val)
+pciCfg1in(uint16_t addr, uint32_t *val)
{
if (addr == 0xCF8) {
*val = PciCfg1Addr;
@@ -534,7 +534,7 @@ pciCfg1in(CARD16 addr, CARD32 *val)
}
static int
-pciCfg1out(CARD16 addr, CARD32 val)
+pciCfg1out(uint16_t addr, uint32_t val)
{
if (addr == 0xCF8) {
PciCfg1Addr = val;
@@ -552,7 +552,7 @@ pciCfg1out(CARD16 addr, CARD32 val)
}
static int
-pciCfg1inw(CARD16 addr, CARD16 *val)
+pciCfg1inw(uint16_t addr, uint16_t *val)
{
int shift;
@@ -575,14 +575,14 @@ pciCfg1inw(CARD16 addr, CARD16 *val)
}
static int
-pciCfg1outw(CARD16 addr, CARD16 val)
+pciCfg1outw(uint16_t addr, uint16_t val)
{
int shift;
if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
shift = (addr - 0xCF8) * 8;
PciCfg1Addr &= ~(0xffff << shift);
- PciCfg1Addr |= ((CARD32) val) << shift;
+ PciCfg1Addr |= ((uint32_t) val) << shift;
return 1;
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
@@ -599,7 +599,7 @@ pciCfg1outw(CARD16 addr, CARD16 val)
}
static int
-pciCfg1inb(CARD16 addr, CARD8 *val)
+pciCfg1inb(uint16_t addr, uint8_t *val)
{
int shift;
@@ -622,14 +622,14 @@ pciCfg1inb(CARD16 addr, CARD8 *val)
}
static int
-pciCfg1outb(CARD16 addr, CARD8 val)
+pciCfg1outb(uint16_t addr, uint8_t val)
{
int shift;
if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
shift = (addr - 0xCF8) * 8;
PciCfg1Addr &= ~(0xff << shift);
- PciCfg1Addr |= ((CARD32) val) << shift;
+ PciCfg1Addr |= ((uint32_t) val) << shift;
return 1;
}
if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
@@ -645,10 +645,10 @@ pciCfg1outb(CARD16 addr, CARD8 val)
return 0;
}
-CARD8
-bios_checksum(const CARD8 *start, int size)
+uint8_t
+bios_checksum(const uint8_t *start, int size)
{
- CARD8 sum = 0;
+ uint8_t sum = 0;
while (size-- > 0)
sum += *start++;
@@ -682,12 +682,12 @@ LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
vga->save_46e8 = pci_io_read8(pInt->io, 0x46E8);
#endif
vga->save_pos102 = pci_io_read8(pInt->io, 0x0102);
- pci_io_write8(pInt->io, 0x03C2, ~(CARD8) 0x03 & vga->save_msr);
- pci_io_write8(pInt->io, 0x03C3, ~(CARD8) 0x01 & vga->save_vse);
+ pci_io_write8(pInt->io, 0x03C2, ~(uint8_t) 0x03 & vga->save_msr);
+ pci_io_write8(pInt->io, 0x03C3, ~(uint8_t) 0x01 & vga->save_vse);
#ifndef __ia64__
- pci_io_write8(pInt->io, 0x46E8, ~(CARD8) 0x08 & vga->save_46e8);
+ pci_io_write8(pInt->io, 0x46E8, ~(uint8_t) 0x08 & vga->save_46e8);
#endif
- pci_io_write8(pInt->io, 0x0102, ~(CARD8) 0x01 & vga->save_pos102);
+ pci_io_write8(pInt->io, 0x0102, ~(uint8_t) 0x01 & vga->save_pos102);
}
void
diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h
index 6d564fc..94040c5 100644
--- a/hw/xfree86/int10/xf86int10.h
+++ b/hw/xfree86/int10/xf86int10.h
@@ -21,8 +21,8 @@
/* int10 info structure */
typedef struct {
int entityIndex;
- CARD16 BIOSseg;
- CARD16 inb40time;
+ uint16_t BIOSseg;
+ uint16_t inb40time;
ScrnInfoPtr pScrn;
pointer cpuRegs;
char *BIOSScratch;
@@ -45,19 +45,19 @@ typedef struct {
} xf86Int10InfoRec, *xf86Int10InfoPtr;
typedef struct _int10Mem {
- CARD8 (*rb) (xf86Int10InfoPtr, int);
- CARD16 (*rw) (xf86Int10InfoPtr, int);
- CARD32 (*rl) (xf86Int10InfoPtr, int);
- void (*wb) (xf86Int10InfoPtr, int, CARD8);
- void (*ww) (xf86Int10InfoPtr, int, CARD16);
- void (*wl) (xf86Int10InfoPtr, int, CARD32);
+ uint8_t (*rb) (xf86Int10InfoPtr, int);
+ uint16_t (*rw) (xf86Int10InfoPtr, int);
+ uint32_t (*rl) (xf86Int10InfoPtr, int);
+ void (*wb) (xf86Int10InfoPtr, int, uint8_t);
+ void (*ww) (xf86Int10InfoPtr, int, uint16_t);
+ void (*wl) (xf86Int10InfoPtr, int, uint32_t);
} int10MemRec, *int10MemPtr;
typedef struct {
- CARD8 save_msr;
- CARD8 save_pos102;
- CARD8 save_vse;
- CARD8 save_46e8;
+ uint8_t save_msr;
+ uint8_t save_pos102;
+ uint8_t save_vse;
+ uint8_t save_46e8;
} legacyVGARec, *legacyVGAPtr;
/* OS dependent functions */
@@ -69,7 +69,7 @@ extern _X_EXPORT void *xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num,
int *off);
extern _X_EXPORT void xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase,
int num);
-extern _X_EXPORT pointer xf86int10Addr(xf86Int10InfoPtr pInt, CARD32 addr);
+extern _X_EXPORT pointer xf86int10Addr(xf86Int10InfoPtr pInt, uint32_t addr);
/* x86 executor related functions */
extern _X_EXPORT void xf86ExecX86int10(xf86Int10InfoPtr pInt);
@@ -127,13 +127,13 @@ int int_handler(xf86Int10InfoPtr pInt);
/* helper_exec.c */
int setup_int(xf86Int10InfoPtr pInt);
void finish_int(xf86Int10InfoPtr, int sig);
-CARD32 getIntVect(xf86Int10InfoPtr pInt, int num);
-void pushw(xf86Int10InfoPtr pInt, CARD16 val);
+uint32_t getIntVect(xf86Int10InfoPtr pInt, int num);
+void pushw(xf86Int10InfoPtr pInt, uint16_t val);
int run_bios_int(int num, xf86Int10InfoPtr pInt);
void dump_code(xf86Int10InfoPtr pInt);
void dump_registers(xf86Int10InfoPtr pInt);
void stack_trace(xf86Int10InfoPtr pInt);
-CARD8 bios_checksum(const CARD8 *start, int size);
+uint8_t bios_checksum(const uint8_t *start, int size);
void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
@@ -142,31 +142,31 @@ extern _X_EXPORT void xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt,
Bool save);
#endif
int port_rep_inb(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count);
+ uint16_t port, uint32_t base, int d_f, uint32_t count);
int port_rep_inw(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count);
+ uint16_t port, uint32_t base, int d_f, uint32_t count);
int port_rep_inl(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count);
+ uint16_t port, uint32_t base, int d_f, uint32_t count);
int port_rep_outb(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count);
+ uint16_t port, uint32_t base, int d_f, uint32_t count);
int port_rep_outw(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count);
+ uint16_t port, uint32_t base, int d_f, uint32_t count);
int port_rep_outl(xf86Int10InfoPtr pInt,
- CARD16 port, CARD32 base, int d_f, CARD32 count);
-
-CARD8 x_inb(CARD16 port);
-CARD16 x_inw(CARD16 port);
-void x_outb(CARD16 port, CARD8 val);
-void x_outw(CARD16 port, CARD16 val);
-CARD32 x_inl(CARD16 port);
-void x_outl(CARD16 port, CARD32 val);
-
-CARD8 Mem_rb(CARD32 addr);
-CARD16 Mem_rw(CARD32 addr);
-CARD32 Mem_rl(CARD32 addr);
-void Mem_wb(CARD32 addr, CARD8 val);
-void Mem_ww(CARD32 addr, CARD16 val);
-void Mem_wl(CARD32 addr, CARD32 val);
+ uint16_t port, uint32_t base, int d_f, uint32_t count);
+
+uint8_t x_inb(uint16_t port);
+uint16_t x_inw(uint16_t port);
+void x_outb(uint16_t port, uint8_t val);
+void x_outw(uint16_t port, uint16_t val);
+uint32_t x_inl(uint16_t port);
+void x_outl(uint16_t port, uint32_t val);
+
+uint8_t Mem_rb(uint32_t addr);
+uint16_t Mem_rw(uint32_t addr);
+uint32_t Mem_rl(uint32_t addr);
+void Mem_wb(uint32_t addr, uint8_t val);
+void Mem_ww(uint32_t addr, uint16_t val);
+void Mem_wl(uint32_t addr, uint32_t val);
/* helper_mem.c */
void setup_int_vect(xf86Int10InfoPtr pInt);
diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c
index 0f8737b..b9a4d36 100644
--- a/hw/xfree86/int10/xf86x86emu.c
+++ b/hw/xfree86/int10/xf86x86emu.c
@@ -50,12 +50,12 @@ xf86Int10ExecSetup(xf86Int10InfoPtr pInt)
X86EMU_intrFuncs intFuncs[256];
X86EMU_pioFuncs pioFuncs = {
- (&x_inb),
- (&x_inw),
- (&x_inl),
- (&x_outb),
- (&x_outw),
- (&x_outl)
+ .inb = x_inb,
+ .inw = x_inw,
+ .inl = x_inl,
+ .outb = x_outb,
+ .outw = x_outw,
+ .outl = x_outl
};
X86EMU_memFuncs memFuncs = {
commit 93b15b1a47eb414338e8b229f25f11bdca099471
Author: Keith Packard <keithp at keithp.com>
Date: Wed Dec 11 11:31:46 2013 -0800
xfree86: Don't complain when the SDK dependency file doesn't exist yet
It won't exist until the build is complete, so don't complain about it
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 15670d0..9672904 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -121,7 +121,7 @@ sdksyms.dep sdksyms.c: sdksyms.sh
$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
SDKSYMS_DEP = sdksyms.dep
-include $(SDKSYMS_DEP)
+-include $(SDKSYMS_DEP)
i2c/libi2c.la:
$(AM_V_at)cd i2c && $(MAKE) libi2c.la
commit eda935627116dd106b99dbcc95d90a723a2de330
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:35:21 2013 -0800
xkb: Make XkbWriteCountedString take a const char * input parameter
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/xkb/xkb.c b/xkb/xkb.c
index c78aceb..27e761c 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -4419,7 +4419,7 @@ ProcXkbSetNames(ClientPtr client)
* (swapped) 16 bit string length, non-zero terminated.
*/
static char *
-XkbWriteCountedString(char *wire, char *str, Bool swap)
+XkbWriteCountedString(char *wire, const char *str, Bool swap)
{
CARD16 len, *pLen, paddedLen;
commit d0339a5c66846c9f14e3b584e34688520a0916ab
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:34:59 2013 -0800
os: xstrtokenize takes and returns const char * now
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/include/misc.h b/include/misc.h
index 17de710..165d42e 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -246,7 +246,7 @@ padding_for_int32(const int bytes)
}
-extern char **xstrtokenize(const char *str, const char *separators);
+extern const char **xstrtokenize(const char *str, const char *separators);
extern void FormatInt64(int64_t num, char *string);
extern void FormatUInt64(uint64_t num, char *string);
extern void FormatUInt64Hex(uint64_t num, char *string);
diff --git a/os/utils.c b/os/utils.c
index 608ee6a..e81dc5f 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1946,10 +1946,10 @@ CheckUserAuthorization(void)
* Tokenize a string into a NULL terminated array of strings. Always returns
* an allocated array unless an error occurs.
*/
-char **
+const char **
xstrtokenize(const char *str, const char *separators)
{
- char **list, **nlist;
+ const char **list, **nlist;
char *tok, *tmp;
unsigned num = 0, n;
@@ -1977,7 +1977,7 @@ xstrtokenize(const char *str, const char *separators)
error:
free(tmp);
for (n = 0; n < num; n++)
- free(list[n]);
+ free((void *) list[n]);
free(list);
return NULL;
}
commit c608560dbbac18837cb00ef0d774a66ea7706534
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:33:59 2013 -0800
xfree86/vbe: Make VBEValidateModes take const char **
mode names are now const
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
index 40bd985..50ac50d 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/vbe/vbeModes.c
@@ -435,7 +435,7 @@ VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe)
*/
int
VBEValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch, int pitchInc,
int minHeight, int maxHeight, int virtualX, int virtualY,
int apertureSize, LookupModeFlags strategy)
diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h
index affd5b6..ee0257c 100644
--- a/hw/xfree86/vbe/vbeModes.h
+++ b/hw/xfree86/vbe/vbeModes.h
@@ -82,7 +82,7 @@ extern _X_EXPORT void VBESetModeParameters(ScrnInfoPtr pScrn, vbeInfoPtr pVbe);
*/
extern _X_EXPORT int VBEValidateModes(ScrnInfoPtr scrp,
DisplayModePtr availModes,
- char **modeNames,
+ const char **modeNames,
ClockRangePtr clockRanges,
int *linePitches, int minPitch,
int maxPitch, int pitchInc, int minHeight,
commit 3835e8b0a1cc7b1e971bcc3f9453422fec014b10
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:33:18 2013 -0800
xfree86/shadowfb: GCFuncs and GCOps are now const
Change GC private to match and fix resulting warnings
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index 6145017..6c66ffe 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -62,8 +62,8 @@ typedef struct {
} ShadowScreenRec, *ShadowScreenPtr;
typedef struct {
- GCOps *ops;
- GCFuncs *funcs;
+ const GCOps *ops;
+ const GCFuncs *funcs;
} ShadowGCRec, *ShadowGCPtr;
static DevPrivateKeyRec ShadowScreenKeyRec;
@@ -96,7 +96,7 @@ static DevPrivateKeyRec ShadowGCKeyRec;
#define SHADOW_GC_OP_PROLOGUE(pGC)\
ShadowScreenPtr pPriv = GET_SCREEN_PRIVATE(pGC->pScreen); \
ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\
- GCFuncs *oldFuncs = pGC->funcs;\
+ const GCFuncs *oldFuncs = pGC->funcs;\
pGC->funcs = pGCPriv->funcs;\
pGC->ops = pGCPriv->ops
commit f71de60355cc76810657f40c7b5461af86b34bf7
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:32:40 2013 -0800
xfree86/parser: make strings in xf86MatchGroup const
and fix resulting warnings
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/parser/InputClass.c b/hw/xfree86/parser/InputClass.c
index de6a816..a7f573e 100644
--- a/hw/xfree86/parser/InputClass.c
+++ b/hw/xfree86/parser/InputClass.c
@@ -64,7 +64,7 @@ xf86ConfigSymTabRec InputClassTab[] = {
#define TOKEN_SEP "|"
static void
-add_group_entry(struct xorg_list *head, char **values)
+add_group_entry(struct xorg_list *head, const char **values)
{
xf86MatchGroup *group;
@@ -257,7 +257,7 @@ void
xf86printInputClassSection(FILE * cf, XF86ConfInputClassPtr ptr)
{
const xf86MatchGroup *group;
- char *const *cur;
+ const char *const *cur;
while (ptr) {
fprintf(cf, "Section \"InputClass\"\n");
@@ -363,7 +363,7 @@ xf86freeInputClassList(XF86ConfInputClassPtr ptr)
while (ptr) {
xf86MatchGroup *group, *next;
- char **list;
+ const char **list;
TestFree(ptr->identifier);
TestFree(ptr->driver);
@@ -371,55 +371,55 @@ xf86freeInputClassList(XF86ConfInputClassPtr ptr)
xorg_list_for_each_entry_safe(group, next, &ptr->match_product, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_vendor, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_device, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_os, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_pnpid, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_usbid, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_driver, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_tag, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
xorg_list_for_each_entry_safe(group, next, &ptr->match_layout, entry) {
xorg_list_del(&group->entry);
for (list = group->values; *list; list++)
- free(*list);
+ free((void *) *list);
free(group);
}
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index 0fcf405..83607f2 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -299,7 +299,7 @@ typedef struct {
typedef struct {
struct xorg_list entry;
- char **values;
+ const char **values;
} xf86MatchGroup;
typedef struct {
commit 2a93e75ff81b095bc9cdb80906e23ec705d52df5
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:31:55 2013 -0800
xfree86/int10: mark printk as _X_ATTRIBUTE_PRINTF
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/x86emu/x86emu/regs.h b/hw/xfree86/x86emu/x86emu/regs.h
index 2ecafa0..3a7456e 100644
--- a/hw/xfree86/x86emu/x86emu/regs.h
+++ b/hw/xfree86/x86emu/x86emu/regs.h
@@ -39,6 +39,8 @@
#ifndef __X86EMU_REGS_H
#define __X86EMU_REGS_H
+#include <X11/Xfuncproto.h>
+
/*---------------------- Macros and type definitions ----------------------*/
#ifdef PACK
@@ -337,7 +339,8 @@ extern "C" { /* Use "C" linkage when in C++ mode */
/* Function to log information at runtime */
- void printk(const char *fmt, ...);
+ void printk(const char *fmt, ...)
+ _X_ATTRIBUTE_PRINTF(1, 2);
#ifdef __cplusplus
} /* End of "C" linkage for C++ */
commit 7fe436a7b786ff02ed55cf9ed65edfd2fe07ac22
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:31:06 2013 -0800
xfree86/fbdevhw: Fix warnings
Unused fPtr variable. Deal with string constants.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index cbb4093..0450822 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -81,15 +81,13 @@ typedef struct {
Bool
fbdevHWGetRec(ScrnInfoPtr pScrn)
{
- fbdevHWPtr fPtr;
-
if (fbdevHWPrivateIndex < 0)
fbdevHWPrivateIndex = xf86AllocateScrnInfoPrivateIndex();
if (FBDEVHWPTR(pScrn) != NULL)
return TRUE;
- fPtr = FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1);
+ FBDEVHWPTRLVAL(pScrn) = xnfcalloc(sizeof(fbdevHWRec), 1);
return TRUE;
}
@@ -301,7 +299,7 @@ fbdev_open_pci(struct pci_device *pPci, char **namep)
}
static int
-fbdev_open(int scrnIndex, char *dev, char **namep)
+fbdev_open(int scrnIndex, const char *dev, char **namep)
{
struct fb_fix_screeninfo fix;
int fd;
@@ -497,7 +495,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool check)
void
fbdevHWSetVideoModes(ScrnInfoPtr pScrn)
{
- char **modename;
+ const char **modename;
DisplayModePtr mode, this, last = pScrn->modes;
if (NULL == pScrn->display->modes)
commit 6990de00eb23478d9343660ad3981fb1d33f8be4
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:30:29 2013 -0800
xfree86/exa: xf86GetOptValString returns const char * now
fix exaDDXDriverInit to match.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index 4e809ea..76f780a 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -128,7 +128,7 @@ exaDDXDriverInit(ScreenPtr pScreen)
if (pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) {
if (!(pExaScr->info->flags & EXA_HANDLES_PIXMAPS) &&
pExaScr->info->offScreenBase < pExaScr->info->memorySize) {
- char *heuristicName;
+ const char *heuristicName;
heuristicName = xf86GetOptValString(pScreenPriv->options,
EXAOPT_MIGRATION_HEURISTIC);
commit 017307f0b41476c3c73a9414a7ce9eb42373c3f4
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:29:30 2013 -0800
xfree86/dri: Mark DRIDrvMsg and dri_drm_debug_print _X_ATTRIBUTE_PRINTF
And fix resulting warnings.
v2: (Adam Jackson) Cast handles through uintptr_t to avoid size change warnings
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 6292e87..bfa3e36 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -100,6 +100,11 @@ drmServerInfo DRIDRMServerInfo;
* easily changed here.
*/
#define DRI_MSG_VERBOSITY 1
+
+static void
+DRIDrvMsg(int scrnIndex, MessageType type, const char *format, ...)
+ _X_ATTRIBUTE_PRINTF(3,4);
+
static void
DRIDrvMsg(int scrnIndex, MessageType type, const char *format, ...)
{
@@ -400,7 +405,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
}
DRIDrvMsg(pScreen->myNum, X_INFO,
"[drm] added %d byte SAREA at %p\n",
- pDRIPriv->pDriverInfo->SAREASize, pDRIPriv->hSAREA);
+ (int) pDRIPriv->pDriverInfo->SAREASize, (void *) (uintptr_t) pDRIPriv->hSAREA);
/* Backwards compat. */
if (drmMap(pDRIPriv->drmFD,
@@ -414,7 +419,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
return FALSE;
}
DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA %p to %p\n",
- pDRIPriv->hSAREA, pDRIPriv->pSAREA);
+ (void *) (uintptr_t) pDRIPriv->hSAREA, pDRIPriv->pSAREA);
memset(pDRIPriv->pSAREA, 0, pDRIPriv->pDriverInfo->SAREASize);
}
else {
@@ -442,7 +447,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
return FALSE;
}
DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n",
- pDRIPriv->pDriverInfo->hFrameBuffer);
+ (void *) (uintptr_t) pDRIPriv->pDriverInfo->hFrameBuffer);
}
else {
DRIDrvMsg(pScreen->myNum, X_INFO,
@@ -513,7 +518,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
pDRIPriv->myContextPriv = pDRIContextPriv;
DRIDrvMsg(pScreen->myNum, X_INFO,
- "X context handle = %p\n", pDRIPriv->myContext);
+ "X context handle = %p\n", (void *) (uintptr_t) pDRIPriv->myContext);
/* Now that we have created the X server's context, we can grab the
* hardware lock for the X server.
@@ -731,13 +736,13 @@ DRICloseScreen(ScreenPtr pScreen)
if (closeMaster || pDRIPriv->hSAREA != pDRIEntPriv->hLSAREA) {
DRIDrvMsg(pScreen->myNum, X_INFO,
"[drm] unmapping %d bytes of SAREA %p at %p\n",
- pDRIInfo->SAREASize, pDRIPriv->hSAREA, pDRIPriv->pSAREA);
+ (int) pDRIInfo->SAREASize, (void *) (uintptr_t) pDRIPriv->hSAREA, pDRIPriv->pSAREA);
if (drmUnmap(pDRIPriv->pSAREA, pDRIInfo->SAREASize)) {
DRIDrvMsg(pScreen->myNum, X_ERROR,
"[drm] unable to unmap %d bytes"
" of SAREA %p at %p\n",
- pDRIInfo->SAREASize,
- pDRIPriv->hSAREA, pDRIPriv->pSAREA);
+ (int) pDRIInfo->SAREASize,
+ (void *) (uintptr_t) pDRIPriv->hSAREA, pDRIPriv->pSAREA);
}
}
else {
@@ -761,6 +766,10 @@ DRICloseScreen(ScreenPtr pScreen)
static int
dri_drm_debug_print(const char *format, va_list ap)
+ _X_ATTRIBUTE_PRINTF(1,0);
+
+static int
+dri_drm_debug_print(const char *format, va_list ap)
{
xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
return 0;
@@ -2214,9 +2223,9 @@ DRILock(ScreenPtr pScreen, int flags)
else if (*pDRIPriv->pLockingContext != pDRIPriv->myContext) {
DRIDrvMsg(pScreen->myNum, X_ERROR,
"[DRI] Locking deadlock.\n"
- "\tAlready locked with context %d,\n"
- "\ttrying to lock with context %d.\n",
- pDRIPriv->pLockingContext, pDRIPriv->myContext);
+ "\tAlready locked with context %p,\n"
+ "\ttrying to lock with context %p.\n",
+ pDRIPriv->pLockingContext, (void *) (uintptr_t) pDRIPriv->myContext);
}
(*pDRIPriv->pLockRefCount)++;
}
@@ -2233,8 +2242,8 @@ DRIUnlock(ScreenPtr pScreen)
if (pDRIPriv->myContext != *pDRIPriv->pLockingContext) {
DRIDrvMsg(pScreen->myNum, X_ERROR,
"[DRI] Unlocking inconsistency:\n"
- "\tContext %d trying to unlock lock held by context %d\n",
- pDRIPriv->pLockingContext, pDRIPriv->myContext);
+ "\tContext %p trying to unlock lock held by context %p\n",
+ pDRIPriv->pLockingContext, (void *) (uintptr_t) pDRIPriv->myContext);
}
(*pDRIPriv->pLockRefCount)--;
}
commit 22592855e90d23013ba7f9e945d567725cb44bf3
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:28:48 2013 -0800
xfree86/common: handle string constants in xf86Xinput configuration
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index f563052..5b0b6a1 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -539,7 +539,7 @@ MatchAttrToken(const char *attr, struct xorg_list *patterns,
* match. Each list entry is a separate Match line of the same type.
*/
xorg_list_for_each_entry(group, patterns, entry) {
- char *const *cur;
+ const char *const *cur;
Bool match = FALSE;
for (cur = group->values; *cur; cur++)
@@ -598,7 +598,7 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
* See if any of the device's tags match any of the MatchTag tokens.
*/
if (!xorg_list_is_empty(&iclass->match_tag)) {
- char *const *tag;
+ const char *const *tag;
Bool match;
if (!attrs->tags)
commit 3a163d2af48a7cf8fd5c2db6ac68166a5fdbeb8d
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:28:16 2013 -0800
xfree86/common: Const GC funcs and ops in xf86VAarbiter
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h
index ba6edfc..f91de0c 100644
--- a/hw/xfree86/common/xf86VGAarbiterPriv.h
+++ b/hw/xfree86/common/xf86VGAarbiterPriv.h
@@ -137,8 +137,8 @@ typedef struct _VGAarbiterScreen {
} VGAarbiterScreenRec, *VGAarbiterScreenPtr;
typedef struct _VGAarbiterGC {
- GCOps *wrapOps;
- GCFuncs *wrapFuncs;
+ const GCOps *wrapOps;
+ const GCFuncs *wrapFuncs;
} VGAarbiterGCRec, *VGAarbiterGCPtr;
/* Screen funcs */
commit 8a9aa44a45377d8953d11a0b035c86eb139283ba
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:26:19 2013 -0800
xfree86/config: Kludge around const strings
defaultFontPath is now a const char * so that it can be initialized
from a string constant. This patch kludges around that by inserting
suitable casts to eliminate warnings. Fixing this 'correctly' would
involve inserting some new variables and conditionals to use them.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 6ea7d01..de50ec0 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -171,7 +171,7 @@ xf86GetPathElem(char **pnt)
static char *
xf86ValidateFontPath(char *path)
{
- char *tmp_path, *out_pnt, *path_elem, *next, *p1, *dir_elem;
+ char *next, *tmp_path, *out_pnt, *path_elem, *p1, *dir_elem;
struct stat stat_buf;
int flag;
int dirlen;
@@ -589,33 +589,35 @@ configFiles(XF86ConfFilesPtr fileconf)
/* FontPath */
must_copy = TRUE;
- temp_path = defaultFontPath ? defaultFontPath : (char *) "";
+ temp_path = defaultFontPath ? (char *) defaultFontPath : (char *) "";
if (xf86fpFlag)
pathFrom = X_CMDLINE;
else if (fileconf && fileconf->file_fontpath) {
pathFrom = X_CONFIG;
if (xf86Info.useDefaultFontPath) {
- if (asprintf(&defaultFontPath, "%s%s%s", fileconf->file_fontpath,
+ char *new_font_path;
+ if (asprintf(&new_font_path, "%s%s%s", fileconf->file_fontpath,
*temp_path ? "," : "", temp_path) == -1)
- defaultFontPath = NULL;
+ new_font_path = NULL;
else
must_copy = FALSE;
+ defaultFontPath = new_font_path;
}
else
defaultFontPath = fileconf->file_fontpath;
}
else
pathFrom = X_DEFAULT;
- temp_path = defaultFontPath ? defaultFontPath : (char *) "";
+ temp_path = defaultFontPath ? (char *) defaultFontPath : (char *) "";
/* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
- temp_path = must_copy ? xnfstrdup(defaultFontPath) : defaultFontPath;
+ temp_path = must_copy ? xnfstrdup(defaultFontPath) : (char *) defaultFontPath;
defaultFontPath = xf86ValidateFontPath(temp_path);
free(temp_path);
/* make fontpath more readable in the logfiles */
countDirs = 1;
- temp_path = defaultFontPath;
+ temp_path = (char *) defaultFontPath;
while ((temp_path = index(temp_path, ',')) != NULL) {
countDirs++;
temp_path++;
@@ -623,7 +625,7 @@ configFiles(XF86ConfFilesPtr fileconf)
log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1);
temp_path = log_buf;
- start = defaultFontPath;
+ start = (char *) defaultFontPath;
while ((end = index(start, ',')) != NULL) {
size = (end - start) + 1;
*(temp_path++) = '\t';
commit 86647e7279163b13492d39ecb9c44414b752a61e
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:25:50 2013 -0800
config/udev: handle const strings
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/config/udev.c b/config/udev.c
index b55b78e..23a53f4 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -137,11 +137,13 @@ device_added(struct udev_device *udev_device)
/* construct USB ID in lowercase hex - "0000:ffff" */
if (product &&
sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) {
- if (asprintf(&attrs.usb_id, "%04x:%04x", usb_vendor, usb_model)
+ char *usb_id;
+ if (asprintf(&usb_id, "%04x:%04x", usb_vendor, usb_model)
== -1)
- attrs.usb_id = NULL;
+ usb_id = NULL;
else
LOG_PROPERTY(ppath, "PRODUCT", product);
+ attrs.usb_id = usb_id;
}
}
if (!name)
@@ -240,16 +242,16 @@ device_added(struct udev_device *udev_device)
free(config_info);
input_option_free_list(&input_options);
- free(attrs.usb_id);
- free(attrs.pnp_id);
- free(attrs.product);
- free(attrs.device);
- free(attrs.vendor);
+ free((void *) attrs.usb_id);
+ free((void *) attrs.pnp_id);
+ free((void *) attrs.product);
+ free((void *) attrs.device);
+ free((void *) attrs.vendor);
if (attrs.tags) {
- char **tag = attrs.tags;
+ const char **tag = attrs.tags;
while (*tag) {
- free(*tag);
+ free((void *) *tag);
tag++;
}
free(attrs.tags);
commit b7633c6ff2c273621df6c0fac9c269f8ab217a46
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:24:03 2013 -0800
composite: Remove unused pScreen variables
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/composite/compext.c b/composite/compext.c
index e4821c5..e253f3c 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -335,12 +335,10 @@ ProcCompositeReleaseOverlayWindow(ClientPtr client)
{
REQUEST(xCompositeReleaseOverlayWindowReq);
WindowPtr pWin;
- ScreenPtr pScreen;
CompOverlayClientPtr pOc;
REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq);
VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);
- pScreen = pWin->drawable.pScreen;
/*
* Has client queried a reference to the overlay window
@@ -873,7 +871,6 @@ PanoramiXCompositeReleaseOverlayWindow(ClientPtr client)
{
REQUEST(xCompositeReleaseOverlayWindowReq);
WindowPtr pWin;
- ScreenPtr pScreen;
CompOverlayClientPtr pOc;
PanoramiXRes *win;
int i, rc;
@@ -893,7 +890,6 @@ PanoramiXCompositeReleaseOverlayWindow(ClientPtr client)
client->errorValue = stuff->window;
return rc;
}
- pScreen = pWin->drawable.pScreen;
/*
* Has client queried a reference to the overlay window
commit 5bc5684d4cb4905cd82fe1c036cc8a48c3c4868f
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 06:02:05 2013 -0800
test: Warning cleanup
const char in test/xfree86.c. Cast values to (intmax_t) for %ju format
in test/signal-logging.c.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/test/signal-logging.c b/test/signal-logging.c
index a03c5ac..7bbd910 100644
--- a/test/signal-logging.c
+++ b/test/signal-logging.c
@@ -56,7 +56,7 @@ check_signed_number_format_test(long int number)
FormatInt64(number, string);
if(strncmp(string, expected, 21) != 0) {
fprintf(stderr, "Failed to convert %jd to decimal string (expected %s but got %s)\n",
- number, expected, string);
+ (intmax_t) number, expected, string);
return FALSE;
}
@@ -93,7 +93,7 @@ check_number_format_test(long unsigned int number)
FormatUInt64(number, string);
if(strncmp(string, expected, 21) != 0) {
fprintf(stderr, "Failed to convert %ju to decimal string (%s vs %s)\n",
- number, expected, string);
+ (intmax_t) number, expected, string);
return FALSE;
}
@@ -101,7 +101,7 @@ check_number_format_test(long unsigned int number)
FormatUInt64Hex(number, string);
if(strncmp(string, expected, 17) != 0) {
fprintf(stderr, "Failed to convert %ju to hexadecimal string (%s vs %s)\n",
- number, expected, string);
+ (intmax_t) number, expected, string);
return FALSE;
}
diff --git a/test/xfree86.c b/test/xfree86.c
index f9892e6..a986711 100644
--- a/test/xfree86.c
+++ b/test/xfree86.c
@@ -73,7 +73,8 @@ xfree86_option_list_duplicate(void)
static void
xfree86_add_comment(void)
{
- char *current = NULL, *comment;
+ char *current = NULL;
+ const char *comment;
char compare[1024] = { 0 };
comment = "# foo";
commit fecc7eb1cf66db64728ee2d68cd9443df7e70879
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 06:00:44 2013 -0800
xi: More warning cleanup for input
Lots more const char stuff.
Remove duplicate defs of CoreKeyboardProc and CorePointerProc from
test/xi2/protocol-common.c
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/Xi/extinit.c b/Xi/extinit.c
index a49a421..c13bc47 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -1169,8 +1169,8 @@ IResetProc(ExtensionEntry * unused)
EventSwapVector[DevicePropertyNotify] = NotImplemented;
RestoreExtensionEvents();
- free(xi_all_devices.name);
- free(xi_all_master_devices.name);
+ free((void *) xi_all_devices.name);
+ free((void *) xi_all_master_devices.name);
XIBarrierReset();
}
diff --git a/Xi/listdev.c b/Xi/listdev.c
index 014c61d..470fb52 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -119,7 +119,7 @@ SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size)
*/
static void
-CopyDeviceName(char **namebuf, char *name)
+CopyDeviceName(char **namebuf, const char *name)
{
char *nameptr = (char *) *namebuf;
diff --git a/dix/devices.c b/dix/devices.c
index a680ed8..3aecd1b 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -955,7 +955,7 @@ CloseDevice(DeviceIntPtr dev)
while (dev->xkb_interest)
XkbRemoveResourceClient((DevicePtr) dev, dev->xkb_interest->resource);
- free(dev->name);
+ free((void *) dev->name);
classes = (ClassesPtr) &dev->key;
FreeAllDeviceClasses(classes);
@@ -2735,6 +2735,7 @@ AllocDevicePair(ClientPtr client, const char *name,
{
DeviceIntPtr pointer;
DeviceIntPtr keyboard;
+ char *dev_name;
*ptr = *keybd = NULL;
@@ -2745,12 +2746,12 @@ AllocDevicePair(ClientPtr client, const char *name,
if (!pointer)
return BadAlloc;
- if (asprintf(&pointer->name, "%s pointer", name) == -1) {
- pointer->name = NULL;
+ if (asprintf(&dev_name, "%s pointer", name) == -1) {
RemoveDevice(pointer, FALSE);
return BadAlloc;
}
+ pointer->name = dev_name;
pointer->public.processInputProc = ProcessOtherEvent;
pointer->public.realInputProc = ProcessOtherEvent;
@@ -2771,13 +2772,13 @@ AllocDevicePair(ClientPtr client, const char *name,
return BadAlloc;
}
- if (asprintf(&keyboard->name, "%s keyboard", name) == -1) {
- keyboard->name = NULL;
+ if (asprintf(&dev_name, "%s keyboard", name) == -1) {
RemoveDevice(keyboard, FALSE);
RemoveDevice(pointer, FALSE);
return BadAlloc;
}
+ keyboard->name = dev_name;
keyboard->public.processInputProc = ProcessOtherEvent;
keyboard->public.realInputProc = ProcessOtherEvent;
diff --git a/dix/inpututils.c b/dix/inpututils.c
index a10a7c7..3e1d75f 100644
--- a/dix/inpututils.c
+++ b/dix/inpututils.c
@@ -351,7 +351,7 @@ DuplicateInputAttributes(InputAttributes * attrs)
{
InputAttributes *new_attr;
int ntags = 0;
- char **tags, **new_tags;
+ const char **tags, **new_tags;
if (!attrs)
return NULL;
@@ -403,20 +403,20 @@ DuplicateInputAttributes(InputAttributes * attrs)
void
FreeInputAttributes(InputAttributes * attrs)
{
- char **tags;
+ const char **tags;
if (!attrs)
return;
- free(attrs->product);
- free(attrs->vendor);
- free(attrs->device);
- free(attrs->pnp_id);
- free(attrs->usb_id);
+ free((void *) attrs->product);
+ free((void *) attrs->vendor);
+ free((void *) attrs->device);
+ free((void *) attrs->pnp_id);
+ free((void *) attrs->usb_id);
if ((tags = attrs->tags))
while (*tags)
- free(*tags++);
+ free((void *) *tags++);
free(attrs->tags);
free(attrs);
diff --git a/include/input.h b/include/input.h
index 2d5e531..042128f 100644
--- a/include/input.h
+++ b/include/input.h
@@ -221,12 +221,12 @@ typedef struct _InputOption InputOption;
typedef struct _XI2Mask XI2Mask;
typedef struct _InputAttributes {
- char *product;
- char *vendor;
- char *device;
- char *pnp_id;
- char *usb_id;
- char **tags; /* null-terminated */
+ const char *product;
+ const char *vendor;
+ const char *device;
+ const char *pnp_id;
+ const char *usb_id;
+ const char **tags; /* null-terminated */
uint32_t flags;
} InputAttributes;
diff --git a/include/inputstr.h b/include/inputstr.h
index dc36c5d..d369c9f 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -542,7 +542,7 @@ typedef struct _DeviceIntRec {
GrabInfoRec deviceGrab; /* grab on the device */
int type; /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */
Atom xinput_type;
- char *name;
+ const char *name;
int id;
KeyClassPtr key;
ValuatorClassPtr valuator;
diff --git a/test/input.c b/test/input.c
index df20f82..aaa7a69 100644
--- a/test/input.c
+++ b/test/input.c
@@ -1101,7 +1101,7 @@ xi_unregister_handlers(void)
static void
cmp_attr_fields(InputAttributes * attr1, InputAttributes * attr2)
{
- char **tags1, **tags2;
+ const char **tags1, **tags2;
assert(attr1 && attr2);
assert(attr1 != attr2);
@@ -1182,7 +1182,7 @@ dix_input_attributes(void)
{
InputAttributes orig = { 0 };
InputAttributes *new;
- char *tags[4] = { "tag1", "tag2", "tag2", NULL };
+ const char *tags[4] = { "tag1", "tag2", "tag2", NULL };
new = DuplicateInputAttributes(NULL);
assert(!new);
diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
index e2b0b8b..0947898 100644
--- a/test/xi2/protocol-common.c
+++ b/test/xi2/protocol-common.c
@@ -43,9 +43,6 @@ static ClientRec server_client;
void *userdata;
-extern int CorePointerProc(DeviceIntPtr pDev, int what);
-extern int CoreKeyboardProc(DeviceIntPtr pDev, int what);
-
static void
fake_init_sprite(DeviceIntPtr dev)
{
commit af04cf6968b16cc9efd17905471047e7de62058a
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 05:55:38 2013 -0800
Xext: Clean up warnings in hashtable code
Make keys const void *
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/Xext/hashtable.c b/Xext/hashtable.c
index 9d9ef89..76ebc6d 100644
--- a/Xext/hashtable.c
+++ b/Xext/hashtable.c
@@ -118,7 +118,7 @@ double_size(HashTable ht)
}
pointer
-ht_add(HashTable ht, pointer key)
+ht_add(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
struct xorg_list *bucket = &ht->buckets[index];
@@ -164,7 +164,7 @@ ht_add(HashTable ht, pointer key)
}
void
-ht_remove(HashTable ht, pointer key)
+ht_remove(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
struct xorg_list *bucket = &ht->buckets[index];
@@ -183,7 +183,7 @@ ht_remove(HashTable ht, pointer key)
}
pointer
-ht_find(HashTable ht, pointer key)
+ht_find(HashTable ht, const void *key)
{
unsigned index = ht->hash(ht->cdata, key, ht->bucketBits);
struct xorg_list *bucket = &ht->buckets[index];
diff --git a/Xext/hashtable.h b/Xext/hashtable.h
index 5d15984..8a65732 100644
--- a/Xext/hashtable.h
+++ b/Xext/hashtable.h
@@ -75,12 +75,12 @@ extern _X_EXPORT void ht_destroy(HashTable ht);
to avoid returning NULL. Obviously the data pointed cannot be
modified, as implied by dataSize being 0.
*/
-extern _X_EXPORT pointer ht_add(HashTable ht, pointer key);
+extern _X_EXPORT pointer ht_add(HashTable ht, const void *key);
/** @brief Removes a key from the hash table along with its
associated data, which will be free'd.
*/
-extern _X_EXPORT void ht_remove(HashTable ht, pointer key);
+extern _X_EXPORT void ht_remove(HashTable ht, const void *key);
/** @brief Finds the associated data of a key from the hash table.
@@ -93,7 +93,7 @@ extern _X_EXPORT void ht_remove(HashTable ht, pointer key);
use HtMember instead to determine if a key has been
inserted.
*/
-extern _X_EXPORT pointer ht_find(HashTable ht, pointer key);
+extern _X_EXPORT pointer ht_find(HashTable ht, const void *key);
/** @brief A generic hash function */
extern _X_EXPORT unsigned ht_generic_hash(void *cdata,
commit 00438c9f943b219ba33055969ae7f9ba07214b2a
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 05:41:54 2013 -0800
exa: Clean up warnings
Declare GC ops/funcs as const.
Use 'typeof' in the 'swap' macro to capture the right type.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/exa/exa.c b/exa/exa.c
index f8e499c..e961733 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -620,8 +620,8 @@ exaCreateGC(GCPtr pGC)
swap(pExaScr, pScreen, CreateGC);
if ((ret = (*pScreen->CreateGC) (pGC))) {
- wrap(pExaGC, pGC, funcs, (GCFuncs *) &exaGCFuncs);
- wrap(pExaGC, pGC, ops, (GCOps *) &exaOps);
+ wrap(pExaGC, pGC, funcs, &exaGCFuncs);
+ wrap(pExaGC, pGC, ops, &exaOps);
}
swap(pExaScr, pScreen, CreateGC);
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 1f56056..aba3934 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -248,11 +248,19 @@ extern DevPrivateKeyRec exaScreenPrivateKeyRec;
real->mem = priv->Saved##mem; \
}
+#ifdef HAVE_TYPEOF
+#define swap(priv, real, mem) {\
+ typeof(real->mem) tmp = priv->Saved##mem; \
+ priv->Saved##mem = real->mem; \
+ real->mem = tmp; \
+}
+#else
#define swap(priv, real, mem) {\
void *tmp = priv->Saved##mem; \
priv->Saved##mem = real->mem; \
real->mem = tmp; \
}
+#endif
#define EXA_PRE_FALLBACK(_screen_) \
ExaScreenPriv(_screen_); \
@@ -333,8 +341,8 @@ typedef struct {
typedef struct {
/* GC values from the layer below. */
- GCOps *Savedops;
- GCFuncs *Savedfuncs;
+ const GCOps *Savedops;
+ const GCFuncs *Savedfuncs;
} ExaGCPrivRec, *ExaGCPrivPtr;
typedef struct {
commit 6e51645b4796fc3a02206fefd416b84beb2fcdf7
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 05:28:47 2013 -0800
xkb: Clean up warnings
Add const to lots of strings.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/include/xkbrules.h b/include/xkbrules.h
index 5b69d0d..956eade 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -64,7 +64,7 @@ typedef struct _XkbRF_Rule {
typedef struct _XkbRF_Group {
int number;
const char *name;
- const char *words;
+ char *words;
} XkbRF_GroupRec, *XkbRF_GroupPtr;
#define XkbRF_PendingMatch (1L<<1)
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 346ebcc..fbfe403 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -852,7 +852,7 @@ extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ ,
);
extern _X_EXPORT Bool XkbDDXNamesFromRules(DeviceIntPtr /* keybd */ ,
- char * /* rules */ ,
+ const char * /* rules */ ,
XkbRF_VarDefsPtr /* defs */ ,
XkbComponentNamesPtr /* names */
);
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index d462957..f458e3b 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -299,7 +299,7 @@ XkbDDXLoadKeymapByNames(DeviceIntPtr keybd,
Bool
XkbDDXNamesFromRules(DeviceIntPtr keybd,
- char *rules_name,
+ const char *rules_name,
XkbRF_VarDefsPtr defs, XkbComponentNamesPtr names)
{
char buf[PATH_MAX];
diff --git a/xkb/maprules.c b/xkb/maprules.c
index 5462763..6f5f8cc 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -218,10 +218,10 @@ typedef struct _FileSpec {
} FileSpec;
typedef struct {
- char *model;
- char *layout[XkbNumKbdGroups + 1];
- char *variant[XkbNumKbdGroups + 1];
- char *options;
+ const char *model;
+ const char *layout[XkbNumKbdGroups + 1];
+ const char *variant[XkbNumKbdGroups + 1];
+ const char *options;
} XkbRF_MultiDefsRec, *XkbRF_MultiDefsPtr;
#define NDX_BUFF_SIZE 4
@@ -343,9 +343,9 @@ SetUpRemap(InputLine * line, RemapSpec * remap)
}
static Bool
-MatchOneOf(char *wanted, char *vals_defined)
+MatchOneOf(const char *wanted, const char *vals_defined)
{
- char *str, *next;
+ const char *str, *next;
int want_len = strlen(wanted);
for (str = vals_defined, next = NULL; str != NULL; str = next) {
@@ -469,7 +469,7 @@ CheckLine(InputLine * line,
}
static char *
-_Concat(char *str1, char *str2)
+_Concat(char *str1, const char *str2)
{
int len;
@@ -498,12 +498,13 @@ squeeze_spaces(char *p1)
static Bool
MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
{
-
+ char *options;
memset((char *) mdefs, 0, sizeof(XkbRF_MultiDefsRec));
mdefs->model = defs->model;
- mdefs->options = Xstrdup(defs->options);
- if (mdefs->options)
- squeeze_spaces(mdefs->options);
+ options = Xstrdup(defs->options);
+ if (options)
+ squeeze_spaces(options);
+ mdefs->options = options;
if (defs->layout) {
if (!strchr(defs->layout, ',')) {
@@ -511,13 +512,15 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
}
else {
char *p;
+ char *layout;
int i;
- mdefs->layout[1] = Xstrdup(defs->layout);
- if (mdefs->layout[1] == NULL)
+ layout = Xstrdup(defs->layout);
+ if (layout == NULL)
return FALSE;
- squeeze_spaces(mdefs->layout[1]);
- p = mdefs->layout[1];
+ squeeze_spaces(layout);
+ mdefs->layout[1] = layout;
+ p = layout;
for (i = 2; i <= XkbNumKbdGroups; i++) {
if ((p = strchr(p, ','))) {
*p++ = '\0';
@@ -538,13 +541,15 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
}
else {
char *p;
+ char *variant;
int i;
- mdefs->variant[1] = Xstrdup(defs->variant);
- if (mdefs->variant[1] == NULL)
+ variant = Xstrdup(defs->variant);
+ if (variant == NULL)
return FALSE;
- squeeze_spaces(mdefs->variant[1]);
- p = mdefs->variant[1];
+ squeeze_spaces(variant);
+ mdefs->variant[1] = variant;
+ p = variant;
for (i = 2; i <= XkbNumKbdGroups; i++) {
if ((p = strchr(p, ','))) {
*p++ = '\0';
@@ -564,13 +569,13 @@ MakeMultiDefs(XkbRF_MultiDefsPtr mdefs, XkbRF_VarDefsPtr defs)
static void
FreeMultiDefs(XkbRF_MultiDefsPtr defs)
{
- free(defs->options);
- free(defs->layout[1]);
- free(defs->variant[1]);
+ free((void *) defs->options);
+ free((void *) defs->layout[1]);
+ free((void *) defs->variant[1]);
}
static void
-Apply(char *src, char **dst)
+Apply(const char *src, char **dst)
{
if (src) {
if (*src == '+' || *src == '!') {
@@ -596,7 +601,7 @@ XkbRF_ApplyRule(XkbRF_RulePtr rule, XkbComponentNamesPtr names)
}
static Bool
-CheckGroup(XkbRF_RulesPtr rules, char *group_name, char *name)
+CheckGroup(XkbRF_RulesPtr rules, const char *group_name, const char *name)
{
int i;
char *p;
@@ -1013,15 +1018,15 @@ XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
return;
if (rules->rules) {
for (i = 0, rule = rules->rules; i < rules->num_rules; i++, rule++) {
- free(rule->model);
- free(rule->layout);
- free(rule->variant);
- free(rule->option);
- free(rule->keycodes);
- free(rule->symbols);
- free(rule->types);
- free(rule->compat);
- free(rule->geometry);
+ free((void *) rule->model);
+ free((void *) rule->layout);
+ free((void *) rule->variant);
+ free((void *) rule->option);
+ free((void *) rule->keycodes);
+ free((void *) rule->symbols);
+ free((void *) rule->types);
+ free((void *) rule->compat);
+ free((void *) rule->geometry);
memset((char *) rule, 0, sizeof(XkbRF_RuleRec));
}
free(rules->rules);
@@ -1031,7 +1036,7 @@ XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
if (rules->groups) {
for (i = 0, group = rules->groups; i < rules->num_groups; i++, group++) {
- free(group->name);
+ free((void *) group->name);
free(group->words);
}
free(rules->groups);
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index f72655f..ca3831c 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -129,11 +129,11 @@ XkbFreeRMLVOSet(XkbRMLVOSet * rmlvo, Bool freeRMLVO)
if (!rmlvo)
return;
- free(rmlvo->rules);
- free(rmlvo->model);
- free(rmlvo->layout);
- free(rmlvo->variant);
- free(rmlvo->options);
+ free((void *) rmlvo->rules);
+ free((void *) rmlvo->model);
+ free((void *) rmlvo->layout);
+ free((void *) rmlvo->variant);
+ free((void *) rmlvo->options);
if (freeRMLVO)
free(rmlvo);
commit abce3206cbc82f632abae5344e0ce46622e00f24
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 05:19:24 2013 -0800
os: Clean up warnings
Just const char stuff.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/include/os.h b/include/os.h
index 9b67294..4dacc1e 100644
--- a/include/os.h
+++ b/include/os.h
@@ -448,7 +448,7 @@ extern _X_EXPORT void
AddLocalHosts(void);
extern _X_EXPORT void
-ResetHosts(char *display);
+ResetHosts(const char *display);
extern _X_EXPORT void
EnableLocalHost(void);
@@ -471,7 +471,7 @@ RegisterAuthorizations(void);
#endif
extern _X_EXPORT void
-InitAuthorization(char * /*filename */ );
+InitAuthorization(const char * /*filename */ );
/* extern int LoadAuthorization(void); */
diff --git a/os/access.c b/os/access.c
index 6d991b3..c55b0ef 100644
--- a/os/access.c
+++ b/os/access.c
@@ -814,7 +814,7 @@ AddLocalHosts(void)
/* Reset access control list to initial hosts */
void
-ResetHosts(char *display)
+ResetHosts(const char *display)
{
register HOST *host;
char lhostname[120], ohostname[120];
diff --git a/os/auth.c b/os/auth.c
index ac20de4..5fcb538 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -96,12 +96,12 @@ static struct protocol protocols[] = {
* specified authorization file
*/
-static char *authorization_file = (char *) NULL;
+static const char *authorization_file = NULL;
static Bool ShouldLoadAuth = TRUE;
void
-InitAuthorization(char *file_name)
+InitAuthorization(const char *file_name)
{
authorization_file = file_name;
}
commit a1cb69dc28fdbfbdfaf954e0bec221f759462399
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 22:05:44 2013 +0900
Xext: Clean up warnings
GC funcs and ops are const.
Remove unused variables.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index ce0d072..6f8939f 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -118,7 +118,7 @@ static DevPrivateKeyRec PanoramiXScreenKeyRec;
typedef struct {
DDXPointRec clipOrg;
DDXPointRec patOrg;
- GCFuncs *wrapFuncs;
+ const GCFuncs *wrapFuncs;
} PanoramiXGCRec, *PanoramiXGCPtr;
typedef struct {
@@ -134,7 +134,7 @@ static void XineramaChangeClip(GCPtr, int, pointer, int);
static void XineramaDestroyClip(GCPtr);
static void XineramaCopyClip(GCPtr, GCPtr);
-static GCFuncs XineramaGCFuncs = {
+static const GCFuncs XineramaGCFuncs = {
XineramaValidateGC, XineramaChangeGC, XineramaCopyGC, XineramaDestroyGC,
XineramaChangeClip, XineramaDestroyClip, XineramaCopyClip
};
diff --git a/Xext/xres.c b/Xext/xres.c
index 445abca..bdd49eb 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -193,7 +193,6 @@ DestroyConstructResourceBytesCtx(ConstructResourceBytesCtx *ctx)
static int
ProcXResQueryVersion(ClientPtr client)
{
- REQUEST(xXResQueryVersionReq);
xXResQueryVersionReply rep = {
.type = X_Reply,
.sequenceNumber = client->sequence,
@@ -1103,7 +1102,6 @@ ProcResDispatch(ClientPtr client)
static int
SProcXResQueryVersion(ClientPtr client)
{
- REQUEST(xXResQueryVersionReq);
REQUEST_SIZE_MATCH(xXResQueryVersionReq);
return ProcXResQueryVersion(client);
}
commit 2f6e8eb70d527541178433933d6230466421bd15
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 22:02:58 2013 +0900
damage: Clean up warnings
GC funcs and ops are const now, so all wrappers need to declare them
as such.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 173fe50..55d8c41 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -359,7 +359,7 @@ damageCreateGC(GCPtr pGC)
#define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \
damageGCPriv(pGC); \
- GCFuncs *oldFuncs = pGC->funcs; \
+ const GCFuncs *oldFuncs = pGC->funcs; \
unwrap(pGCPriv, pGC, funcs); \
unwrap(pGCPriv, pGC, ops); \
@@ -379,7 +379,6 @@ damageCreateGC(GCPtr pGC)
static void
damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
{
- drawableDamage(pDrawable);
DAMAGE_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
pGCPriv->ops = pGC->ops; /* just so it's not NULL */
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index 36753ee..2786156 100644
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -76,8 +76,8 @@ typedef struct _damageScrPriv {
} DamageScrPrivRec, *DamageScrPrivPtr;
typedef struct _damageGCPriv {
- GCOps *ops;
- GCFuncs *funcs;
+ const GCOps *ops;
+ const GCFuncs *funcs;
} DamageGCPrivRec, *DamageGCPrivPtr;
/* XXX should move these into damage.c, damageScrPrivateIndex is static */
commit c706fb0db86d6946482700d65ad6803c4daaa6f9
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 22:00:29 2013 +0900
Clean up warnings in mi.
A coupel of unused variables, and some debug code with mis-matching
printf format and variable types.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/mi/mieq.c b/mi/mieq.c
index 4c07480..bc7f945 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -585,7 +585,7 @@ mieqProcessInputEvents(void)
if (n_enqueued >= (miEventQueue.nevents - (2 * QUEUE_RESERVED_SIZE)) &&
miEventQueue.nevents < QUEUE_MAXIMUM_SIZE) {
ErrorF("[mi] Increasing EQ size to %lu to prevent dropped events.\n",
- miEventQueue.nevents << 1);
+ (unsigned long) (miEventQueue.nevents << 1));
if (!mieqGrowQueue(&miEventQueue, miEventQueue.nevents << 1)) {
ErrorF("[mi] Increasing the size of EQ failed.\n");
}
@@ -593,7 +593,7 @@ mieqProcessInputEvents(void)
if (miEventQueue.dropped) {
ErrorF("[mi] EQ processing has resumed after %lu dropped events.\n",
- miEventQueue.dropped);
+ (unsigned long) miEventQueue.dropped);
ErrorF
("[mi] This may be caused my a misbehaving driver monopolizing the server's resources.\n");
miEventQueue.dropped = 0;
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 5d591a1..df027a7 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -352,7 +352,6 @@ miPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
miPointerPtr pPointer;
BOOL changedScreen = FALSE;
- SetupScreen(pScreen);
pPointer = MIPOINTER(pDev);
if (pPointer->pScreen != pScreen) {
@@ -465,14 +464,12 @@ miPointerUpdateSprite(DeviceIntPtr pDev)
void
miPointerSetScreen(DeviceIntPtr pDev, int screen_no, int x, int y)
{
- miPointerScreenPtr pScreenPriv;
ScreenPtr pScreen;
miPointerPtr pPointer;
pPointer = MIPOINTER(pDev);
pScreen = screenInfo.screens[screen_no];
- pScreenPriv = GetScreenPrivate(pScreen);
mieqSwitchScreen(pDev, pScreen, FALSE);
NewCurrentScreen(pDev, pScreen, x, y);
commit d89b42bda46d36fc0879611cc3b3566957ce36d0
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 21:57:05 2013 +0900
Clean up warnings in DIX
As usual, mostly const char changes. However, filter_device_events had
a potentially uninitialized value, 'raw', which I added a bunch of
checks for. I suspect most of those are 'can't happen', but it's hard
to see that inside the function.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 5f0123b..2235fd5 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -800,8 +800,8 @@ XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
}
int
-xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name,
- char *busID, int major, int minor, int patchLevel)
+xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name,
+ const char *busID, int major, int minor, int patchLevel)
{
XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen);
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index 2201d7b..832e443 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -91,8 +91,8 @@ extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
-extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name,
- char *busID, int major, int minor,
+extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, const char *name,
+ const char *busID, int major, int minor,
int patchLevel);
#endif /* _XVMC_H */
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 8dcd9cb..64f8ef9 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -470,7 +470,7 @@ Dispatch(void)
}
static int VendorRelease = VENDOR_RELEASE;
-static char *VendorString = VENDOR_NAME;
+static const char *VendorString = VENDOR_NAME;
void
SetVendorRelease(int release)
@@ -479,7 +479,7 @@ SetVendorRelease(int release)
}
void
-SetVendorString(char *string)
+SetVendorString(const char *string)
{
VendorString = string;
}
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 2e34d37..57177ac 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -128,7 +128,7 @@ dixGetGlyphs(FontPtr font, unsigned long count, unsigned char *chars,
* adding RT_FONT prevents conflict with default cursor font
*/
Bool
-SetDefaultFont(char *defaultfontname)
+SetDefaultFont(const char *defaultfontname)
{
int err;
FontPtr pf;
@@ -224,7 +224,7 @@ FreeFPE(FontPathElementPtr fpe)
fpe->refcount--;
if (fpe->refcount == 0) {
(*fpe_functions[fpe->type].free_fpe) (fpe);
- free(fpe->name);
+ free((void *) fpe->name);
free(fpe);
}
}
@@ -288,7 +288,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (err == FontNameAlias && alias) {
newlen = strlen(alias);
- newname = (char *) realloc(c->fontname, newlen);
+ newname = (char *) realloc((char *) c->fontname, newlen);
if (!newname) {
err = AllocError;
break;
@@ -368,14 +368,14 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
FreeFPE(c->fpe_list[i]);
}
free(c->fpe_list);
- free(c->fontname);
+ free((void *) c->fontname);
free(c);
return TRUE;
}
int
OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
- char *pfontname)
+ const char *pfontname)
{
OFclosurePtr c;
int i;
@@ -426,7 +426,7 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname,
*/
c->fpe_list = malloc(sizeof(FontPathElementPtr) * num_fpes);
if (!c->fpe_list) {
- free(c->fontname);
+ free((void *) c->fontname);
free(c);
return BadAlloc;
}
@@ -1537,7 +1537,7 @@ ImageText(ClientPtr client, DrawablePtr pDraw, GC * pGC, int nChars,
/* does the necessary magic to figure out the fpe type */
static int
-DetermineFPEType(char *pathname)
+DetermineFPEType(const char *pathname)
{
int i;
@@ -1633,21 +1633,23 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
}
/* if error or can't do it, act like it's a new one */
if (!fpe) {
+ char *name;
fpe = malloc(sizeof(FontPathElementRec));
if (!fpe) {
err = BadAlloc;
goto bail;
}
- fpe->name = malloc(len + 1);
- if (!fpe->name) {
+ name = malloc(len + 1);
+ if (!name) {
free(fpe);
err = BadAlloc;
goto bail;
}
fpe->refcount = 1;
- strncpy(fpe->name, (char *) cp, (int) len);
- fpe->name[len] = '\0';
+ strncpy(name, (char *) cp, (int) len);
+ name[len] = '\0';
+ fpe->name = name;
fpe->name_length = len;
fpe->type = DetermineFPEType(fpe->name);
if (fpe->type == -1)
@@ -1660,7 +1662,7 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
("[dix] Could not init font path element %s, removing from list!\n",
fpe->name);
}
- free(fpe->name);
+ free((void *) fpe->name);
free(fpe);
}
}
@@ -1712,9 +1714,10 @@ SetFontPath(ClientPtr client, int npaths, unsigned char *paths)
}
int
-SetDefaultFontPath(char *path)
+SetDefaultFontPath(const char *path)
{
- char *temp_path, *start, *end;
+ const char *start, *end;
+ char *temp_path;
unsigned char *cp, *pp, *nump, *newpath;
int num = 1, len, err, size = 0, bad;
diff --git a/dix/events.c b/dix/events.c
index 4aaa54c..e198112 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2671,6 +2671,9 @@ DeliverOneEvent(InternalEvent *event, DeviceIntPtr dev, enum InputLevel level,
case CORE:
rc = EventToCore(event, &xE, &count);
break;
+ default:
+ rc = BadImplementation;
+ break;
}
if (rc == Success) {
@@ -3828,6 +3831,8 @@ MatchForType(const GrabPtr grab, GrabPtr tmp, enum InputLevel level,
match = CORE_MATCH;
ignore_device = TRUE;
break;
+ default:
+ return NO_MATCH;
}
tmp->grabtype = grabtype;
diff --git a/dix/extension.c b/dix/extension.c
index 6380db3..ede4bf5 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -96,7 +96,7 @@ AddExtension(const char *name, int NumEvents, int NumErrors,
}
ext->name = strdup(name);
ext->num_aliases = 0;
- ext->aliases = (char **) NULL;
+ ext->aliases = (const char **) NULL;
if (!ext->name) {
dixFreePrivates(ext->devPrivates, PRIVATE_EXTENSION);
free(ext);
@@ -106,7 +106,7 @@ AddExtension(const char *name, int NumEvents, int NumErrors,
newexts = (ExtensionEntry **) realloc(extensions,
(i + 1) * sizeof(ExtensionEntry *));
if (!newexts) {
- free(ext->name);
+ free((void *) ext->name);
dixFreePrivates(ext->devPrivates, PRIVATE_EXTENSION);
free(ext);
return ((ExtensionEntry *) NULL);
@@ -147,12 +147,12 @@ Bool
AddExtensionAlias(const char *alias, ExtensionEntry * ext)
{
char *name;
- char **aliases;
+ const char **aliases;
if (!ext)
return FALSE;
- aliases = (char **) realloc(ext->aliases,
- (ext->num_aliases + 1) * sizeof(char *));
+ aliases = realloc(ext->aliases,
+ (ext->num_aliases + 1) * sizeof(char *));
if (!aliases)
return FALSE;
ext->aliases = aliases;
@@ -229,9 +229,9 @@ CloseDownExtensions(void)
if (extensions[i]->CloseDown)
extensions[i]->CloseDown(extensions[i]);
NumExtensions = i;
- free(extensions[i]->name);
+ free((void *) extensions[i]->name);
for (j = extensions[i]->num_aliases; --j >= 0;)
- free(extensions[i]->aliases[j]);
+ free((void *) extensions[i]->aliases[j]);
free(extensions[i]->aliases);
dixFreePrivates(extensions[i]->devPrivates, PRIVATE_EXTENSION);
free(extensions[i]);
diff --git a/dix/getevents.c b/dix/getevents.c
index 14b65ca..646c723 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -1382,10 +1382,10 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
{
int num_events = 1;
DeviceEvent *event;
- RawDeviceEvent *raw;
+ RawDeviceEvent *raw = NULL;
double screenx = 0.0, screeny = 0.0; /* desktop coordinate system */
double devx = 0.0, devy = 0.0; /* desktop-wide in device coords */
- int sx, sy; /* for POINTER_SCREEN */
+ int sx = 0, sy = 0; /* for POINTER_SCREEN */
ValuatorMask mask;
ScreenPtr scr;
int num_barrier_events = 0;
@@ -1437,7 +1437,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
transformAbsolute(pDev, &mask);
clipAbsolute(pDev, &mask);
- if ((flags & POINTER_NORAW) == 0)
+ if ((flags & POINTER_NORAW) == 0 && raw)
set_raw_valuators(raw, &mask, raw->valuators.data);
}
else {
@@ -1445,7 +1445,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
if (flags & POINTER_ACCELERATE)
accelPointer(pDev, &mask, ms);
- if ((flags & POINTER_NORAW) == 0)
+ if ((flags & POINTER_NORAW) == 0 && raw)
set_raw_valuators(raw, &mask, raw->valuators.data);
moveRelative(pDev, flags, &mask);
@@ -1512,7 +1512,8 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
event_set_root_coordinates(event, screenx - scr->x, screeny - scr->y);
if (flags & POINTER_EMULATED) {
- raw->flags = XIPointerEmulated;
+ if (raw)
+ raw->flags = XIPointerEmulated;
event->flags = XIPointerEmulated;
}
diff --git a/dix/globals.c b/dix/globals.c
index ad9145b..9738e9c 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -112,9 +112,9 @@ int defaultScreenSaverAllowExposures = DEFAULT_SCREEN_SAVER_EXPOSURES;
Bool screenSaverSuspended = FALSE;
#endif
-char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
-char *defaultTextFont = COMPILEDDEFAULTFONT;
-char *defaultCursorFont = COMPILEDCURSORFONT;
+const char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
+const char *defaultTextFont = COMPILEDDEFAULTFONT;
+const char *defaultCursorFont = COMPILEDCURSORFONT;
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
every compilation of dix code */
CursorPtr rootCursor;
@@ -126,7 +126,7 @@ TimeStamp currentTime;
int defaultColorVisualClass = -1;
int monitorResolution = 0;
-char *display;
+const char *display;
int displayfd;
char *ConnectionInfo;
diff --git a/dix/window.c b/dix/window.c
index 0e9109e..fad57fa 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -227,7 +227,7 @@ log_window_info(WindowPtr pWin, int depth)
win_name = get_window_name(pWin);
ErrorF("win 0x%.8x (%s), [%d, %d] to [%d, %d]",
- pWin->drawable.id,
+ (unsigned) pWin->drawable.id,
win_name ? win_name : "no name",
pWin->drawable.x, pWin->drawable.y,
pWin->drawable.x + pWin->drawable.width,
@@ -240,7 +240,7 @@ log_window_info(WindowPtr pWin, int depth)
ErrorF(" (%s compositing: pixmap %x)",
(pWin->redirectDraw == RedirectDrawAutomatic) ?
"automatic" : "manual",
- pScreen->GetWindowPixmap(pWin)->drawable.id);
+ (unsigned) pScreen->GetWindowPixmap(pWin)->drawable.id);
#endif
switch (pWin->visibility) {
@@ -283,7 +283,7 @@ PrintWindowTree(void)
for (scrnum = 0; scrnum < screenInfo.numScreens; scrnum++) {
pScreen = screenInfo.screens[scrnum];
ErrorF("[dix] Dumping windows for screen %d (pixmap %x):\n", scrnum,
- pScreen->GetScreenPixmap(pScreen)->drawable.id);
+ (unsigned) pScreen->GetScreenPixmap(pScreen)->drawable.id);
pWin = pScreen->root;
depth = 1;
while (pWin) {
diff --git a/include/closestr.h b/include/closestr.h
index c6aa129..d762891 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -47,7 +47,7 @@ typedef struct _OFclosure {
Mask flags;
/* XXX -- get these from request buffer instead? */
- char *origFontName;
+ const char *origFontName;
int origFontNameLen;
XID fontid;
char *fontname;
diff --git a/include/dix.h b/include/dix.h
index fa7ccd4..7362e07 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -289,7 +289,10 @@ extern _X_EXPORT void
SetVendorRelease(int release);
extern _X_EXPORT void
-SetVendorString(char *string);
+SetVendorString(const char *string);
+
+int
+dix_main(int argc, char *argv[], char *envp[]);
/* events.c */
diff --git a/include/dixfont.h b/include/dixfont.h
index 0a5f105..0598311 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -34,7 +34,7 @@ SOFTWARE.
typedef struct _DIXFontProp *DIXFontPropPtr;
-extern _X_EXPORT Bool SetDefaultFont(char * /*defaultfontname */ );
+extern _X_EXPORT Bool SetDefaultFont(const char * /*defaultfontname */ );
extern _X_EXPORT void QueueFontWakeup(FontPathElementPtr /*fpe */ );
@@ -48,7 +48,7 @@ extern _X_EXPORT int OpenFont(ClientPtr /*client */ ,
XID /*fid */ ,
Mask /*flags */ ,
unsigned /*lenfname */ ,
- char * /*pfontname */ );
+ const char * /*pfontname */ );
extern _X_EXPORT int CloseFont(pointer /*pfont */ ,
XID /*fid */ );
@@ -99,7 +99,7 @@ extern _X_EXPORT int SetFontPath(ClientPtr /*client */ ,
int /*npaths */ ,
unsigned char * /*paths */ );
-extern _X_EXPORT int SetDefaultFontPath(char * /*path */ );
+extern _X_EXPORT int SetDefaultFontPath(const char * /*path */ );
extern _X_EXPORT int GetFontPath(ClientPtr client,
int *count,
diff --git a/include/extnsionst.h b/include/extnsionst.h
index e825236..126807d 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -58,14 +58,14 @@ typedef struct _ExtensionEntry {
int index;
void (*CloseDown) ( /* called at server shutdown */
struct _ExtensionEntry * /* extension */ );
- char *name; /* extension name */
+ const char *name; /* extension name */
int base; /* base request number */
int eventBase;
int eventLast;
int errorBase;
int errorLast;
int num_aliases;
- char **aliases;
+ const char **aliases;
pointer extPrivate;
unsigned short (*MinorOpcode) ( /* called for errors */
ClientPtr /* client */ );
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 7621ceb..253593f 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -276,8 +276,8 @@ typedef struct _GC {
pointer clientClip;
unsigned long stateChanges; /* masked with GC_<kind> */
unsigned long serialNumber;
- GCFuncs *funcs;
- GCOps *ops;
+ const GCFuncs *funcs;
+ const GCOps *ops;
PrivateRec *devPrivates;
/*
* The following were moved here from private storage to allow device-
diff --git a/include/globals.h b/include/globals.h
index 7786987..858c9a3 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -18,7 +18,7 @@ extern _X_EXPORT CARD32 ScreenSaverInterval;
extern _X_EXPORT Bool screenSaverSuspended;
#endif
-extern _X_EXPORT char *defaultFontPath;
+extern _X_EXPORT const char *defaultFontPath;
extern _X_EXPORT int monitorResolution;
extern _X_EXPORT int defaultColorVisualClass;
diff --git a/include/opaque.h b/include/opaque.h
index b76ab6e..73d40c3 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -33,8 +33,8 @@ from The Open Group.
#include "globals.h"
-extern _X_EXPORT char *defaultTextFont;
-extern _X_EXPORT char *defaultCursorFont;
+extern _X_EXPORT const char *defaultTextFont;
+extern _X_EXPORT const char *defaultCursorFont;
extern _X_EXPORT int MaxClients;
extern _X_EXPORT volatile char isItTimeToYield;
extern _X_EXPORT volatile char dispatchException;
@@ -49,7 +49,7 @@ extern _X_EXPORT int ScreenSaverBlanking;
extern _X_EXPORT int ScreenSaverAllowExposures;
extern _X_EXPORT int defaultScreenSaverBlanking;
extern _X_EXPORT int defaultScreenSaverAllowExposures;
-extern _X_EXPORT char *display;
+extern _X_EXPORT const char *display;
extern _X_EXPORT int displayfd;
extern _X_EXPORT int defaultBackingStore;
commit d6da9f23cca562fc0c6ae398665ab7fa770a4fa8
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 18:07:54 2013 +0900
hw/xfree86: More const declarations for strings
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 37ac42c..143be1e 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -389,7 +389,7 @@ extern _X_EXPORT ModeStatus
xf86CheckModeForDriver(ScrnInfoPtr scrp, DisplayModePtr mode, int flags);
extern _X_EXPORT int
xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch,
int minHeight, int maxHeight, int pitchInc,
int virtualX, int virtualY, int apertureSize,
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 15214ea..44bc559 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1354,7 +1354,7 @@ scanLineWidth(unsigned int xsize, /* pixels */
int
xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
- char **modeNames, ClockRangePtr clockRanges,
+ const char **modeNames, ClockRangePtr clockRanges,
int *linePitches, int minPitch, int maxPitch, int pitchInc,
int minHeight, int maxHeight, int virtualX, int virtualY,
int apertureSize, LookupModeFlags strategy)
commit 644725ac5e28a00d8c24372f55ae7e7e2fe0cb2e
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 18:06:37 2013 +0900
Just remove dpms functsion from xf86.h
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 206a9d7..37ac42c 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -203,10 +203,6 @@ extern _X_EXPORT void xf86ReconfigureLayout(void);
extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set,
int flags);
-#ifdef DPMSExtension
-#include "dpmsproc.h"
-#endif
-
/* xf86DGA.c */
#ifdef XFreeXDGA
commit c85e26d59901fbf8c7a437cf934b51fa64160073
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 17:55:15 2013 +0900
Bunch of DMX warning fixes
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/dmx/config/Canvas.c b/hw/dmx/config/Canvas.c
index f0586e5..1031033 100644
--- a/hw/dmx/config/Canvas.c
+++ b/hw/dmx/config/Canvas.c
@@ -98,10 +98,10 @@ static XtResource resources[] = {
{XtNcallback, XtCCallback, XtRCallback,
sizeof(XtCallbackList), offset(input_callback), XtRCallback, NULL}
,
- {XtNcanvasExposeCallback, XtCcanvasExposeCallback, XtRCallback,
+ {(char *) XtNcanvasExposeCallback, (char *) XtCcanvasExposeCallback, XtRCallback,
sizeof(XtCallbackList), offset(expose_callback), XtRCallback, NULL}
,
- {XtNcanvasResizeCallback, XtCcanvasResizeCallback, XtRCallback,
+ {(char *) XtNcanvasResizeCallback, (char *) XtCcanvasResizeCallback, XtRCallback,
sizeof(XtCallbackList), offset(resize_callback), XtRCallback, NULL}
,
};
@@ -109,7 +109,7 @@ static XtResource resources[] = {
#undef offset
static XtActionsRec actions[] = {
- {"canvas", CanvasAction},
+ {(char *) "canvas", CanvasAction},
};
static char translations[] = "<Key>: canvas()\n\
@@ -123,7 +123,7 @@ CanvasClassRec canvasClassRec = {
/* core */
{
(WidgetClass) Superclass, /* superclass */
- "Canvas", /* class_name */
+ (char *) "Canvas", /* class_name */
sizeof(CanvasRec), /* widget_size */
NULL, /* class_initialize */
NULL, /* class_part_initialize */
diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
index 2121dd7..2b7b968 100644
--- a/hw/dmx/config/xdmxconfig.c
+++ b/hw/dmx/config/xdmxconfig.c
@@ -974,9 +974,9 @@ main(int argc, char **argv)
const char *canvastrans =
"<Btn3Down>: placeMenu() XtMenuPopup(buttonpopup)";
XtActionsRec actiontable[] = {
- {"openOk", dmxConfigOkAction},
- {"placeMenu", dmxConfigPlaceMenu},
- {"noop", NULL}
+ {(char *) "openOk", dmxConfigOkAction},
+ {(char *) "placeMenu", dmxConfigPlaceMenu},
+ {(char *) "noop", NULL}
};
dmxConfigFilename = XtNewString((argc >= 2) ? argv[1] : "");
diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h
index 19dfdbe..be8116f 100644
--- a/hw/dmx/dmxclient.h
+++ b/hw/dmx/dmxclient.h
@@ -118,17 +118,6 @@ typedef XID KeySym64;
#undef KeySym
#endif
-/* These are in exglobals.h, but that conflicts with xkbsrv.h */
-extern int ProximityIn;
-extern int ProximityOut;
-extern int DeviceValuator;
-extern int DeviceMotionNotify;
-extern int DeviceFocusIn;
-extern int DeviceFocusOut;
-extern int DeviceStateNotify;
-extern int DeviceMappingNotify;
-extern int ChangeDeviceNotify;
-
/* Some protocol gets included last, after undefines. */
#include <X11/XKBlib.h>
#include <X11/extensions/XKBproto.h>
diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c
index db558b5..6eb94b2 100644
--- a/hw/dmx/input/dmxcommon.c
+++ b/hw/dmx/input/dmxcommon.c
@@ -339,7 +339,7 @@ dmxCommonOthOn(DevicePtr pDev)
if (!(priv->xi = XOpenDevice(priv->display, dmxLocal->deviceId))) {
dmxLog(dmxWarning, "Cannot open %s device (id=%d) on %s\n",
dmxLocal->deviceName ? dmxLocal->deviceName : "(unknown)",
- dmxLocal->deviceId, dmxInput->name);
+ (int) dmxLocal->deviceId, dmxInput->name);
return -1;
}
ADD(DeviceKeyPress);
diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
index 600a705..cb80bd8 100644
--- a/hw/dmx/input/dmxconsole.c
+++ b/hw/dmx/input/dmxconsole.c
@@ -825,8 +825,8 @@ dmxConsoleInit(DevicePtr pDev)
/* Set up properties */
XStoreName(dpy, win, DMX_CONSOLE_NAME);
- class_hints.res_name = DMX_RES_NAME;
- class_hints.res_class = DMX_RES_CLASS;
+ class_hints.res_name = (char *) DMX_RES_NAME;
+ class_hints.res_class = (char *) DMX_RES_CLASS;
XSetClassHint(dpy, win, &class_hints);
/* Map the window */
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index bcb5c2e..14ac05f 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -701,7 +701,6 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
XEvent * e, DMXBlockType block)
{
GETDMXINPUTFROMPDEV;
- xEvent xE;
DeviceIntPtr p = dmxLocal->pDevice;
int valuators[3];
ValuatorMask mask;
@@ -716,7 +715,7 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
if (dmxCheckFunctionKeys(dmxLocal, type, keySym))
return;
if (dmxLocal->sendsCore && dmxLocal != dmxLocalCoreKeyboard)
- xE.u.u.detail = dmxFixup(pDev, detail, keySym);
+ detail = dmxFixup(pDev, detail, keySym);
/*ErrorF("KEY %d sym %d\n", detail, (int) keySym); */
QueueKeyboardEvents(p, type, detail, NULL);
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index b22a41f..e06fc87 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -921,7 +921,7 @@ dmxInputScanForExtensions(DMXInputInfo * dmxInput, int doXI)
break;
}
dmxLogInput(dmxInput, " %2d %-10.10s %-16.16s\n",
- devices[i].id,
+ (int) devices[i].id,
devices[i].name ? devices[i].name : "", use);
}
@@ -993,7 +993,6 @@ dmxInputLateReInit(DMXInputInfo * dmxInput)
void
dmxInputInit(DMXInputInfo * dmxInput)
{
- DeviceIntPtr pPointer = NULL, pKeyboard = NULL;
dmxArg a;
const char *name;
int i;
@@ -1108,12 +1107,6 @@ dmxInputInit(DMXInputInfo * dmxInput)
DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[i];
dmxLocal->pDevice = dmxAddDevice(dmxLocal);
- if (dmxLocal->isCore) {
- if (dmxLocal->type == DMX_LOCAL_MOUSE)
- pPointer = dmxLocal->pDevice;
- if (dmxLocal->type == DMX_LOCAL_KEYBOARD)
- pKeyboard = dmxLocal->pDevice;
- }
}
dmxInput->processInputEvents = dmxProcessInputEvents;
@@ -1136,7 +1129,7 @@ dmxInputFreeLocal(DMXLocalInputInfoRec * local)
local->destroy_private(local->private);
free(local->history);
free(local->valuators);
- free(local->deviceName);
+ free((void *) local->deviceName);
local->private = NULL;
local->history = NULL;
local->deviceName = NULL;
@@ -1164,7 +1157,7 @@ dmxInputFree(DMXInputInfo * dmxInput)
dmxInput->devs = NULL;
dmxInput->numDevs = 0;
if (dmxInput->freename)
- free(dmxInput->name);
+ free((void *) dmxInput->name);
dmxInput->name = NULL;
}
@@ -1218,7 +1211,7 @@ dmxInputLogDevices(void)
dmxLogCont(dmxInfo, "\t[i%d/%*.*s",
dmxInput->inputIdx, len, len, dmxInput->name);
if (dmxInput->devs[i]->deviceId >= 0)
- dmxLogCont(dmxInfo, "/id%d", dmxInput->devs[i]->deviceId);
+ dmxLogCont(dmxInfo, "/id%d", (int) dmxInput->devs[i]->deviceId);
if (dmxInput->devs[i]->deviceName)
dmxLogCont(dmxInfo, "=%s", dmxInput->devs[i]->deviceName);
dmxLogCont(dmxInfo, "] %s\n",
commit 493d992501b586d95823e045d1dc994bd6c00d27
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 17:43:46 2013 +0900
More warning fixes in hw/xfree86
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/i2c/bt829.c b/hw/xfree86/i2c/bt829.c
index 070cb20..991c26e 100644
--- a/hw/xfree86/i2c/bt829.c
+++ b/hw/xfree86/i2c/bt829.c
@@ -500,6 +500,7 @@ bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr)
{
BT829Ptr bt;
I2CByte a;
+ char *devname;
bt = calloc(1, sizeof(BT829Rec));
if (bt == NULL)
@@ -520,31 +521,31 @@ bt829_Detect(I2CBusPtr b, I2CSlaveAddr addr)
bt->id = btread(bt, IDCODE);
- free(bt->d.DevName);
- bt->d.DevName = calloc(200, sizeof(char));
+ free((void *) bt->d.DevName);
+ bt->d.DevName = devname = calloc(200, sizeof(char));
switch (BTVERSION) {
case BT815:
- sprintf(bt->d.DevName, "bt815a video decoder, revision %d",
+ sprintf(devname, "bt815a video decoder, revision %d",
bt->id & 0xf);
break;
case BT817:
- sprintf(bt->d.DevName, "bt817a video decoder, revision %d",
+ sprintf(devname, "bt817a video decoder, revision %d",
bt->id & 0xf);
break;
case BT819:
- sprintf(bt->d.DevName, "bt819a video decoder, revision %d",
+ sprintf(devname, "bt819a video decoder, revision %d",
bt->id & 0xf);
break;
case BT827:
- sprintf(bt->d.DevName, "bt827a/b video decoder, revision %d",
+ sprintf(devname, "bt827a/b video decoder, revision %d",
bt->id & 0xf);
break;
case BT829:
- sprintf(bt->d.DevName, "bt829a/b video decoder, revision %d",
+ sprintf(devname, "bt829a/b video decoder, revision %d",
bt->id & 0xf);
break;
default:
- sprintf(bt->d.DevName,
+ sprintf(devname,
"bt8xx/unknown video decoder version %d, revision %d",
bt->id >> 4, bt->id & 0xf);
break;
diff --git a/hw/xfree86/i2c/msp3430.c b/hw/xfree86/i2c/msp3430.c
index 312a2d1..a501489 100644
--- a/hw/xfree86/i2c/msp3430.c
+++ b/hw/xfree86/i2c/msp3430.c
@@ -163,7 +163,7 @@ DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr)
m->d.ByteTimeout = b->ByteTimeout;
if (!I2C_WriteRead(&(m->d), NULL, 0, &a, 1)) {
- free(m->d.DevName);
+ free((void *) m->d.DevName);
free(m);
return NULL;
}
@@ -250,12 +250,12 @@ DetectMSP3430(I2CBusPtr b, I2CSlaveAddr addr)
supported ? "" : " (unsupported)", rom_version, m->chip_id);
if (!supported) {
- free(m->d.DevName);
+ free((void *) m->d.DevName);
free(m);
return NULL;
}
if (!I2CDevInit(&(m->d))) {
- free(m->d.DevName);
+ free((void *) m->d.DevName);
free(m);
return NULL;
}
diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c
index 415167d..40bd985 100644
--- a/hw/xfree86/vbe/vbeModes.c
+++ b/hw/xfree86/vbe/vbeModes.c
@@ -356,8 +356,10 @@ VBESetModeNames(DisplayModePtr pMode)
pMode->name = strdup("BADMODE");
}
else {
- XNFasprintf(&pMode->name, "%dx%d",
+ char *tmp;
+ XNFasprintf(&tmp, "%dx%d",
pMode->HDisplay, pMode->VDisplay);
+ pMode->name = tmp;
}
}
pMode = pMode->next;
commit c78be3a4b714deb7ad75cacd54042ca1b51d6261
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 17:36:26 2013 +0900
xfree86 warning reduction
This gets the easy warnings, mostly constant string problems.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c
index 44c1d53..04d1a09 100644
--- a/hw/xfree86/ddc/ddc.c
+++ b/hw/xfree86/ddc/ddc.c
@@ -299,7 +299,7 @@ xf86DoEDID_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDC1SetSpeed,
/* DDC2 */
static I2CDevPtr
-DDC2MakeDevice(I2CBusPtr pBus, int address, char *name)
+DDC2MakeDevice(I2CBusPtr pBus, int address, const char *name)
{
I2CDevPtr dev = NULL;
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 0b047f0..34cc02f 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -1563,8 +1563,6 @@ DRI2CloseScreen(ScreenPtr pScreen)
dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);
}
-extern Bool DRI2ModuleSetup(void);
-
/* Called by InitExtensions() */
Bool
DRI2ModuleSetup(void)
diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h
index e296d7d..26303ff 100644
--- a/hw/xfree86/i2c/xf86i2c.h
+++ b/hw/xfree86/i2c/xf86i2c.h
@@ -66,7 +66,7 @@ extern _X_EXPORT int xf86I2CGetScreenBuses(int scrnIndex,
/* I2C slave devices */
typedef struct _I2CDevRec {
- char *DevName;
+ const char *DevName;
int BitTimeout; /* usec */
int ByteTimeout; /* usec */
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 1c58cf7..925da3c 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -170,7 +170,7 @@ dump_code(xf86Int10InfoPtr pInt)
CARD32 lina = SEG_ADR((CARD32), X86_CS, IP);
xf86DrvMsgVerb(pInt->pScrn->scrnIndex, X_INFO, 3, "code at 0x%8.8" PRIx32 ":\n",
- lina);
+ (unsigned) lina);
for (i = 0; i < 0x10; i++)
xf86ErrorFVerb(3, " %2.2x", MEM_RB(pInt, lina + i));
xf86ErrorFVerb(3, "\n");
@@ -229,7 +229,7 @@ port_rep_inb(xf86Int10InfoPtr pInt,
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_insb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
- port, count, base, d_f ? "up" : "down");
+ port, (unsigned) count, (unsigned) base, d_f ? "up" : "down");
while (count--) {
MEM_WB(pInt, dst, x_inb(port));
dst += inc;
@@ -246,7 +246,7 @@ port_rep_inw(xf86Int10InfoPtr pInt,
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_insw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
- port, count, base, d_f ? "up" : "down");
+ port, (unsigned) count, (unsigned) base, d_f ? "up" : "down");
while (count--) {
MEM_WW(pInt, dst, x_inw(port));
dst += inc;
@@ -263,7 +263,7 @@ port_rep_inl(xf86Int10InfoPtr pInt,
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_insl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
- port, count, base, d_f ? "up" : "down");
+ port, (unsigned) count, (unsigned) base, d_f ? "up" : "down");
while (count--) {
MEM_WL(pInt, dst, x_inl(port));
dst += inc;
@@ -280,7 +280,7 @@ port_rep_outb(xf86Int10InfoPtr pInt,
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_outb(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
- port, count, base, d_f ? "up" : "down");
+ port, (unsigned) count, (unsigned) base, d_f ? "up" : "down");
while (count--) {
x_outb(port, MEM_RB(pInt, dst));
dst += inc;
@@ -297,7 +297,7 @@ port_rep_outw(xf86Int10InfoPtr pInt,
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_outw(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
- port, count, base, d_f ? "up" : "down");
+ port, (unsigned) count, (unsigned) base, d_f ? "up" : "down");
while (count--) {
x_outw(port, MEM_RW(pInt, dst));
dst += inc;
@@ -314,7 +314,7 @@ port_rep_outl(xf86Int10InfoPtr pInt,
if (PRINT_PORT && DEBUG_IO_TRACE())
ErrorF(" rep_outl(%#x) %" PRIu32 " bytes at %8.8" PRIx32 " %s\n",
- port, count, base, d_f ? "up" : "down");
+ port, (unsigned) count, (unsigned) base, d_f ? "up" : "down");
while (count--) {
x_outl(port, MEM_RL(pInt, dst));
dst += inc;
@@ -429,7 +429,7 @@ x_inl(CARD16 port)
if (!pciCfg1in(port, &val)) {
val = pci_io_read32(Int10Current->io, port);
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" inl(%#x) = %8.8" PRIx32 "\n", port, val);
+ ErrorF(" inl(%#x) = %8.8" PRIx32 "\n", port, (unsigned) val);
}
return val;
}
@@ -439,7 +439,7 @@ x_outl(CARD16 port, CARD32 val)
{
if (!pciCfg1out(port, val)) {
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" outl(%#x, %8.8" PRIx32 ")\n", port, val);
+ ErrorF(" outl(%#x, %8.8" PRIx32 ")\n", port, (unsigned) val);
pci_io_write32(Int10Current->io, port, val);
}
}
@@ -526,8 +526,8 @@ pciCfg1in(CARD16 addr, CARD32 *val)
pci_device_cfg_read_u32(pci_device_for_cfg_address(PciCfg1Addr),
(uint32_t *) val, PCI_OFFSET(PciCfg1Addr));
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" cfg_inl(%#" PRIx32 ") = %8.8" PRIx32 "\n", PciCfg1Addr,
- *val);
+ ErrorF(" cfg_inl(%#" PRIx32 ") = %8.8" PRIx32 "\n", (unsigned) PciCfg1Addr,
+ (unsigned) *val);
return 1;
}
return 0;
@@ -542,8 +542,8 @@ pciCfg1out(CARD16 addr, CARD32 val)
}
if (addr == 0xCFC) {
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" cfg_outl(%#" PRIx32 ", %8.8" PRIx32 ")\n", PciCfg1Addr,
- val);
+ ErrorF(" cfg_outl(%#" PRIx32 ", %8.8" PRIx32 ")\n", (unsigned) PciCfg1Addr,
+ (unsigned) val);
pci_device_cfg_write_u32(pci_device_for_cfg_address(PciCfg1Addr), val,
PCI_OFFSET(PciCfg1Addr));
return 1;
@@ -567,8 +567,8 @@ pciCfg1inw(CARD16 addr, CARD16 *val)
pci_device_cfg_read_u16(pci_device_for_cfg_address(PciCfg1Addr),
val, PCI_OFFSET(PciCfg1Addr) + offset);
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" cfg_inw(%#" PRIx32 ") = %4.4x\n", PciCfg1Addr + offset,
- *val);
+ ErrorF(" cfg_inw(%#" PRIx32 ") = %4.4x\n", (unsigned) (PciCfg1Addr + offset),
+ (unsigned) *val);
return 1;
}
return 0;
@@ -589,8 +589,8 @@ pciCfg1outw(CARD16 addr, CARD16 val)
const unsigned offset = addr - 0xCFC;
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" cfg_outw(%#" PRIx32 ", %4.4x)\n", PciCfg1Addr + offset,
- val);
+ ErrorF(" cfg_outw(%#" PRIx32 ", %4.4x)\n", (unsigned) (PciCfg1Addr + offset),
+ (unsigned) val);
pci_device_cfg_write_u16(pci_device_for_cfg_address(PciCfg1Addr), val,
PCI_OFFSET(PciCfg1Addr) + offset);
return 1;
@@ -614,8 +614,8 @@ pciCfg1inb(CARD16 addr, CARD8 *val)
pci_device_cfg_read_u8(pci_device_for_cfg_address(PciCfg1Addr),
val, PCI_OFFSET(PciCfg1Addr) + offset);
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" cfg_inb(%#" PRIx32 ") = %2.2x\n", PciCfg1Addr + offset,
- *val);
+ ErrorF(" cfg_inb(%#" PRIx32 ") = %2.2x\n", (unsigned) (PciCfg1Addr + offset),
+ (unsigned) *val);
return 1;
}
return 0;
@@ -636,8 +636,8 @@ pciCfg1outb(CARD16 addr, CARD8 val)
const unsigned offset = addr - 0xCFC;
if (PRINT_PORT && DEBUG_IO_TRACE())
- ErrorF(" cfg_outb(%#" PRIx32 ", %2.2x)\n", PciCfg1Addr + offset,
- val);
+ ErrorF(" cfg_outb(%#" PRIx32 ", %2.2x)\n", (unsigned) (PciCfg1Addr + offset),
+ (unsigned) val);
pci_device_cfg_write_u8(pci_device_for_cfg_address(PciCfg1Addr), val,
PCI_OFFSET(PciCfg1Addr) + offset);
return 1;
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index a441fd1..b2eb72e 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -379,7 +379,7 @@ xf86CrtcSetModeTransform(xf86CrtcPtr crtc, DisplayModePtr mode,
crtc->transformPresent = saved_transform_present;
}
- free(adjusted_mode->name);
+ free((void *) adjusted_mode->name);
free(adjusted_mode);
if (didLock)
@@ -564,8 +564,8 @@ static const char *direction[4] = {
static Rotation
xf86OutputInitialRotation(xf86OutputPtr output)
{
- char *rotate_name = xf86GetOptValString(output->options,
- OPTION_ROTATE);
+ const char *rotate_name = xf86GetOptValString(output->options,
+ OPTION_ROTATE);
int i;
if (!rotate_name) {
@@ -926,7 +926,6 @@ xf86PickCrtcs(ScrnInfoPtr scrn,
xf86OutputPtr output;
xf86CrtcPtr crtc;
xf86CrtcPtr *crtcs;
- xf86CrtcPtr best_crtc;
int best_score;
int score;
int my_score;
@@ -939,7 +938,6 @@ xf86PickCrtcs(ScrnInfoPtr scrn,
* Compute score with this output disabled
*/
best_crtcs[n] = NULL;
- best_crtc = NULL;
best_score = xf86PickCrtcs(scrn, best_crtcs, modes, n + 1, width, height);
if (modes[n] == NULL)
return best_score;
@@ -993,7 +991,6 @@ xf86PickCrtcs(ScrnInfoPtr scrn,
score =
my_score + xf86PickCrtcs(scrn, crtcs, modes, n + 1, width, height);
if (score > best_score) {
- best_crtc = crtc;
best_score = score;
memcpy(best_crtcs, crtcs, config->num_output * sizeof(xf86CrtcPtr));
}
@@ -1087,8 +1084,8 @@ xf86UserConfiguredOutputs(ScrnInfoPtr scrn, DisplayModePtr * modes)
for (o = 0; o < config->num_output; o++) {
xf86OutputPtr output = config->output[o];
- char *position;
- char *relative_name;
+ const char *position;
+ const char *relative_name;
OutputOpts relation;
int r;
@@ -1145,8 +1142,8 @@ xf86InitialOutputPositions(ScrnInfoPtr scrn, DisplayModePtr * modes)
};
xf86OutputPtr output = config->output[o];
xf86OutputPtr relative;
- char *relative_name;
- char *position;
+ const char *relative_name;
+ const char *position;
OutputOpts relation;
int r;
@@ -1306,7 +1303,7 @@ xf86InitialPanning(ScrnInfoPtr scrn)
for (o = 0; o < config->num_output; o++) {
xf86OutputPtr output = config->output[o];
- char *panning = xf86GetOptValString(output->options, OPTION_PANNING);
+ const char *panning = xf86GetOptValString(output->options, OPTION_PANNING);
int width, height, left, top;
int track_width, track_height, track_left, track_top;
int brdr[4];
@@ -1389,7 +1386,7 @@ xf86SortModes(DisplayModePtr input)
for (o = output; o && (n = o->next); o = n) {
if (!strcmp(o->name, n->name) && xf86ModesEqual(o, n)) {
o->next = n->next;
- free(n->name);
+ free((void *) n->name);
free(n);
n = o;
}
@@ -1403,10 +1400,10 @@ xf86SortModes(DisplayModePtr input)
return output;
}
-static char *
+static const char *
preferredMode(ScrnInfoPtr pScrn, xf86OutputPtr output)
{
- char *preferred_mode = NULL;
+ const char *preferred_mode = NULL;
/* Check for a configured preference for a particular mode */
preferred_mode = xf86GetOptValString(output->options,
@@ -1610,7 +1607,7 @@ xf86ProbeOutputModes(ScrnInfoPtr scrn, int maxX, int maxY)
xf86OutputPtr output = config->output[o];
DisplayModePtr mode;
DisplayModePtr config_modes = NULL, output_modes, default_modes = NULL;
- char *preferred_mode;
+ const char *preferred_mode;
xf86MonPtr edid_monitor;
XF86ConfMonitorPtr conf_monitor;
MonRec mon_rec;
@@ -1833,10 +1830,6 @@ xf86ProbeOutputModes(ScrnInfoPtr scrn, int maxX, int maxY)
* Copy one of the output mode lists to the ScrnInfo record
*/
-/* XXX where does this function belong? Here? */
-void
- xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr scrn, int *x, int *y);
-
static DisplayModePtr
biggestMode(DisplayModePtr a, DisplayModePtr b)
{
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index c4a3eb0..43b2233 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -129,11 +129,13 @@ void
xf86SetModeDefaultName(DisplayModePtr mode)
{
Bool interlaced = ! !(mode->Flags & V_INTERLACE);
+ char *tmp;
- free(mode->name);
+ free((void *) mode->name);
- XNFasprintf(&mode->name, "%dx%d%s", mode->HDisplay, mode->VDisplay,
+ XNFasprintf(&tmp, "%dx%d%s", mode->HDisplay, mode->VDisplay,
interlaced ? "i" : "");
+ mode->name = tmp;
}
/*
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 76614de..f7a7d44 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -454,7 +454,6 @@ xf86RandR12GetInfo(ScreenPtr pScreen, Rotation * rotations)
ScrnInfoPtr scrp = xf86ScreenToScrn(pScreen);
XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
DisplayModePtr mode;
- int refresh0 = 60;
int maxX = 0, maxY = 0;
*rotations = randrp->supported_rotations;
@@ -479,8 +478,6 @@ xf86RandR12GetInfo(ScreenPtr pScreen, Rotation * rotations)
if (maxY < mode->VDisplay)
maxY = mode->VDisplay;
}
- if (mode == scrp->modes)
- refresh0 = refresh;
pSize = RRRegisterSize(pScreen,
mode->HDisplay, mode->VDisplay,
randrp->mmWidth, randrp->mmHeight);
@@ -684,7 +681,6 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
WindowPtr pRoot = pScreen->root;
PixmapPtr pScrnPix;
Bool ret = FALSE;
- Bool panning = FALSE;
int c;
if (xf86RandR12Key) {
@@ -716,7 +712,6 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
crtc->panningTrackingArea.y2 += height - pScreen->height;
xf86RandR13VerifyPanningArea(crtc, width, height);
xf86RandR13Pan(crtc, randrp->pointerX, randrp->pointerY);
- panning = TRUE;
}
}
@@ -946,8 +941,6 @@ xf86RandR12SetRotations(ScreenPtr pScreen, Rotation rotations)
void
xf86RandR12SetTransformSupport(ScreenPtr pScreen, Bool transforms)
{
- XF86RandRInfoPtr randrp;
-
#if RANDR_13_INTERFACE
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
int c;
@@ -957,7 +950,6 @@ xf86RandR12SetTransformSupport(ScreenPtr pScreen, Bool transforms)
if (xf86RandR12Key == NULL)
return;
- randrp = XF86RANDRINFO(pScreen);
#if RANDR_13_INTERFACE
for (c = 0; c < config->num_crtc; c++) {
xf86CrtcPtr crtc = config->crtc[c];
@@ -1455,7 +1447,6 @@ xf86RandR12SetInfo12(ScreenPtr pScreen)
RRCrtcPtr *crtcs;
int ncrtc;
int o, c, l;
- RRCrtcPtr randr_crtc;
int nclone;
clones = malloc(config->num_output * sizeof(RROutputPtr));
@@ -1468,11 +1459,6 @@ xf86RandR12SetInfo12(ScreenPtr pScreen)
if (output->possible_crtcs & (1 << c))
crtcs[ncrtc++] = config->crtc[c]->randr_crtc;
- if (output->crtc)
- randr_crtc = output->crtc->randr_crtc;
- else
- randr_crtc = NULL;
-
if (!RROutputSetCrtcs(output->randr_output, crtcs, ncrtc)) {
free(crtcs);
free(clones);
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 495af9b..2c9c31b 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -233,9 +233,8 @@ xf86RotateBlockHandler(ScreenPtr pScreen,
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
- Bool rotation_active;
- rotation_active = xf86RotateRedisplay(pScreen);
+ xf86RotateRedisplay(pScreen);
pScreen->BlockHandler = xf86_config->BlockHandler;
(*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
/* cannot avoid re-wrapping until all wrapping is audited */
@@ -247,7 +246,6 @@ void
xf86RotateDestroy(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
- ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int c;
@@ -267,9 +265,6 @@ xf86RotateDestroy(xf86CrtcPtr crtc)
* Clean up damage structures when no crtcs are rotated
*/
if (xf86_config->rotation_damage) {
- DrawablePtr screenDrawable = NULL;
- if (pScreen && pScreen->root)
- screenDrawable = &pScreen->root->drawable;
/* Free damage structure */
if (xf86_config->rotation_damage_registered) {
xf86_config->rotation_damage_registered = FALSE;
diff --git a/hw/xfree86/modes/xf86cvt.c b/hw/xfree86/modes/xf86cvt.c
index de07844..8b7bb8b 100644
--- a/hw/xfree86/modes/xf86cvt.c
+++ b/hw/xfree86/modes/xf86cvt.c
@@ -89,6 +89,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
int HDisplayRnd, HMargin;
int VDisplayRnd, VMargin, VSync;
float Interlace; /* Please rename this */
+ char *tmp;
/* CVT default is 60.0Hz */
if (!VRefresh)
@@ -177,6 +178,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
/* 10. Find number of lines in back porch */
VBackPorch = VSyncAndBackPorch - VSync;
+ (void) VBackPorch;
/* 11. Find total number of lines in vertical field */
Mode->VTotal = VDisplayRnd + 2 * VMargin + VSyncAndBackPorch + Interlace
@@ -282,7 +284,8 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
if (Interlaced)
Mode->VTotal *= 2;
- XNFasprintf(&Mode->name, "%dx%d", HDisplay, VDisplay);
+ XNFasprintf(&tmp, "%dx%d", HDisplay, VDisplay);
+ Mode->name = tmp;
if (Reduced)
Mode->Flags |= V_PHSYNC | V_NVSYNC;
diff --git a/hw/xfree86/modes/xf86gtf.c b/hw/xfree86/modes/xf86gtf.c
index 23707b4..0a80784 100644
--- a/hw/xfree86/modes/xf86gtf.c
+++ b/hw/xfree86/modes/xf86gtf.c
@@ -215,6 +215,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
*/
v_back_porch = vsync_plus_bp - V_SYNC_RQD;
+ (void) v_back_porch;
/* 10. Find the total number of lines in Vertical field period:
*
@@ -253,6 +254,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins)
*/
v_frame_rate = interlaced ? v_field_rate / 2.0 : v_field_rate;
+ (void) v_frame_rate;
/* 15. Find number of pixels in left margin:
*
diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c
index dcaa19e..4e5f7f9 100644
--- a/hw/xfree86/os-support/linux/lnx_acpi.c
+++ b/hw/xfree86/os-support/linux/lnx_acpi.c
@@ -74,13 +74,12 @@ lnxACPIGetEventFromOs(int fd, pmEvent * events, int num)
/* Check that we have a video event */
if (!strncmp(ev, "video", 5)) {
- char *video = NULL;
char *GFX = NULL;
char *notify = NULL;
char *data = NULL; /* doesn't appear to be used in the kernel */
- unsigned long int notify_l, data_l;
+ unsigned long int notify_l;
- video = strtok(ev, " ");
+ strtok(ev, " ");
if (!(GFX = strtok(NULL, " ")))
return 0;
@@ -97,8 +96,8 @@ lnxACPIGetEventFromOs(int fd, pmEvent * events, int num)
if (!(data = strtok(NULL, " ")))
return 0;
- data_l = strtoul(data, NULL, 16);
#if 0
+ data_l = strtoul(data, NULL, 16);
ErrorF("data: 0x%lx\n", data_l);
#endif
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index bcb039f..e2e8d08 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -83,8 +83,8 @@ xf86OpenConsole(void)
struct vt_mode VT;
struct vt_stat vts;
MessageType from = X_PROBED;
- char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
- char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
+ const char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
+ const char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
if (serverGeneration == 1) {
diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c
index 0a17c2a..f5917ee 100644
--- a/hw/xfree86/os-support/linux/lnx_kmod.c
+++ b/hw/xfree86/os-support/linux/lnx_kmod.c
@@ -37,7 +37,7 @@ int
xf86LoadKernelModule(const char *modName)
{
char mpPath[MAX_PATH] = "";
- int fd = -1, status, n;
+ int fd = -1, status;
pid_t pid;
/* get the path to the modprobe program */
@@ -76,7 +76,7 @@ xf86LoadKernelModule(const char *modName)
"Setting of real/effective user Id to 0/0 failed");
}
setenv("PATH", "/sbin", 1);
- n = execl(mpPath, "modprobe", modName, NULL);
+ execl(mpPath, "modprobe", modName, NULL);
xf86Msg(X_WARNING, "LoadKernelModule %s\n", strerror(errno));
exit(EXIT_FAILURE); /* if we get here the child's exec failed */
break;
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index d7f259d..d9a4478 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -261,6 +261,7 @@ cat > sdksyms.c << EOF
#include "dix.h"
#include "dixaccess.h"
#include "dixevents.h"
+#define _FONTPROTO_H
#include "dixfont.h"
#include "dixfontstr.h"
#include "dixfontstubs.h"
diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
index 76b8358..8af1df4 100644
--- a/hw/xfree86/x86emu/ops.c
+++ b/hw/xfree86/x86emu/ops.c
@@ -10189,8 +10189,8 @@ Handles opcode 0xe8
static void
x86emuOp_call_near_IMM(u8 X86EMU_UNUSED(op1))
{
- s16 ip16;
- s32 ip32;
+ s16 ip16 = 0;
+ s32 ip32 = 0;
START_OF_INSTR();
DECODE_PRINTF("CALL\t");
commit 1ce15ed5bae60a184c6bd9440e3c017488a5f415
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:44:51 2013 -0800
Xext: _X_EXPORT DPMSSet and DPMSSupported
These are needed by drivers, and it's better to export them from here
rather than redefining them in hw/xfree86 and exporting them from there.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index 7494dfd..82dccbd 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -9,7 +9,7 @@
#include "dixstruct.h"
-int DPMSSet(ClientPtr client, int level);
-Bool DPMSSupported(void);
+int _X_EXPORT DPMSSet(ClientPtr client, int level);
+Bool _X_EXPORT DPMSSupported(void);
#endif
commit 1f407763be28745f18d224077d6b07b9431ee16b
Author: Keith Packard <keithp at keithp.com>
Date: Sat Nov 16 23:43:49 2013 -0800
include: Make xkbrules structures all const char *
This lets them be initialized with string constants
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/include/xkbrules.h b/include/xkbrules.h
index d217318..5b69d0d 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -30,41 +30,41 @@
/***====================================================================***/
typedef struct _XkbRMLVOSet {
- char *rules;
- char *model;
- char *layout;
- char *variant;
- char *options;
+ const char *rules;
+ const char *model;
+ const char *layout;
+ const char *variant;
+ const char *options;
} XkbRMLVOSet;
typedef struct _XkbRF_VarDefs {
- char *model;
- char *layout;
- char *variant;
- char *options;
+ const char *model;
+ const char *layout;
+ const char *variant;
+ const char *options;
} XkbRF_VarDefsRec, *XkbRF_VarDefsPtr;
typedef struct _XkbRF_Rule {
int number;
int layout_num;
int variant_num;
- char *model;
- char *layout;
- char *variant;
- char *option;
+ const char *model;
+ const char *layout;
+ const char *variant;
+ const char *option;
/* yields */
- char *keycodes;
- char *symbols;
- char *types;
- char *compat;
- char *geometry;
+ const char *keycodes;
+ const char *symbols;
+ const char *types;
+ const char *compat;
+ const char *geometry;
unsigned flags;
} XkbRF_RuleRec, *XkbRF_RulePtr;
typedef struct _XkbRF_Group {
int number;
- char *name;
- char *words;
+ const char *name;
+ const char *words;
} XkbRF_GroupRec, *XkbRF_GroupPtr;
#define XkbRF_PendingMatch (1L<<1)
commit e1e01d2e33c632e395d7e396f73fba8ae606b15a
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 16:56:15 2013 +0900
xfree86/common: Warning fixes. Mostly const string handling.
Also removes DPMS functiosn from Xext/dpmsproc.h
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/vidmodeproc.h b/hw/xfree86/common/vidmodeproc.h
index 311d35c..f547efd 100644
--- a/hw/xfree86/common/vidmodeproc.h
+++ b/hw/xfree86/common/vidmodeproc.h
@@ -34,7 +34,7 @@ typedef enum {
} VidModeSelectMonitor;
typedef union {
- pointer ptr;
+ const void *ptr;
int i;
float f;
} vidMonitorValue;
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 9fc0c5b..206a9d7 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -204,8 +204,7 @@ extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set,
int flags);
#ifdef DPMSExtension
-extern _X_EXPORT int DPMSSet(ClientPtr client, int level);
-extern _X_EXPORT Bool DPMSSupported(void);
+#include "dpmsproc.h"
#endif
/* xf86DGA.c */
@@ -339,7 +338,7 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name);
extern _X_EXPORT pointer
xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);
extern _X_EXPORT pointer
-xf86LoadOneModule(char *name, pointer optlist);
+xf86LoadOneModule(const char *name, pointer optlist);
extern _X_EXPORT void
xf86UnloadSubModule(pointer mod);
extern _X_EXPORT Bool
@@ -350,7 +349,7 @@ extern _X_EXPORT void
xf86SetSilkenMouse(ScreenPtr pScreen);
extern _X_EXPORT pointer
xf86FindXvOptions(ScrnInfoPtr pScrn, int adapt_index, const char *port_name,
- char **adaptor_name, pointer *adaptor_options);
+ const char **adaptor_name, pointer *adaptor_options);
extern _X_EXPORT void
xf86GetOS(const char **name, int *major, int *minor, int *teeny);
extern _X_EXPORT ScrnInfoPtr
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index af2b7f8..4eb86de 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -300,6 +300,7 @@ copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)
{
confScreenPtr nscreen;
GDevPtr cptr = NULL;
+ char *identifier;
nscreen = malloc(sizeof(confScreenRec));
if (!nscreen)
@@ -313,13 +314,14 @@ copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)
}
memcpy(cptr, odev, sizeof(GDevRec));
- if (asprintf(&cptr->identifier, "Autoconfigured Video Device %s", driver)
+ if (asprintf(&identifier, "Autoconfigured Video Device %s", driver)
== -1) {
free(cptr);
free(nscreen);
return FALSE;
}
cptr->driver = driver;
+ cptr->identifier = identifier;
xf86ConfigLayout.screens[i].screen = nscreen;
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index b5efc02..6ea7d01 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -236,11 +236,11 @@ xf86ValidateFontPath(char *path)
* use the datastructure that the parser provides and pick out the parts
* that we need at this point
*/
-char **
+const char **
xf86ModulelistFromConfig(pointer **optlist)
{
int count = 0, i = 0;
- char **modulearray;
+ const char **modulearray;
const char *ignore[] = { "GLcore", "speedo", "bitmap", "drm",
"freetype", "type1",
@@ -374,12 +374,12 @@ xf86ModulelistFromConfig(pointer **optlist)
return modulearray;
}
-char **
+const char **
xf86DriverlistFromConfig(void)
{
int count = 0;
int j;
- char **modulearray;
+ const char **modulearray;
screenLayoutPtr slp;
/*
@@ -446,11 +446,11 @@ xf86DriverlistFromConfig(void)
return modulearray;
}
-char **
+const char **
xf86InputDriverlistFromConfig(void)
{
int count = 0;
- char **modulearray;
+ const char **modulearray;
InputInfoPtr *idp;
/*
@@ -505,11 +505,11 @@ xf86InputDriverlistFromConfig(void)
}
static void
-fixup_video_driver_list(char **drivers)
+fixup_video_driver_list(const char **drivers)
{
static const char *fallback[4] = { "fbdev", "vesa", "wsfb", NULL };
- char **end, **drv;
- char *x;
+ const char **end, **drv;
+ const char *x;
int i;
/* walk to the end of the list */
@@ -533,10 +533,10 @@ fixup_video_driver_list(char **drivers)
}
}
-static char **
+static const char **
GenerateDriverlist(const char *dirname)
{
- char **ret;
+ const char **ret;
const char *subdirs[] = { dirname, NULL };
static const char *patlist[] = { "(.*)_drv\\.so", NULL };
ret = LoaderListDirs(subdirs, patlist);
@@ -548,10 +548,10 @@ GenerateDriverlist(const char *dirname)
return ret;
}
-char **
+const char **
xf86DriverlistFromCompile(void)
{
- static char **driverlist = NULL;
+ static const char **driverlist = NULL;
if (!driverlist)
driverlist = GenerateDriverlist("drivers");
@@ -589,7 +589,7 @@ configFiles(XF86ConfFilesPtr fileconf)
/* FontPath */
must_copy = TRUE;
- temp_path = defaultFontPath ? defaultFontPath : "";
+ temp_path = defaultFontPath ? defaultFontPath : (char *) "";
if (xf86fpFlag)
pathFrom = X_CMDLINE;
else if (fileconf && fileconf->file_fontpath) {
@@ -606,7 +606,7 @@ configFiles(XF86ConfFilesPtr fileconf)
}
else
pathFrom = X_DEFAULT;
- temp_path = defaultFontPath ? defaultFontPath : "";
+ temp_path = defaultFontPath ? defaultFontPath : (char *) "";
/* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
temp_path = must_copy ? xnfstrdup(defaultFontPath) : defaultFontPath;
@@ -2349,7 +2349,7 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout)
ConfigStatus
xf86HandleConfigFile(Bool autoconfig)
{
- char *scanptr;
+ const char *scanptr;
Bool singlecard = 0;
Bool implicit_layout = FALSE;
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index de06677..84013e1 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/hw/xfree86/common/xf86Config.h
@@ -59,10 +59,10 @@ typedef struct _ModuleDefault {
/*
* prototypes
*/
-char **xf86ModulelistFromConfig(pointer **);
-char **xf86DriverlistFromConfig(void);
-char **xf86DriverlistFromCompile(void);
-char **xf86InputDriverlistFromConfig(void);
+const char **xf86ModulelistFromConfig(pointer **);
+const char **xf86DriverlistFromConfig(void);
+const char **xf86DriverlistFromCompile(void);
+const char **xf86InputDriverlistFromConfig(void);
Bool xf86BuiltinInputDriver(const char *);
ConfigStatus xf86HandleConfigFile(Bool);
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 5bf1f14..1348b27 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -195,11 +195,15 @@ configureScreenSection(int screennum)
{
int i;
int depths[] = { 1, 4, 8, 15, 16, 24 /*, 32 */ };
+ char *tmp;
parsePrologue(XF86ConfScreenPtr, XF86ConfScreenRec)
- XNFasprintf(&ptr->scrn_identifier, "Screen%d", screennum);
- XNFasprintf(&ptr->scrn_monitor_str, "Monitor%d", screennum);
- XNFasprintf(&ptr->scrn_device_str, "Card%d", screennum);
+ XNFasprintf(&tmp, "Screen%d", screennum);
+ ptr->scrn_identifier = tmp;
+ XNFasprintf(&tmp, "Monitor%d", screennum);
+ ptr->scrn_monitor_str = tmp;
+ XNFasprintf(&tmp, "Card%d", screennum);
+ ptr->scrn_device_str = tmp;
for (i = 0; i < sizeof(depths) / sizeof(depths[0]); i++) {
XF86ConfDisplayPtr display;
@@ -248,12 +252,14 @@ configureDeviceSection(int screennum)
{
OptionInfoPtr p;
int i = 0;
+ char *identifier;
parsePrologue(XF86ConfDevicePtr, XF86ConfDeviceRec)
/* Move device info to parser structure */
- if (asprintf(&ptr->dev_identifier, "Card%d", screennum) == -1)
- ptr->dev_identifier = NULL;
+ if (asprintf(&identifier, "Card%d", screennum) == -1)
+ identifier = NULL;
+ ptr->dev_identifier = identifier;
ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;
ptr->dev_busid = DevToConfig[screennum].GDev.busID;
ptr->dev_driver = DevToConfig[screennum].GDev.driver;
@@ -355,20 +361,24 @@ configureLayoutSection(void)
for (scrnum = 0; scrnum < nDevToConfig; scrnum++) {
XF86ConfAdjacencyPtr aptr;
+ char *tmp;
aptr = malloc(sizeof(XF86ConfAdjacencyRec));
aptr->list.next = NULL;
aptr->adj_x = 0;
aptr->adj_y = 0;
aptr->adj_scrnum = scrnum;
- XNFasprintf(&aptr->adj_screen_str, "Screen%d", scrnum);
+ XNFasprintf(&tmp, "Screen%d", scrnum);
+ aptr->adj_screen_str = tmp;
if (scrnum == 0) {
aptr->adj_where = CONF_ADJ_ABSOLUTE;
aptr->adj_refscreen = NULL;
}
else {
+ char *tmp;
aptr->adj_where = CONF_ADJ_RIGHTOF;
- XNFasprintf(&aptr->adj_refscreen, "Screen%d", scrnum - 1);
+ XNFasprintf(&tmp, "Screen%d", scrnum - 1);
+ aptr->adj_refscreen = tmp;
}
ptr->lay_adjacency_lst =
(XF86ConfAdjacencyPtr) xf86addListItem((glp) ptr->lay_adjacency_lst,
@@ -389,7 +399,7 @@ configureFlagsSection(void)
static XF86ConfModulePtr
configureModuleSection(void)
{
- char **elist, **el;
+ const char **elist, **el;
/* Find the list of extension & font modules. */
const char *esubdirs[] = {
@@ -432,9 +442,11 @@ configureFilesSection(void)
static XF86ConfMonitorPtr
configureMonitorSection(int screennum)
{
+ char *tmp;
parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
- XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
+ XNFasprintf(&tmp, "Monitor%d", screennum);
+ ptr->mon_identifier = tmp;
ptr->mon_vendor = strdup("Monitor Vendor");
ptr->mon_modelname = strdup("Monitor Model");
@@ -474,10 +486,12 @@ configureDDCMonitorSection(int screennum)
#define displaySizeMaxLen 80
char displaySize_string[displaySizeMaxLen];
int displaySizeLen;
+ char *tmp;
parsePrologue(XF86ConfMonitorPtr, XF86ConfMonitorRec)
- XNFasprintf(&ptr->mon_identifier, "Monitor%d", screennum);
+ XNFasprintf(&tmp, "Monitor%d", screennum);
+ ptr->mon_identifier = tmp;
ptr->mon_vendor = strdup(ConfiguredMonitor->vendor.name);
XNFasprintf(&ptr->mon_modelname, "%x", ConfiguredMonitor->vendor.prod_id);
@@ -530,7 +544,7 @@ DoConfigure(void)
char filename[PATH_MAX];
const char *addslash = "";
XF86ConfigPtr xf86config = NULL;
- char **vlist, **vl;
+ const char **vlist, **vl;
int *dev2screen;
vlist = xf86DriverlistFromCompile();
@@ -768,7 +782,7 @@ void
DoShowOptions(void)
{
int i = 0;
- char **vlist = 0;
+ const char **vlist = NULL;
char *pSymbol = 0;
XF86ModuleData *initData = 0;
diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c
index f9e7916..c80de34 100644
--- a/hw/xfree86/common/xf86Extensions.c
+++ b/hw/xfree86/common/xf86Extensions.c
@@ -89,7 +89,6 @@ load_extension_config(void)
{
XF86ConfModulePtr mod_con = xf86configptr->conf_modules;
XF86LoadPtr modp;
- int i;
/* Only the best. */
if (!mod_con)
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index f1e6783..a59f4fc 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1068,9 +1068,7 @@ void
xf86EnableDisableFBAccess(ScrnInfoPtr pScrnInfo, Bool enable)
{
ScreenPtr pScreen = pScrnInfo->pScreen;
- PixmapPtr pspix;
- pspix = (*pScreen->GetScreenPixmap) (pScreen);
if (enable) {
/*
* Restore all of the clip lists on the screen
@@ -1566,7 +1564,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
* xf86LoadOneModule loads a single module.
*/
pointer
-xf86LoadOneModule(char *name, pointer opt)
+xf86LoadOneModule(const char *name, pointer opt)
{
int errmaj, errmin;
char *Name;
@@ -1698,8 +1696,8 @@ xf86SetSilkenMouse(ScreenPtr pScreen)
/* Wrote this function for the PM2 Xv driver, preliminary. */
pointer
-xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, char *port_name,
- char **adaptor_name, pointer *adaptor_options)
+xf86FindXvOptions(ScrnInfoPtr pScrn, int adaptor_index, const char *port_name,
+ const char **adaptor_name, pointer *adaptor_options)
{
confXvAdaptorPtr adaptor;
int i;
@@ -1817,7 +1815,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
pNewProp->next = NULL;
}
else {
- free(pNewProp->name);
+ free((void *) pNewProp->name);
existing = TRUE;
}
diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h
index 5826ac3..b8229d2 100644
--- a/hw/xfree86/common/xf86InPriv.h
+++ b/hw/xfree86/common/xf86InPriv.h
@@ -37,7 +37,4 @@
extern InputDriverPtr *xf86InputDriverList;
extern int xf86NumInputDrivers;
-/* xf86Helper.c */
-InputDriverPtr xf86LookupInputDriver(const char *name);
-
#endif /* _xf86InPriv_h */
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 91ec4c8..6feedc8 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -395,7 +395,7 @@ void
InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
{
int i, j, k, scr_index;
- char **modulelist;
+ const char **modulelist;
pointer *optionlist;
Pix24Flags screenpix24, pix24;
MessageType pix24From = X_DEFAULT;
@@ -623,7 +623,9 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
for (i = 0; i < xf86NumScreens; i++) {
if (xf86Screens[i]->name == NULL) {
- XNFasprintf(&xf86Screens[i]->name, "screen%d", i);
+ char *tmp;
+ XNFasprintf(&tmp, "screen%d", i);
+ xf86Screens[i]->name = tmp;
xf86MsgVerb(X_WARNING, 0,
"Screen driver %d has no name set, using `%s'.\n",
i, xf86Screens[i]->name);
@@ -1536,7 +1538,7 @@ ddxUseMsg(void)
* xf86LoadModules iterates over a list that is being passed in.
*/
Bool
-xf86LoadModules(char **list, pointer *optlist)
+xf86LoadModules(const char **list, pointer *optlist)
{
int errmaj, errmin;
pointer opt;
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 706ab64..15214ea 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1998,7 +1998,7 @@ xf86DeleteMode(DisplayModePtr * modeList, DisplayModePtr mode)
mode->next->prev = mode->prev;
}
- free(mode->name);
+ free((void *) mode->name);
free(mode);
}
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 265b553..396f63c 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -176,7 +176,7 @@ extern _X_EXPORT pointer LoadSubModule(pointer, const char *, const char **,
extern _X_EXPORT void UnloadSubModule(pointer);
extern _X_EXPORT void UnloadModule(pointer);
extern _X_EXPORT pointer LoaderSymbol(const char *);
-extern _X_EXPORT char **LoaderListDirs(const char **, const char **);
+extern _X_EXPORT const char **LoaderListDirs(const char **, const char **);
extern _X_EXPORT void LoaderFreeDirList(char **);
extern _X_EXPORT void LoaderErrorMsg(const char *, const char *, int, int);
extern _X_EXPORT void LoaderGetOS(const char **name, int *major, int *minor,
diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h
index f99a924..3be2a0f 100644
--- a/hw/xfree86/common/xf86Opt.h
+++ b/hw/xfree86/common/xf86Opt.h
@@ -123,7 +123,7 @@ extern _X_EXPORT OptionInfoPtr xf86TokenToOptinfo(const OptionInfoRec * table,
extern _X_EXPORT const char *xf86TokenToOptName(const OptionInfoRec * table,
int token);
extern _X_EXPORT Bool xf86IsOptionSet(const OptionInfoRec * table, int token);
-extern _X_EXPORT char *xf86GetOptValString(const OptionInfoRec * table,
+extern _X_EXPORT const char *xf86GetOptValString(const OptionInfoRec * table,
int token);
extern _X_EXPORT Bool xf86GetOptValInteger(const OptionInfoRec * table,
int token, int *value);
diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c
index 607c333..0e8bc1f 100644
--- a/hw/xfree86/common/xf86Option.c
+++ b/hw/xfree86/common/xf86Option.c
@@ -478,7 +478,8 @@ static Bool
ParseOptionValue(int scrnIndex, XF86OptionPtr options, OptionInfoPtr p,
Bool markUsed)
{
- char *s, *end;
+ const char *s;
+ char *end;
Bool wasUsed = FALSE;
if ((s = xf86findOptionValue(options, p->name)) != NULL) {
@@ -755,7 +756,7 @@ xf86IsOptionSet(const OptionInfoRec * table, int token)
return p && p->found;
}
-char *
+const char *
xf86GetOptValString(const OptionInfoRec * table, int token)
{
OptionInfoPtr p;
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 58cfe0a..5239a6b 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -156,7 +156,7 @@ xf86CloseLog(enum ExitCode error);
/* xf86Init.c */
extern _X_EXPORT Bool
-xf86LoadModules(char **list, pointer *optlist);
+xf86LoadModules(const char **list, pointer *optlist);
extern _X_EXPORT int
xf86SetVerbosity(int verb);
extern _X_EXPORT int
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 26c03c6..f563052 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -107,7 +107,7 @@ static int
* Eval config and modify DeviceVelocityRec accordingly
*/
static void
-ProcessVelocityConfiguration(DeviceIntPtr pDev, char *devname, pointer list,
+ProcessVelocityConfiguration(DeviceIntPtr pDev, const char *devname, pointer list,
DeviceVelocityPtr s)
{
int tempi;
@@ -661,7 +661,7 @@ MergeInputClasses(const InputInfoPtr idev, const InputAttributes * attrs)
/* Collect class options and driver settings */
classopts = xf86optionListDup(cl->option_lst);
if (cl->driver) {
- free(idev->driver);
+ free((void *) idev->driver);
idev->driver = xstrdup(cl->driver);
if (!idev->driver) {
xf86Msg(X_ERROR, "Failed to allocate memory while merging "
@@ -773,8 +773,8 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
/* Else the entry wasn't in the xf86InputDevs list (ignore this). */
}
- free(pInp->driver);
- free(pInp->name);
+ free((void *) pInp->driver);
+ free((void *) pInp->name);
xf86optionListFree(pInp->options);
free(pInp);
}
@@ -1067,7 +1067,7 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
#if XFreeXDGA
ScreenPtr scr = NULL;
- int idx, i;
+ int idx = 0, i;
/* The evdev driver may not always send all axes across. */
if (valuator_mask_isset(mask, 0) || valuator_mask_isset(mask, 1)) {
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 258988a..2704766 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -575,7 +575,7 @@ xf86PciProbeDev(DriverPtr drvp)
}
void
-xf86PciIsolateDevice(char *argument)
+xf86PciIsolateDevice(const char *argument)
{
int bus, device, func;
@@ -1484,6 +1484,7 @@ xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
GDevRec * GDev, int *chipset)
{
char busnum[8];
+ char *tmp;
pVideo = (struct pci_device *) busData;
@@ -1493,8 +1494,9 @@ xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
snprintf(busnum, sizeof(busnum), "%d@%d",
pVideo->bus & 0x00ff, pVideo->bus >> 8);
- XNFasprintf(&GDev->busID, "PCI:%s:%d:%d",
+ XNFasprintf(&tmp, "PCI:%s:%d:%d",
busnum, pVideo->dev, pVideo->func);
+ GDev->busID = tmp;
GDev->chipID = pVideo->device_id;
GDev->chipRev = pVideo->revision;
diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h
index 4972c36..b497a7f 100644
--- a/hw/xfree86/common/xf86pciBus.h
+++ b/hw/xfree86/common/xf86pciBus.h
@@ -36,7 +36,7 @@
void xf86PciProbe(void);
Bool xf86PciAddMatchingDev(DriverPtr drvp);
Bool xf86PciProbeDev(DriverPtr drvp);
-void xf86PciIsolateDevice(char *argument);
+void xf86PciIsolateDevice(const char *argument);
int xf86PciMatchDriver(char *matches[], int nmatches);
Bool xf86PciConfigure(void *busData, struct pci_device *pDev);
void xf86PciConfigureNewDev(void *busData, struct pci_device *pVideo,
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index 33b2b7d..5875a91 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -400,7 +400,7 @@ xf86platformAddDevice(int index)
DriverPtr drvp = NULL;
int entity;
screenLayoutPtr layout;
- static char *hotplug_driver_name = "modesetting";
+ static const char *hotplug_driver_name = "modesetting";
/* force load the driver for now */
xf86LoadOneModule(hotplug_driver_name, NULL);
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index d90d1ad..fe13816 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -424,7 +424,7 @@ typedef struct {
rgb blackColour;
rgb whiteColour;
int defaultVisual;
- char **modes;
+ const char **modes;
pointer options;
} DispRec, *DispPtr;
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 2347b8e..d70ba28 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -482,7 +482,7 @@ FindModule(const char *module, const char *dirname, const char **subdirlist,
return name;
}
-char **
+const char **
LoaderListDirs(const char **subdirlist, const char **patternlist)
{
char buf[PATH_MAX + 1];
@@ -490,7 +490,7 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
char **elem;
const char **subdirs;
const char **s;
- PatternPtr patterns;
+ PatternPtr patterns = NULL;
PatternPtr p;
DIR *d;
struct dirent *dp;
@@ -571,7 +571,7 @@ LoaderListDirs(const char **subdirlist, const char **patternlist)
FreePatterns(patterns);
FreeSubdirs(subdirs);
FreePathList(pathlist);
- return ret;
+ return (const char **) ret;
}
void
diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c
index 87ddfc6..243ba91 100644
--- a/hw/xfree86/parser/Module.c
+++ b/hw/xfree86/parser/Module.c
@@ -218,7 +218,7 @@ xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr)
}
XF86LoadPtr
-xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type,
+xf86addNewLoadDirective(XF86LoadPtr head, const char *name, int type,
XF86OptionPtr opts)
{
XF86LoadPtr new;
diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index 4576ee1..60509dc 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -67,7 +67,7 @@ int xf86validateLayout(XF86ConfigPtr p);
XF86ConfModulePtr xf86parseModuleSection(void);
void xf86printModuleSection(FILE * cf, XF86ConfModulePtr ptr);
extern _X_EXPORT XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head,
- char *name, int type,
+ const char *name, int type,
XF86OptionPtr opts);
void xf86freeModules(XF86ConfModulePtr ptr);
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index 1f66329..0fcf405 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -180,7 +180,7 @@ typedef struct {
GenericListRec list;
const char *mon_identifier;
const char *mon_vendor;
- const char *mon_modelname;
+ char *mon_modelname;
int mon_width; /* in mm */
int mon_height; /* in mm */
XF86ConfModeLinePtr mon_modeline_lst;
@@ -304,7 +304,7 @@ typedef struct {
typedef struct {
GenericListRec list;
- const char *identifier;
+ char *identifier;
const char *driver;
struct xorg_list match_product;
struct xorg_list match_vendor;
commit 27b44949a3d2e34ac10e801bd8a8fc2c28791e7e
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 16:24:15 2013 +0900
hw/xfree86: Lots of constant string support
Make lots of string pointers 'const char' so that we can use constant
strings with them without eliciting warnings.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/dgaproc.h b/hw/xfree86/common/dgaproc.h
index e824d30..87e923f 100644
--- a/hw/xfree86/common/dgaproc.h
+++ b/hw/xfree86/common/dgaproc.h
@@ -24,7 +24,7 @@
typedef struct {
int num; /* A unique identifier for the mode (num > 0) */
- char *name; /* name of mode given in the XF86Config */
+ const char *name; /* name of mode given in the XF86Config */
int VSync_num;
int VSync_den;
int flags; /* DGA_CONCURRENT_ACCESS, etc... */
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index eada01c..9fc0c5b 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -349,7 +349,7 @@ xf86SetBackingStore(ScreenPtr pScreen);
extern _X_EXPORT void
xf86SetSilkenMouse(ScreenPtr pScreen);
extern _X_EXPORT pointer
-xf86FindXvOptions(ScrnInfoPtr pScrn, int adapt_index, char *port_name,
+xf86FindXvOptions(ScrnInfoPtr pScrn, int adapt_index, const char *port_name,
char **adaptor_name, pointer *adaptor_options);
extern _X_EXPORT void
xf86GetOS(const char **name, int *major, int *minor, int *teeny);
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 91e8df9..5bf1f14 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -81,6 +81,7 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData,
int chipset)
{
int ret, i, j;
+ char *lower_driver;
if (!xf86DoConfigure || !xf86DoConfigurePass1)
return NULL;
@@ -117,8 +118,9 @@ xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData,
DevToConfig[i].iDriver = CurrentDriver;
/* Fill in what we know, converting the driver name to lower case */
- DevToConfig[i].GDev.driver = xnfalloc(strlen(driver) + 1);
- for (j = 0; (DevToConfig[i].GDev.driver[j] = tolower(driver[j])); j++);
+ lower_driver = xnfalloc(strlen(driver) + 1);
+ for (j = 0; (lower_driver[j] = tolower(driver[j])); j++);
+ DevToConfig[i].GDev.driver = lower_driver;
switch (bus) {
#ifdef XSERVER_LIBPCIACCESS
diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h
index c3ba2d7..f99a924 100644
--- a/hw/xfree86/common/xf86Opt.h
+++ b/hw/xfree86/common/xf86Opt.h
@@ -39,7 +39,7 @@ typedef struct {
typedef union {
unsigned long num;
- char *str;
+ const char *str;
double realnum;
Bool bool;
OptFrequency freq;
diff --git a/hw/xfree86/common/xf86Optionstr.h b/hw/xfree86/common/xf86Optionstr.h
index c38499c..4ef917d 100644
--- a/hw/xfree86/common/xf86Optionstr.h
+++ b/hw/xfree86/common/xf86Optionstr.h
@@ -31,10 +31,10 @@
*/
typedef struct _XF86OptionRec {
GenericListRec list;
- char *opt_name;
- char *opt_val;
+ const char *opt_name;
+ const char *opt_val;
int opt_used;
- char *opt_comment;
+ const char *opt_comment;
} XF86OptionRec;
typedef struct _InputOption *XF86OptionPtr;
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index e20be03..ddcb3ca 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -136,7 +136,7 @@ typedef struct {
/* Information for root window properties. */
typedef struct _RootWinProp {
struct _RootWinProp *next;
- char *name;
+ const char *name;
Atom type;
short format;
long size;
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 35c38a5..b95fbe5 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -82,8 +82,8 @@ typedef struct _InputDriverRec {
typedef struct _InputInfoRec {
struct _InputInfoRec *next;
- char *name;
- char *driver;
+ const char *name;
+ const char *driver;
int flags;
diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h
index a4d9c6c..5ebdf25 100644
--- a/hw/xfree86/common/xf86sbusBus.h
+++ b/hw/xfree86/common/xf86sbusBus.h
@@ -52,16 +52,16 @@ typedef struct sbus_device {
int fd;
int width, height;
sbusPromNode node;
- char *descr;
- char *device;
+ const char *descr;
+ const char *device;
} sbusDevice, *sbusDevicePtr;
struct sbus_devtable {
int devId;
int fbType;
- char *promName;
- char *driverName;
- char *descr;
+ const char *promName;
+ const char *driverName;
+ const char *descr;
};
extern _X_EXPORT void xf86SbusProbe(void);
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 0244fd4..d90d1ad 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -145,7 +145,7 @@ typedef enum {
typedef struct _DisplayModeRec {
struct _DisplayModeRec *prev;
struct _DisplayModeRec *next;
- char *name; /* identifier for the mode */
+ const char *name; /* identifier for the mode */
ModeStatus status;
int type;
@@ -212,9 +212,9 @@ typedef struct {
#define GAMMA_ZERO (GAMMA_MIN / 100.0)
typedef struct {
- char *id;
- char *vendor;
- char *model;
+ const char *id;
+ const char *vendor;
+ const char *model;
int nHsync;
range hsync[MAX_HSYNC];
int nVrefresh;
@@ -386,19 +386,19 @@ typedef enum {
} DacSpeedIndex;
typedef struct {
- char *identifier;
- char *vendor;
- char *board;
- char *chipset;
- char *ramdac;
- char *driver;
+ const char *identifier;
+ const char *vendor;
+ const char *board;
+ const char *chipset;
+ const char *ramdac;
+ const char *driver;
struct _confscreenrec *myScreenSection;
Bool claimed;
int dacSpeeds[MAXDACSPEEDS];
int numclocks;
int clock[MAXCLOCKS];
- char *clockchip;
- char *busID;
+ const char *clockchip;
+ const char *busID;
Bool active;
Bool inUse;
int videoRam;
@@ -429,19 +429,19 @@ typedef struct {
} DispRec, *DispPtr;
typedef struct _confxvportrec {
- char *identifier;
+ const char *identifier;
pointer options;
} confXvPortRec, *confXvPortPtr;
typedef struct _confxvadaptrec {
- char *identifier;
+ const char *identifier;
int numports;
confXvPortPtr ports;
pointer options;
} confXvAdaptorRec, *confXvAdaptorPtr;
typedef struct _confscreenrec {
- char *id;
+ const char *id;
int screennum;
int defaultdepth;
int defaultbpp;
@@ -467,25 +467,25 @@ typedef enum {
typedef struct _screenlayoutrec {
confScreenPtr screen;
- char *topname;
+ const char *topname;
confScreenPtr top;
- char *bottomname;
+ const char *bottomname;
confScreenPtr bottom;
- char *leftname;
+ const char *leftname;
confScreenPtr left;
- char *rightname;
+ const char *rightname;
confScreenPtr right;
PositionType where;
int x;
int y;
- char *refname;
+ const char *refname;
confScreenPtr refscreen;
} screenLayoutRec, *screenLayoutPtr;
typedef struct _InputInfoRec InputInfoRec;
typedef struct _serverlayoutrec {
- char *id;
+ const char *id;
screenLayoutPtr screens;
GDevPtr inactives;
InputInfoRec **inputs; /* NULL terminated */
diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h
index 091efca..f393369 100644
--- a/hw/xfree86/common/xf86xv.h
+++ b/hw/xfree86/common/xf86xv.h
@@ -137,7 +137,7 @@ typedef enum {
typedef struct {
int id;
- char *name;
+ const char *name;
unsigned short width, height;
XvRationalRec rate;
} XF86VideoEncodingRec, *XF86VideoEncodingPtr;
@@ -151,13 +151,13 @@ typedef struct {
int flags;
int min_value;
int max_value;
- char *name;
+ const char *name;
} XF86AttributeRec, *XF86AttributePtr;
typedef struct {
unsigned int type;
int flags;
- char *name;
+ const char *name;
int nEncodings;
XF86VideoEncodingPtr pEncodings;
int nFormats;
diff --git a/hw/xfree86/common/xf86xvmc.h b/hw/xfree86/common/xf86xvmc.h
index 2478fe3..aaa4e65 100644
--- a/hw/xfree86/common/xf86xvmc.h
+++ b/hw/xfree86/common/xf86xvmc.h
@@ -109,7 +109,7 @@ typedef void (*xf86XvMCDestroySubpictureProcPtr) (ScrnInfoPtr pScrn,
XvMCSubpicturePtr subpicture);
typedef struct {
- char *name;
+ const char *name;
int num_surfaces;
XF86MCSurfaceInfoPtr *surfaces;
int num_subpictures;
diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h
index 81cc1fc..62e5142 100644
--- a/hw/xfree86/parser/Configint.h
+++ b/hw/xfree86/parser/Configint.h
@@ -90,7 +90,7 @@ typedef struct {
#include "configProcs.h"
#include <stdlib.h>
-#define TestFree(a) if (a) { free (a); a = NULL; }
+#define TestFree(a) if (a) { free ((void *) a); a = NULL; }
#define parsePrologue(typeptr,typerec) typeptr ptr; \
if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return NULL; }
diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
index 0d3e47a..a6e18dd 100644
--- a/hw/xfree86/parser/Files.c
+++ b/hw/xfree86/parser/Files.c
@@ -97,8 +97,7 @@ xf86parseFilesSection(void)
j = FALSE;
str = val.str;
if (ptr->file_fontpath == NULL) {
- ptr->file_fontpath = malloc(1);
- ptr->file_fontpath[0] = '\0';
+ ptr->file_fontpath = calloc(1, 1);
i = strlen(str) + 1;
}
else {
diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c
index 2461476..326c6b7 100644
--- a/hw/xfree86/parser/Flags.c
+++ b/hw/xfree86/parser/Flags.c
@@ -189,7 +189,7 @@ xf86printServerFlagsSection(FILE * f, XF86ConfFlagsPtr flags)
}
static XF86OptionPtr
-addNewOption2(XF86OptionPtr head, char *name, char *val, int used)
+addNewOption2(XF86OptionPtr head, char *name, char *_val, int used)
{
XF86OptionPtr new, old = NULL;
@@ -202,7 +202,7 @@ addNewOption2(XF86OptionPtr head, char *name, char *val, int used)
else
new = calloc(1, sizeof(*new));
new->opt_name = name;
- new->opt_val = val;
+ new->opt_val = _val;
new->opt_used = used;
if (old)
@@ -211,9 +211,9 @@ addNewOption2(XF86OptionPtr head, char *name, char *val, int used)
}
XF86OptionPtr
-xf86addNewOption(XF86OptionPtr head, char *name, char *val)
+xf86addNewOption(XF86OptionPtr head, char *name, char *_val)
{
- return addNewOption2(head, name, val, 0);
+ return addNewOption2(head, name, _val, 0);
}
void
@@ -230,11 +230,11 @@ XF86OptionPtr
xf86optionListDup(XF86OptionPtr opt)
{
XF86OptionPtr newopt = NULL;
- char *val;
+ char *_val;
while (opt) {
- val = opt->opt_val ? strdup(opt->opt_val) : NULL;
- newopt = xf86addNewOption(newopt, strdup(opt->opt_name), val);
+ _val = opt->opt_val ? strdup(opt->opt_val) : NULL;
+ newopt = xf86addNewOption(newopt, strdup(opt->opt_name), _val);
newopt->opt_used = opt->opt_used;
if (opt->opt_comment)
newopt->opt_comment = strdup(opt->opt_comment);
diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index 1250f39..4576ee1 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -141,7 +141,7 @@ xf86freeExtensions(XF86ConfExtensionsPtr ptr);
#include <xorg-config.h>
#endif
-#ifndef IN_XSERVER
+#ifndef HAVE_XORG_CONFIG_H
/* Externally provided functions */
void
ErrorF(const char *f, ...);
diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c
index f852b83..55a8442 100644
--- a/hw/xfree86/parser/scan.c
+++ b/hw/xfree86/parser/scan.c
@@ -820,7 +820,7 @@ static char *
OpenConfigDir(const char *path, const char *cmdline, const char *projroot,
const char *confname)
{
- char *dirpath, *pathcopy;
+ char *dirpath = NULL, *pathcopy;
const char *template;
Bool found = FALSE;
int cmdlineUsed = 0;
@@ -1078,9 +1078,10 @@ xf86nameCompare(const char *s1, const char *s2)
}
char *
-xf86addComment(char *cur, char *add)
+xf86addComment(char *cur, const char *add)
{
char *str;
+ const char *cstr;
int len, curlen, iscomment, hasnewline = 0, insnewline, endnewline;
if (add == NULL || add[0] == '\0')
@@ -1095,14 +1096,14 @@ xf86addComment(char *cur, char *add)
else
curlen = 0;
- str = add;
+ cstr = add;
iscomment = 0;
- while (*str) {
- if (*str != ' ' && *str != '\t')
+ while (*cstr) {
+ if (*cstr != ' ' && *cstr != '\t')
break;
- ++str;
+ ++cstr;
}
- iscomment = (*str == '#');
+ iscomment = (*cstr == '#');
len = strlen(add);
endnewline = add[len - 1] == '\n';
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
index e7210e8..1f66329 100644
--- a/hw/xfree86/parser/xf86Parser.h
+++ b/hw/xfree86/parser/xf86Parser.h
@@ -85,7 +85,7 @@ typedef struct {
typedef struct {
GenericListRec list;
int load_type;
- char *load_name;
+ const char *load_name;
XF86OptionPtr load_opt;
char *load_comment;
int ignore;
@@ -116,7 +116,7 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *ml_identifier;
+ const char *ml_identifier;
int ml_clock;
int ml_hdisplay;
int ml_hsyncstart;
@@ -134,21 +134,21 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *vp_identifier;
+ const char *vp_identifier;
XF86OptionPtr vp_option_lst;
char *vp_comment;
} XF86ConfVideoPortRec, *XF86ConfVideoPortPtr;
typedef struct {
GenericListRec list;
- char *va_identifier;
- char *va_vendor;
- char *va_board;
- char *va_busid;
- char *va_driver;
+ const char *va_identifier;
+ const char *va_vendor;
+ const char *va_board;
+ const char *va_busid;
+ const char *va_driver;
XF86OptionPtr va_option_lst;
XF86ConfVideoPortPtr va_port_lst;
- char *va_fwdref;
+ const char *va_fwdref;
char *va_comment;
} XF86ConfVideoAdaptorRec, *XF86ConfVideoAdaptorPtr;
@@ -165,22 +165,22 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *modes_identifier;
+ const char *modes_identifier;
XF86ConfModeLinePtr mon_modeline_lst;
char *modes_comment;
} XF86ConfModesRec, *XF86ConfModesPtr;
typedef struct {
GenericListRec list;
- char *ml_modes_str;
+ const char *ml_modes_str;
XF86ConfModesPtr ml_modes;
} XF86ConfModesLinkRec, *XF86ConfModesLinkPtr;
typedef struct {
GenericListRec list;
- char *mon_identifier;
- char *mon_vendor;
- char *mon_modelname;
+ const char *mon_identifier;
+ const char *mon_vendor;
+ const char *mon_modelname;
int mon_width; /* in mm */
int mon_height; /* in mm */
XF86ConfModeLinePtr mon_modeline_lst;
@@ -201,21 +201,21 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *dev_identifier;
- char *dev_vendor;
- char *dev_board;
- char *dev_chipset;
- char *dev_busid;
- char *dev_card;
- char *dev_driver;
- char *dev_ramdac;
+ const char *dev_identifier;
+ const char *dev_vendor;
+ const char *dev_board;
+ const char *dev_chipset;
+ const char *dev_busid;
+ const char *dev_card;
+ const char *dev_driver;
+ const char *dev_ramdac;
int dev_dacSpeeds[CONF_MAXDACSPEEDS];
int dev_videoram;
int dev_textclockfreq;
unsigned long dev_bios_base;
unsigned long dev_mem_base;
unsigned long dev_io_base;
- char *dev_clockchip;
+ const char *dev_clockchip;
int dev_clocks;
int dev_clock[CONF_MAXCLOCKS];
int dev_chipid;
@@ -228,7 +228,7 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *mode_name;
+ const char *mode_name;
} XF86ModeRec, *XF86ModePtr;
typedef struct {
@@ -239,7 +239,7 @@ typedef struct {
int disp_virtualY;
int disp_depth;
int disp_bpp;
- char *disp_visual;
+ const char *disp_visual;
parser_rgb disp_weight;
parser_rgb disp_black;
parser_rgb disp_white;
@@ -255,20 +255,20 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *al_adaptor_str;
+ const char *al_adaptor_str;
XF86ConfVideoAdaptorPtr al_adaptor;
} XF86ConfAdaptorLinkRec, *XF86ConfAdaptorLinkPtr;
typedef struct {
GenericListRec list;
- char *scrn_identifier;
- char *scrn_obso_driver;
+ const char *scrn_identifier;
+ const char *scrn_obso_driver;
int scrn_defaultdepth;
int scrn_defaultbpp;
int scrn_defaultfbbpp;
- char *scrn_monitor_str;
+ const char *scrn_monitor_str;
XF86ConfMonitorPtr scrn_monitor;
- char *scrn_device_str;
+ const char *scrn_device_str;
XF86ConfDevicePtr scrn_device;
XF86ConfAdaptorLinkPtr scrn_adaptor_lst;
XF86ConfDisplayPtr scrn_display_lst;
@@ -279,8 +279,8 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *inp_identifier;
- char *inp_driver;
+ const char *inp_identifier;
+ const char *inp_driver;
XF86OptionPtr inp_option_lst;
char *inp_comment;
} XF86ConfInputRec, *XF86ConfInputPtr;
@@ -288,7 +288,7 @@ typedef struct {
typedef struct {
GenericListRec list;
XF86ConfInputPtr iref_inputdev;
- char *iref_inputdev_str;
+ const char *iref_inputdev_str;
XF86OptionPtr iref_option_lst;
} XF86ConfInputrefRec, *XF86ConfInputrefPtr;
@@ -304,8 +304,8 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *identifier;
- char *driver;
+ const char *identifier;
+ const char *driver;
struct xorg_list match_product;
struct xorg_list match_vendor;
struct xorg_list match_device;
@@ -338,30 +338,30 @@ typedef struct {
GenericListRec list;
int adj_scrnum;
XF86ConfScreenPtr adj_screen;
- char *adj_screen_str;
+ const char *adj_screen_str;
XF86ConfScreenPtr adj_top;
- char *adj_top_str;
+ const char *adj_top_str;
XF86ConfScreenPtr adj_bottom;
- char *adj_bottom_str;
+ const char *adj_bottom_str;
XF86ConfScreenPtr adj_left;
- char *adj_left_str;
+ const char *adj_left_str;
XF86ConfScreenPtr adj_right;
- char *adj_right_str;
+ const char *adj_right_str;
int adj_where;
int adj_x;
int adj_y;
- char *adj_refscreen;
+ const char *adj_refscreen;
} XF86ConfAdjacencyRec, *XF86ConfAdjacencyPtr;
typedef struct {
GenericListRec list;
- char *inactive_device_str;
+ const char *inactive_device_str;
XF86ConfDevicePtr inactive_device;
} XF86ConfInactiveRec, *XF86ConfInactivePtr;
typedef struct {
GenericListRec list;
- char *lay_identifier;
+ const char *lay_identifier;
XF86ConfAdjacencyPtr lay_adjacency_lst;
XF86ConfInactivePtr lay_inactive_lst;
XF86ConfInputrefPtr lay_input_lst;
@@ -371,22 +371,22 @@ typedef struct {
typedef struct {
GenericListRec list;
- char *vs_name;
- char *vs_identifier;
+ const char *vs_name;
+ const char *vs_identifier;
XF86OptionPtr vs_option_lst;
char *vs_comment;
} XF86ConfVendSubRec, *XF86ConfVendSubPtr;
typedef struct {
GenericListRec list;
- char *vnd_identifier;
+ const char *vnd_identifier;
XF86OptionPtr vnd_option_lst;
XF86ConfVendSubPtr vnd_sub_lst;
char *vnd_comment;
} XF86ConfVendorRec, *XF86ConfVendorPtr;
typedef struct {
- char *dri_group_name;
+ const char *dri_group_name;
int dri_group;
int dri_mode;
char *dri_comment;
@@ -462,7 +462,7 @@ extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1,
extern _X_EXPORT int xf86pathIsAbsolute(const char *path);
extern _X_EXPORT int xf86pathIsSafe(const char *path);
-extern _X_EXPORT char *xf86addComment(char *cur, char *add);
+extern _X_EXPORT char *xf86addComment(char *cur, const char *add);
extern _X_EXPORT Bool xf86getBoolValue(Bool *val, const char *str);
#endif /* _xf86Parser_h_ */
commit 6f77e2645ea36e324ccc664aae1d36464418bdea
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 15 13:40:30 2013 +0900
hw/xfree86: Make strings in DriverRec and ScrnInfoRec const
This avoids compiler warnings when initializing with string constants.
Signed-off-by: Keith Packard <keithp at keithp.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 4c2d147..0244fd4 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -299,7 +299,7 @@ struct _DriverRec;
typedef struct {
int driverVersion;
- char *driverName;
+ const char *driverName;
void (*Identify) (int flags);
Bool (*Probe) (struct _DriverRec * drv, int flags);
const OptionInfoRec *(*AvailableOptions) (int chipid, int bustype);
@@ -315,7 +315,7 @@ struct xf86_platform_device;
typedef struct _DriverRec {
int driverVersion;
- char *driverName;
+ const char *driverName;
void (*Identify) (int flags);
Bool (*Probe) (struct _DriverRec * drv, int flags);
const OptionInfoRec *(*AvailableOptions) (int chipid, int bustype);
@@ -671,7 +671,7 @@ typedef void xf86ModeSetProc(ScrnInfoPtr);
typedef struct _ScrnInfoRec {
int driverVersion;
- char *driverName; /* canonical name used in */
+ const char *driverName; /* canonical name used in */
/* the config file */
ScreenPtr pScreen; /* Pointer to the ScreenRec */
int scrnIndex; /* Number of this screen */
@@ -730,7 +730,7 @@ typedef struct _ScrnInfoRec {
int heightmm;
int xDpi; /* width DPI */
int yDpi; /* height DPI */
- char *name; /* Name to prefix messages */
+ const char *name; /* Name to prefix messages */
pointer driverPrivate; /* Driver private area */
DevUnion *privates; /* Other privates can hook in
* here */
@@ -741,9 +741,9 @@ typedef struct _ScrnInfoRec {
/* Some of these may be moved out of here into the driver private area */
- char *chipset; /* chipset name */
- char *ramdac; /* ramdac name */
- char *clockchip; /* clock name */
+ const char *chipset; /* chipset name */
+ const char *ramdac; /* ramdac name */
+ const char *clockchip; /* clock name */
Bool progClock; /* clock is programmable */
int numClocks; /* number of clocks */
int clock[MAXCLOCKS]; /* list of clock frequencies */
commit a92c6406e7f6c0b74fb1cb9361ad904facc0f722
Author: Keith Packard <keithp at keithp.com>
Date: Thu Jan 9 11:10:11 2014 +0800
Bump release to 1.15.99.900
The merge window for 1.16 is open
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/configure.ac b/configure.ac
index 8f82386..c9f0192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.15.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-12-27"
-RELEASE_NAME="Egg Nog"
+AC_INIT([xorg-server], 1.15.99.900, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2014-01-09"
+RELEASE_NAME="Golden Gaytime"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_USE_SYSTEM_EXTENSIONS
More information about the Xquartz-changes
mailing list