From a1cb69dc28fdbfbdfaf954e0bec221f759462399 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 15 Nov 2013 22:05:44 +0900 Subject: [PATCH] Xext: Clean up warnings GC funcs and ops are const. Remove unused variables. Signed-off-by: Keith Packard Reviewed-by: Adam Jackson --- Xext/panoramiX.c | 4 ++-- Xext/xres.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index ce0d072da..6f8939fb4 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 445abcab8..bdd49eb98 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); }