From f26f17c66a714a226d83dd45bd760288eff3de32 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 20 Aug 2024 18:23:48 +0200 Subject: [PATCH] treewide: mark pGC->ops->CopyArea() calls not using result as void We alread have several of these calls, that aren't interested in result value, explicitly casting to void. Fixing this up for the remaining ones. This is helpful for the human reader as well as quality analysis tools. Signed-off-by: Enrico Weigelt, metux IT consult Part-of: --- Xext/shm.c | 2 +- composite/compalloc.c | 4 ++-- dbe/midbe.c | 8 ++++---- dix/pixmap.c | 2 +- glamor/glamor_egl.c | 2 +- hw/xfree86/drivers/modesetting/dri2.c | 2 +- hw/xfree86/drivers/modesetting/drmmode_display.c | 2 +- mi/mibitblt.c | 2 +- mi/midispcur.c | 4 ++-- present/present.c | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Xext/shm.c b/Xext/shm.c index 1e236cc51d..9cface24db 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -482,7 +482,7 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC, PixmapBytePad(w, depth), data); if (!pPixmap) return; - pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC, sx, sy, sw, sh, dx, + (void) pGC->ops->CopyArea((DrawablePtr) pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy); FreeScratchPixmapHeader(pPixmap); } diff --git a/composite/compalloc.c b/composite/compalloc.c index f97b6c6884..8e9891b9ae 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -247,7 +247,7 @@ compRestoreWindow(WindowPtr pWin, PixmapPtr pPixmap) val.val = IncludeInferiors; ChangeGC(NullClient, pGC, GCSubwindowMode, &val); ValidateGC(&pWin->drawable, pGC); - (*pGC->ops->CopyArea) (&pPixmap->drawable, + (void) (*pGC->ops->CopyArea) (&pPixmap->drawable, &pWin->drawable, pGC, x, y, w, h, 0, 0); FreeScratchGC(pGC); } @@ -552,7 +552,7 @@ compNewPixmap(WindowPtr pWin, int x, int y, int w, int h) val.val = IncludeInferiors; ChangeGC(NullClient, pGC, GCSubwindowMode, &val); ValidateGC(&pPixmap->drawable, pGC); - (*pGC->ops->CopyArea) (&pParent->drawable, + (void) (*pGC->ops->CopyArea) (&pParent->drawable, &pPixmap->drawable, pGC, x - pParent->drawable.x, diff --git a/dbe/midbe.c b/dbe/midbe.c index 0b3b25ade9..007f985c33 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -275,7 +275,7 @@ miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo) case XdbeUntouched: ValidateGC((DrawablePtr) pDbeWindowPriv->pFrontBuffer, pGC); - (*pGC->ops->CopyArea) ((DrawablePtr) pWin, + (void) (*pGC->ops->CopyArea) ((DrawablePtr) pWin, (DrawablePtr) pDbeWindowPriv->pFrontBuffer, pGC, 0, 0, pWin->drawable.width, pWin->drawable.height, 0, 0); @@ -293,7 +293,7 @@ miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo) */ ValidateGC((DrawablePtr) pWin, pGC); - (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer, + (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer, (DrawablePtr) pWin, pGC, 0, 0, pWin->drawable.width, pWin->drawable.height, 0, 0); @@ -620,7 +620,7 @@ miDbePositionWindow(WindowPtr pWin, int x, int y) } /* Copy the contents of the old front pixmap to the new one. */ if (pWin->bitGravity != ForgetGravity) { - (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pFrontBuffer, + (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pFrontBuffer, (DrawablePtr) pFrontBuffer, pGC, sourcex, sourcey, savewidth, saveheight, destx, desty); @@ -633,7 +633,7 @@ miDbePositionWindow(WindowPtr pWin, int x, int y) } /* Copy the contents of the old back pixmap to the new one. */ if (pWin->bitGravity != ForgetGravity) { - (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer, + (void) (*pGC->ops->CopyArea) ((DrawablePtr) pDbeWindowPriv->pBackBuffer, (DrawablePtr) pBackBuffer, pGC, sourcex, sourcey, savewidth, saveheight, destx, desty); diff --git a/dix/pixmap.c b/dix/pixmap.c index a58795c782..a5db9c8bce 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -278,7 +278,7 @@ PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src, w = dst_box.x2 - dst_box.x1; h = dst_box.y2 - dst_box.y1; - pGC->ops->CopyArea(src, &dst->drawable, pGC, + (void) pGC->ops->CopyArea(src, &dst->drawable, pGC, x + dst_box.x1, y + dst_box.y1, w, h, dst_x + dst_box.x1, dst_y + dst_box.y1); b++; diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c index c2f49131be..5e0cbb035c 100644 --- a/glamor/glamor_egl.c +++ b/glamor/glamor_egl.c @@ -354,7 +354,7 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok) scratch_gc = GetScratchGC(pixmap->drawable.depth, screen); ValidateGC(&pixmap->drawable, scratch_gc); - scratch_gc->ops->CopyArea(&pixmap->drawable, &exported->drawable, + (void) scratch_gc->ops->CopyArea(&pixmap->drawable, &exported->drawable, scratch_gc, 0, 0, width, height, 0, 0); FreeScratchGC(scratch_gc); diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c index 86092565f1..db755613af 100644 --- a/hw/xfree86/drivers/modesetting/dri2.c +++ b/hw/xfree86/drivers/modesetting/dri2.c @@ -320,7 +320,7 @@ ms_dri2_copy_region2(ScreenPtr screen, DrawablePtr drawable, RegionPtr pRegion, * callback chain so we know that will happen before the client * tries to render again. */ - gc->ops->CopyArea(src, dst, gc, + (void) gc->ops->CopyArea(src, dst, gc, 0, 0, drawable->width, drawable->height, off_x, off_y); diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index a21198b35c..a3e2931556 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1565,7 +1565,7 @@ drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode) gc = GetScratchGC(pScrn->depth, pScreen); ValidateGC(&dst->drawable, gc); - (*gc->ops->CopyArea)(&src->drawable, &dst->drawable, gc, 0, 0, + (void) (*gc->ops->CopyArea)(&src->drawable, &dst->drawable, gc, 0, 0, pScrn->virtualX, pScrn->virtualY, 0, 0); FreeScratchGC(gc); diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 0b13e49e43..dbcd94c99e 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -465,7 +465,7 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc, gcv[0].val = GXinvert; ChangeGC(NullClient, pGCT, GCFunction, gcv); ValidateGC((DrawablePtr) pPixmap, pGCT); - (*pGCT->ops->CopyArea) ((DrawablePtr) pPixmap, (DrawablePtr) pPixmap, + (void) (*pGCT->ops->CopyArea) ((DrawablePtr) pPixmap, (DrawablePtr) pPixmap, pGCT, 0, 0, w + srcx, h, 0, 0); /* Swap foreground and background colors on the GC for the drawable. diff --git a/mi/midispcur.c b/mi/midispcur.c index e5a982976b..dc4928fd7a 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -408,7 +408,7 @@ miDCSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen, pGC = pBuffer->pSaveGC; if (pSave->drawable.serialNumber != pGC->serialNumber) ValidateGC((DrawablePtr) pSave, pGC); - (*pGC->ops->CopyArea) ((DrawablePtr) pWin, (DrawablePtr) pSave, pGC, + (void) (*pGC->ops->CopyArea) ((DrawablePtr) pWin, (DrawablePtr) pSave, pGC, x, y, w, h, 0, 0); return TRUE; } @@ -432,7 +432,7 @@ miDCRestoreUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen, pGC = pBuffer->pRestoreGC; if (pWin->drawable.serialNumber != pGC->serialNumber) ValidateGC((DrawablePtr) pWin, pGC); - (*pGC->ops->CopyArea) ((DrawablePtr) pSave, (DrawablePtr) pWin, pGC, + (void) (*pGC->ops->CopyArea) ((DrawablePtr) pSave, (DrawablePtr) pWin, pGC, 0, 0, w, h, x, y); return TRUE; } diff --git a/present/present.c b/present/present.c index 6fb73901ef..7e8c7506b8 100644 --- a/present/present.c +++ b/present/present.c @@ -84,7 +84,7 @@ present_copy_region(DrawablePtr drawable, (*gc->funcs->ChangeClip)(gc, CT_REGION, update, 0); } ValidateGC(drawable, gc); - (*gc->ops->CopyArea)(&pixmap->drawable, + (void) (*gc->ops->CopyArea)(&pixmap->drawable, drawable, gc, 0, 0,