From 20bb0ba625cbe5501311ad3a7acc4d590df19c60 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue, 13 Dec 2011 15:56:47 -0800
Subject: [PATCH] Silence -Wshadow warnings

Change-Id: I73d8405af1e3a16bae26f6a51470000835143bad
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 dsimple.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dsimple.c b/dsimple.c
index a7e0d4c..fa31f14 100644
--- a/dsimple.c
+++ b/dsimple.c
@@ -230,19 +230,19 @@ Window Select_Window_Args(
  * Routine to let user select a window using the mouse
  */
 
-Window Select_Window(Display *dpy, int descend)
+Window Select_Window(Display *disp, int descend)
 {
   int status;
   Cursor cursor;
   XEvent event;
-  Window target_win = None, root = RootWindow(dpy,screen);
+  Window target_win = None, root = RootWindow(disp,screen);
   int buttons = 0;
 
   /* Make the target cursor */
-  cursor = XCreateFontCursor(dpy, XC_crosshair);
+  cursor = XCreateFontCursor(disp, XC_crosshair);
 
   /* Grab the pointer using target cursor, letting it room all over */
-  status = XGrabPointer(dpy, root, False,
+  status = XGrabPointer(disp, root, False,
 			ButtonPressMask|ButtonReleaseMask, GrabModeSync,
 			GrabModeAsync, root, cursor, CurrentTime);
   if (status != GrabSuccess) Fatal_Error("Can't grab the mouse.");
@@ -250,8 +250,8 @@ Window Select_Window(Display *dpy, int descend)
   /* Let the user select a window... */
   while ((target_win == None) || (buttons != 0)) {
     /* allow one more event */
-    XAllowEvents(dpy, SyncPointer, CurrentTime);
-    XWindowEvent(dpy, root, ButtonPressMask|ButtonReleaseMask, &event);
+    XAllowEvents(disp, SyncPointer, CurrentTime);
+    XWindowEvent(disp, root, ButtonPressMask|ButtonReleaseMask, &event);
     switch (event.type) {
     case ButtonPress:
       if (target_win == None) {
@@ -267,12 +267,12 @@ Window Select_Window(Display *dpy, int descend)
     }
   } 
 
-  XUngrabPointer(dpy, CurrentTime);      /* Done with pointer */
+  XUngrabPointer(disp, CurrentTime);      /* Done with pointer */
 
   if (!descend || (target_win == root))
     return(target_win);
 
-  target_win = Find_Client(dpy, root, target_win);
+  target_win = Find_Client(disp, root, target_win);
 
   return(target_win);
 }
@@ -286,7 +286,7 @@ Window Select_Window(Display *dpy, int descend)
  *                   are looked at.  Normally, top should be the RootWindow.
  */
 Window Window_With_Name(
-    Display *dpy,
+    Display *disp,
     Window top,
     const char *name)
 {
@@ -296,14 +296,14 @@ Window Window_With_Name(
 	Window w=0;
 	char *window_name;
 
-	if (XFetchName(dpy, top, &window_name) && !strcmp(window_name, name))
+	if (XFetchName(disp, top, &window_name) && !strcmp(window_name, name))
 	  return(top);
 
-	if (!XQueryTree(dpy, top, &dummy, &dummy, &children, &nchildren))
+	if (!XQueryTree(disp, top, &dummy, &dummy, &children, &nchildren))
 	  return(0);
 
 	for (i=0; i<nchildren; i++) {
-		w = Window_With_Name(dpy, children[i], name);
+		w = Window_With_Name(disp, children[i], name);
 		if (w)
 		  break;
 	}
-- 
2.7.4