[PATCH v2 1/5] greeter: inline valueMask for xpm window to avoid shadowing argument
Alan Coopersmith
alan.coopersmith at oracle.com
Mon Feb 21 16:56:26 PST 2011
The Realize function names one of its arguments valueMask, and the
valueMask variable in the inner scope is just used as a static set
of mask flags, so just pass them directly to the function to reduce
confusion and clear the gcc -Wshadow warning:
Login.c: In function `Realize':
Login.c:1901: warning: declaration of 'valueMask' shadows a parameter
Login.c:1871: warning: shadowed declaration is here
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
Modified as suggested by Mark Kettenis
greeter/Login.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/greeter/Login.c b/greeter/Login.c
index 2a73a9e..020bfd4 100644
--- a/greeter/Login.c
+++ b/greeter/Login.c
@@ -1899,7 +1899,6 @@ static void Realize (
* Create pixmap window
*/
{
- unsigned long valueMask = CWBackPixel | CWBackPixmap;
XSetWindowAttributes windowAttributes = { 0 };
windowAttributes.background_pixel = w->core.background_pixel;
@@ -1912,7 +1911,7 @@ static void Realize (
(w->core.height - w->login.logoHeight) /2,
w->login.logoWidth, w->login.logoHeight, 0,
CopyFromParent, InputOutput, CopyFromParent,
- valueMask, &windowAttributes);
+ CWBackPixel | CWBackPixmap, &windowAttributes);
}
/*
--
1.7.3.2
More information about the xorg-devel
mailing list