From 1b0fcca503ae9cf2d462b60770f96c794dfbb27a Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 15 Jan 2014 21:23:25 +0100 Subject: mesa xkeyboard-config xserver git update 15 jan 2014 xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43 --- xorg-server/dix/dispatch.c | 82 +++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'xorg-server/dix/dispatch.c') diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index 8dcd9cbcf..e28270c16 100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/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; } @@ -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; } -- cgit v1.2.3