frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fb: fix shadow warnings 

fbblt.c: In function 'fbBlt':
fbblt.c:76:16: warning: declaration of 'src' shadows a previous local
fbblt.c:52:13: warning: shadowed declaration is here
fbblt.c:77:16: warning: declaration of 'dst' shadows a previous local
fbblt.c:52:19: warning: shadowed declaration is here
fbbltone.c: In function 'fbBltPlane':
fbbltone.c:742:13: warning: declaration of 'w' shadows a previous local
fbbltone.c:725:9: warning: shadowed declaration is here

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Yaakov Selkowitz 2012-10-16 02:21:04 -05:00
parent e8d45f3018
commit 1fe30c0067
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fb/fbblt.c
View File

@ -73,21 +73,21 @@ fbBlt(FbBits * srcLine,
if (alu == GXcopy && pm == FB_ALLONES && !careful && if (alu == GXcopy && pm == FB_ALLONES && !careful &&
!(srcX & 7) && !(dstX & 7) && !(width & 7)) { !(srcX & 7) && !(dstX & 7) && !(width & 7)) {
int i; int i;
CARD8 *src = (CARD8 *) srcLine; CARD8 *tmpsrc = (CARD8 *) srcLine;
CARD8 *dst = (CARD8 *) dstLine; CARD8 *tmpdst = (CARD8 *) dstLine;
srcStride *= sizeof(FbBits); srcStride *= sizeof(FbBits);
dstStride *= sizeof(FbBits); dstStride *= sizeof(FbBits);
width >>= 3; width >>= 3;
src += (srcX >> 3); tmpsrc += (srcX >> 3);
dst += (dstX >> 3); tmpdst += (dstX >> 3);
if (!upsidedown) if (!upsidedown)
for (i = 0; i < height; i++) for (i = 0; i < height; i++)
MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width); MEMCPY_WRAPPED(tmpdst + i * dstStride, tmpsrc + i * srcStride, width);
else else
for (i = height - 1; i >= 0; i--) for (i = height - 1; i >= 0; i--)
MEMCPY_WRAPPED(dst + i * dstStride, src + i * srcStride, width); MEMCPY_WRAPPED(tmpdst + i * dstStride, tmpsrc + i * srcStride, width);
return; return;
} }

8
fb/fbbltone.c
View File

@ -739,12 +739,12 @@ fbBltPlane(FbBits * src,
pm = fbReplicatePixel(planeMask, srcBpp); pm = fbReplicatePixel(planeMask, srcBpp);
if (srcBpp == 24) { if (srcBpp == 24) {
int w = 24; int tmpw = 24;
rot0 = FbFirst24Rot(srcX); rot0 = FbFirst24Rot(srcX);
if (srcX + w > FB_UNIT) if (srcX + tmpw > FB_UNIT)
w = FB_UNIT - srcX; tmpw = FB_UNIT - srcX;
srcMaskFirst = FbRot24(pm, rot0) & FbBitsMask(srcX, w); srcMaskFirst = FbRot24(pm, rot0) & FbBitsMask(srcX, tmpw);
} }
else { else {
rot0 = 0; rot0 = 0;