[PATCH 01/25] CheckForEmptyMask does not need to declare int n twice

Alan Coopersmith alan.coopersmith at oracle.com
Sun Dec 11 10:16:14 PST 2011


Just use the existing n variable again in the ARGB_CURSOR loop
instead of creating another one.

Fixes gcc -Wshadow warning:
cursor.c: In function 'CheckForEmptyMask':
cursor.c:155:6: warning: declaration of 'n' shadows a previous local
cursor.c:146:9: warning: shadowed declaration is here

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 dix/cursor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/cursor.c b/dix/cursor.c
index f29cb11..6bff447 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -152,7 +152,7 @@ CheckForEmptyMask(CursorBitsPtr bits)
     if (bits->argb)
     {
 	CARD32 *argb = bits->argb;
-	int n = bits->width * bits->height;
+	n = bits->width * bits->height;
 	while (n--)
 	    if (*argb++ & 0xff000000) return;
     }
-- 
1.7.3.2



More information about the xorg-devel mailing list