[Nouveau] [PATCH xf86-video-nouveau 2/2] xv: Avoid shadowed declaration of 'int ret' in NVPutImage

Rhys Kidd rhyskidd at gmail.com
Mon Jan 21 02:31:19 UTC 2019


Warning reported by gcc 8.2:

nouveau_xv.c: In function ‘NVPutImage’:
nouveau_xv.c:1369:7: warning: declaration of ‘ret’ shadows a previous local [-Wshadow]
   int ret = BadImplementation;
       ^~~
nouveau_xv.c:1073:6: note: shadowed declaration is here
  int ret, i;
      ^~~

Fixes: a50bba6 ("xv: misc cleanups")
Cc: Ben Skeggs <bskeggs at redhat.com>
Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
---
 src/nouveau_xv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
index 1afe2f1..9d955e0 100644
--- a/src/nouveau_xv.c
+++ b/src/nouveau_xv.c
@@ -1366,7 +1366,7 @@ CPU_copy:
 		pPriv->currentBuffer ^= 1;
 	} else 
 	if (action_flags & USE_TEXTURE) {
-		int ret = BadImplementation;
+		ret = BadImplementation;
 
 		if (pNv->Architecture == NV_ARCH_30) {
 			ret = NV30PutTextureImage(pScrn, pPriv->video_mem,
-- 
2.19.1



More information about the Nouveau mailing list