diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:53:50 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-22 19:56:32 -0800 |
| commit | 9c108b3ccdb4086002b83d9ad66f5619e9ec95bb (patch) | |
| tree | 60f62dc84a23f3d900cf8075599087f7253351cd | |
| parent | 04e320a4e4e1f46bf95e36078d93b4d18a0ef855 (diff) | |
exa: Fix -Wshadow warnings
In exa_accel, there was a duplicate fetch of a pixmap private field.
exa_render just had a regular shadowed value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | exa/exa_accel.c | 1 | ||||
| -rw-r--r-- | exa/exa_render.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 0e948f414..9c742bdc9 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -1039,7 +1039,6 @@ exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel, pExaPixmap->sys_ptr && pDrawable->type == DRAWABLE_PIXMAP && pDrawable->width == 1 && pDrawable->height == 1 && pDrawable->bitsPerPixel != 24) { - ExaPixmapPriv(pPixmap); RegionPtr pending_damage = DamagePendingRegion(pExaPixmap->pDamage); switch (pDrawable->bitsPerPixel) { diff --git a/exa/exa_render.c b/exa/exa_render.c index 172e2b56d..c4edf407e 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -915,7 +915,7 @@ exaComposite(CARD8 op, if (!pSrc->repeat && xSrc >= 0 && ySrc >= 0 && (xSrc + width <= pSrc->pDrawable->width) && (ySrc + height <= pSrc->pDrawable->height)) { - Bool ret; + Bool suc; xDst += pDst->pDrawable->x; yDst += pDst->pDrawable->y; @@ -927,7 +927,7 @@ exaComposite(CARD8 op, yDst, width, height)) goto done; - ret = exaHWCopyNtoN(pSrc->pDrawable, pDst->pDrawable, NULL, + suc = exaHWCopyNtoN(pSrc->pDrawable, pDst->pDrawable, NULL, RegionRects(®ion), RegionNumRects(®ion), xSrc - xDst, ySrc - yDst, FALSE, FALSE); @@ -939,7 +939,7 @@ exaComposite(CARD8 op, xSrc -= pSrc->pDrawable->x; ySrc -= pSrc->pDrawable->y; - if (!ret) + if (!suc) goto fallback; goto done; |