Rename shadowed variables

Fixes gcc warnings of:

xkbevd.c: In function ‘GetDisplay’:
xkbevd.c:219:33: warning: declaration of ‘dpyName’ shadows a global declaration [-Wshadow]
 GetDisplay(char *program, char *dpyName, int *opcodeRtrn, int *evBaseRtrn)
                                 ^~~~~~~
xkbevd.c:55:17: note: shadowed declaration is here
 static char *   dpyName = NULL;
                 ^~~~~~~
xkbevd.c:222:14: warning: declaration of ‘dpy’ shadows a global declaration [-Wshadow]
     Display *dpy;
              ^~~
xkbevd.c:56:17: note: shadowed declaration is here
 Display *       dpy = NULL;
                 ^~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/xkbevd.c b/xkbevd.c
index 516358b..a5a905d 100644
--- a/xkbevd.c
+++ b/xkbevd.c
@@ -216,15 +216,16 @@ parseArgs(int argc, char *argv[])
 }
 
 static Display *
-GetDisplay(char *program, char *dpyName, int *opcodeRtrn, int *evBaseRtrn)
+GetDisplay(const char *program, const char *displayName,
+           int *opcodeRtrn, int *evBaseRtrn)
 {
     int mjr, mnr, error;
-    Display *dpy;
+    Display *display;
 
     mjr = XkbMajorVersion;
     mnr = XkbMinorVersion;
-    dpy = XkbOpenDisplay(dpyName, evBaseRtrn, NULL, &mjr, &mnr, &error);
-    if (dpy == NULL) {
+    display = XkbOpenDisplay(displayName, evBaseRtrn, NULL, &mjr, &mnr, &error);
+    if (display == NULL) {
         switch (error) {
         case XkbOD_BadLibraryVersion:
             uInformation("%s was compiled with XKB version %d.%02d\n",
@@ -233,26 +234,26 @@ GetDisplay(char *program, char *dpyName, int *opcodeRtrn, int *evBaseRtrn)
                    mjr, mnr);
             break;
         case XkbOD_ConnectionRefused:
-            uError("Cannot open display \"%s\"\n", dpyName);
+            uError("Cannot open display \"%s\"\n", displayName);
             break;
         case XkbOD_NonXkbServer:
-            uError("XKB extension not present on %s\n", dpyName);
+            uError("XKB extension not present on %s\n", displayName);
             break;
         case XkbOD_BadServerVersion:
             uInformation("%s was compiled with XKB version %d.%02d\n",
                          program, XkbMajorVersion, XkbMinorVersion);
             uError("Server %s uses incompatible version %d.%02d\n",
-                   dpyName, mjr, mnr);
+                   displayName, mjr, mnr);
             break;
         default:
             uInternalError("Unknown error %d from XkbOpenDisplay\n", error);
         }
     }
     else if (synch)
-        XSynchronize(dpy, True);
+        XSynchronize(display, True);
     if (opcodeRtrn)
-        XkbQueryExtension(dpy, opcodeRtrn, evBaseRtrn, NULL, &mjr, &mnr);
-    return dpy;
+        XkbQueryExtension(display, opcodeRtrn, evBaseRtrn, NULL, &mjr, &mnr);
+    return display;
 }
 
 /***====================================================================***/