Skip to content

N
nx-libs
Commit 3a54da8b authored by Cyril Brulebois's avatar Cyril Brulebois Committed by Mike Gabriel
Browse files
Options

fb: Mark some variables as unused.

There's no use for the values set through the various macro calls (fbGetDrawable and fbGetDrawablePixmap), so mark those variables as unused. The following warnings go away accordingly: | CC libfb_la-fb24_32.lo | fb24_32.c: In function 'fb24_32ReformatTile': | fb24_32.c:544:19: warning: variable 'newYoff' set but not used [-Wunused-but-set-variable] | fb24_32.c:544:10: warning: variable 'newXoff' set but not used [-Wunused-but-set-variable] | fb24_32.c:543:19: warning: variable 'oldYoff' set but not used [-Wunused-but-set-variable] | fb24_32.c:543:10: warning: variable 'oldXoff' set but not used [-Wunused-but-set-variable] | CC libfb_la-fbfill.lo | fbfill.c: In function 'fbFill': | fbfill.c:72:21: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbfill.c:72:11: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] | fbfill.c:100:21: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbfill.c:100:11: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] | fbfill.c:142:20: warning: variable 'tileYoff' set but not used [-Wunused-but-set-variable] | fbfill.c:142:10: warning: variable 'tileXoff' set but not used [-Wunused-but-set-variable] | CC libfb_la-fbgc.lo | fbgc.c: In function 'fbPadPixmap': | fbgc.c:92:19: warning: variable 'yOff' set but not used [-Wunused-but-set-variable] | fbgc.c:92:13: warning: variable 'xOff' set but not used [-Wunused-but-set-variable] | fbgc.c: In function 'fbCanEvenStipple': | fbgc.c:166:23: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbgc.c:166:13: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] | CC libfb_la-fbpush.lo | fbpush.c: In function 'fbPushPixels': | fbpush.c:238:20: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbpush.c:238:10: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] Reviewed-by: 's avatarJeremy Huddleston <jeremyhu@apple.com> Signed-off-by: 's avatarCyril Brulebois <kibi@debian.org> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
parent b91099b9
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
nx-X11/programs/Xserver/fb/fb24_32.c
View file @ 3a54da8b
...@@ -534,8 +534,8 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel) ...@@ -534,8 +534,8 @@ fb24_32ReformatTile(PixmapPtr pOldTile, int bitsPerPixel)
FbStride oldStride, newStride; FbStride oldStride, newStride;
int oldBpp, newBpp; int oldBpp, newBpp;
fb24_32BltFunc blt; fb24_32BltFunc blt;
int oldXoff, oldYoff; _X_UNUSED int oldXoff, oldYoff;
int newXoff, newYoff; _X_UNUSED int newXoff, newYoff;
pNewTile = fbCreatePixmapBpp (pScreen, pNewTile = fbCreatePixmapBpp (pScreen,
pOldTile->drawable.width, pOldTile->drawable.width,
......
nx-X11/programs/Xserver/fb/fbfill.c
View file @ 3a54da8b
...@@ -72,7 +72,7 @@ fbFill (DrawablePtr pDrawable, ...@@ -72,7 +72,7 @@ fbFill (DrawablePtr pDrawable,
FbBits *stip; FbBits *stip;
FbStride stipStride; FbStride stipStride;
int stipBpp; int stipBpp;
int stipXoff, stipYoff; /* XXX assumed to be zero */ _X_UNUSED int stipXoff, stipYoff; /* XXX assumed to be zero */
if (pGC->fillStyle == FillStippled) if (pGC->fillStyle == FillStippled)
alu = FbStipple1Rop(pGC->alu,pGC->fgPixel); alu = FbStipple1Rop(pGC->alu,pGC->fgPixel);
...@@ -99,7 +99,7 @@ fbFill (DrawablePtr pDrawable, ...@@ -99,7 +99,7 @@ fbFill (DrawablePtr pDrawable,
FbStip *stip; FbStip *stip;
FbStride stipStride; FbStride stipStride;
int stipBpp; int stipBpp;
int stipXoff, stipYoff; /* XXX assumed to be zero */ _X_UNUSED int stipXoff, stipYoff; /* XXX assumed to be zero */
FbBits fgand, fgxor, bgand, bgxor; FbBits fgand, fgxor, bgand, bgxor;
fgand = pPriv->and; fgand = pPriv->and;
...@@ -140,7 +140,7 @@ fbFill (DrawablePtr pDrawable, ...@@ -140,7 +140,7 @@ fbFill (DrawablePtr pDrawable,
int tileBpp; int tileBpp;
int tileWidth; int tileWidth;
int tileHeight; int tileHeight;
int tileXoff, tileYoff; /* XXX assumed to be zero */ _X_UNUSED int tileXoff, tileYoff; /* XXX assumed to be zero */
fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff); fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);
tileWidth = pTile->drawable.width; tileWidth = pTile->drawable.width;
......
nx-X11/programs/Xserver/fb/fbgc.c
View file @ 3a54da8b
...@@ -170,7 +170,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp) ...@@ -170,7 +170,7 @@ fbCanEvenStipple (PixmapPtr pStipple, int bpp)
FbBits *bits; FbBits *bits;
int stride; int stride;
int stip_bpp; int stip_bpp;
int stipXoff, stipYoff; _X_UNUSED int stipXoff, stipYoff;
int h; int h;
/* can't even stipple 24bpp drawables */ /* can't even stipple 24bpp drawables */
......
nx-X11/programs/Xserver/fb/fbpict.h
View file @ 3a54da8b
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
FbBits *__bits__; \ FbBits *__bits__; \
FbStride __stride__; \ FbStride __stride__; \
int __bpp__; \ int __bpp__; \
int __xoff__,__yoff__; \ _X_UNUSED int __xoff__,__yoff__; \
\ \
fbGetDrawable((pict)->pDrawable,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \ fbGetDrawable((pict)->pDrawable,__bits__,__stride__,__bpp__,__xoff__,__yoff__); \
switch (__bpp__) { \ switch (__bpp__) { \
......
nx-X11/programs/Xserver/fb/fbpush.c
View file @ 3a54da8b
...@@ -237,7 +237,7 @@ fbPushPixels (GCPtr pGC, ...@@ -237,7 +237,7 @@ fbPushPixels (GCPtr pGC,
FbStip *stip; FbStip *stip;
FbStride stipStride; FbStride stipStride;
int stipBpp; int stipBpp;
int stipXoff, stipYoff; /* Assumed to be zero */ _X_UNUSED int stipXoff, stipYoff; /* Assumed to be zero */
fbGetStipDrawable (&pBitmap->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff); fbGetStipDrawable (&pBitmap->drawable, stip, stipStride, stipBpp, stipXoff, stipYoff);
......
nx-X11/programs/Xserver/fb/fbwindow.c
View file @ 3a54da8b
...@@ -251,7 +251,7 @@ fbFillRegionTiled (DrawablePtr pDrawable, ...@@ -251,7 +251,7 @@ fbFillRegionTiled (DrawablePtr pDrawable,
FbBits *tile; FbBits *tile;
FbStride tileStride; FbStride tileStride;
int tileBpp; int tileBpp;
int tileXoff, tileYoff; /* XXX assumed to be zero */ _X_UNUSED int tileXoff, tileYoff; /* XXX assumed to be zero */
int tileWidth, tileHeight; int tileWidth, tileHeight;
int n = RegionNumRects(pRegion); int n = RegionNumRects(pRegion);
BoxPtr pbox = RegionRects(pRegion); BoxPtr pbox = RegionRects(pRegion);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment