Fix check_conn.

Resolve declaration shadows.

diff --git a/lib/swm_hack.c b/lib/swm_hack.c
index c992689057b20d38ff1edcecc203f704cf5fe369..bb895459a17918300f17addddce5dc63afbca894 100644 (file)
--- a/lib/swm_hack.c
+++ b/lib/swm_hack.c
@@ -55,7 +55,7 @@ static void           *lib_xtlib = NULL;
 
 static Window          root = None;
 static int             xterm = 0;
-static Display         *dpy = NULL;
+static Display         *display = NULL;
 
 /* Find our root window */
 static              Window
@@ -120,7 +120,7 @@ typedef             Window(CWF) (Display * _display, Window _parent, int _x,
 
 /* XCreateWindow intercept hack */
 Window
-XCreateWindow(Display * display, Window parent, int x, int y,
+XCreateWindow(Display *dpy, Window parent, int x, int y,
    unsigned int width, unsigned int height,
    unsigned int border_width,
    int depth, unsigned int clss, Visual * visual,
@@ -135,7 +135,7 @@ XCreateWindow(Display * display, Window parent, int x, int y,
                lib_xlib = dlopen("libX11.so", RTLD_GLOBAL | RTLD_LAZY);
        if (!func) {
                func = (CWF *) dlsym(lib_xlib, "XCreateWindow");
-               dpy = display;
+               display = dpy;
        }
 
        if (parent == DefaultRootWindow(display))
@@ -166,7 +166,7 @@ typedef             Window(CSWF) (Display * _display, Window _parent, int _x,
 
 /* XCreateSimpleWindow intercept hack */
 Window
-XCreateSimpleWindow(Display * display, Window parent, int x, int y,
+XCreateSimpleWindow(Display *dpy, Window parent, int x, int y,
     unsigned int width, unsigned int height,
     unsigned int border_width,
     unsigned long border, unsigned long background)
@@ -181,17 +181,17 @@ XCreateSimpleWindow(Display * display, Window parent, int x, int y,
        if (!func)
                func = (CSWF *) dlsym(lib_xlib, "XCreateSimpleWindow");
 
-       if (parent == DefaultRootWindow(display))
-               parent = MyRoot(display);
+       if (parent == DefaultRootWindow(dpy))
+               parent = MyRoot(dpy);
 
-       id = (*func) (display, parent, x, y, width, height,
+       id = (*func) (dpy, parent, x, y, width, height,
            border_width, border, background);
 
        if (id) {
                if ((env = getenv("_SWM_WS")) != NULL) 
-                       set_property(display, id, "_SWM_WS", env);
+                       set_property(dpy, id, "_SWM_WS", env);
                if ((env = getenv("_SWM_PID")) != NULL)
-                       set_property(display, id, "_SWM_PID", env);
+                       set_property(dpy, id, "_SWM_PID", env);
                if ((env = getenv("_SWM_XTERM_FONTADJ")) != NULL) {
                        unsetenv("_SWM_XTERM_FONTADJ");
                        xterm = 1;
@@ -205,7 +205,7 @@ typedef int         (RWF) (Display * _display, Window _window, Window _parent,
 
 /* XReparentWindow intercept hack */
 int
-XReparentWindow(Display * display, Window window, Window parent, int x, int y)
+XReparentWindow(Display *dpy, Window window, Window parent, int x, int y)
 {
        static RWF         *func = NULL;
 
@@ -215,10 +215,10 @@ XReparentWindow(Display * display, Window window, Window parent, int x, int y)
        if (!func)
                func = (RWF *) dlsym(lib_xlib, "XReparentWindow");
 
-       if (parent == DefaultRootWindow(display))
-               parent = MyRoot(display);
+       if (parent == DefaultRootWindow(dpy))
+               parent = MyRoot(dpy);
 
-       return (*func) (display, window, parent, x, y);
+       return (*func) (dpy, window, parent, x, y);
 }
 
 typedef                void (ANEF) (XtAppContext app_context, XEvent *event_return);
@@ -241,9 +241,9 @@ XtAppNextEvent(XtAppContext app_context, XEvent *event_return)
                lib_xtlib = dlopen("libXt.so", RTLD_GLOBAL | RTLD_LAZY);
        if (!func) {
                func = (ANEF *) dlsym(lib_xtlib, "XtAppNextEvent");
-               if (dpy != NULL) {
-                       kp_add = XKeysymToKeycode(dpy, XK_KP_Add);
-                       kp_subtract = XKeysymToKeycode(dpy, XK_KP_Subtract);
+               if (display != NULL) {
+                       kp_add = XKeysymToKeycode(display, XK_KP_Add);
+                       kp_subtract = XKeysymToKeycode(display, XK_KP_Subtract);
                }
        }
 

diff --git a/linux/Makefile b/linux/Makefile
index 8646531e6f66b44e0d0a258a29d8671bb972a763..625f484e22dc118e94cd6d6039597721c830aadb 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -1,4 +1,4 @@
-CFLAGS+= -Wall -Wextra -g -D_GNU_SOURCE -I. -I/usr/include/freetype2
+CFLAGS+= -Wall -Wextra -Wshadow -g -D_GNU_SOURCE -I. -I/usr/include/freetype2
 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
 LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft
 

diff --git a/spectrwm.c b/spectrwm.c
index 6242ac65a4273338050f27e902d86503097a83a7..753bbf039a21153f5f5ee8a837ea986e39140666 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -701,7 +701,7 @@ void         update_window(struct ws_win *);
 char *
 expand_tilde(char *s)
 {
-       struct passwd           *pwd;
+       struct passwd           *ppwd;
        int                     i, max;
        char                    *user;
        const char              *sc = s;
@@ -728,11 +728,11 @@ expand_tilde(char *s)
        user[i] = '\0';
        s = &s[i];
 
-       pwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
-       if (pwd == NULL)
+       ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+       if (ppwd == NULL)
                result = strdup(sc);
        else
-               if (asprintf(&result, "%s%s", pwd->pw_dir, s) == -1)
+               if (asprintf(&result, "%s%s", ppwd->pw_dir, s) == -1)
                        result = NULL;
 out:
        if (result == NULL)
@@ -5780,7 +5780,7 @@ setconfquirk(char *selector, char *value, int flags)
 {
        char                    *cp, *class, *name;
        int                     retval;
-       unsigned long           quirks;
+       unsigned long           qrks;
 
        /* suppress unused warning since var is needed */
        (void)flags;
@@ -5792,8 +5792,8 @@ setconfquirk(char *selector, char *value, int flags)
        *cp = '\0';
        class = selector;
        name = cp + 1;
-       if ((retval = parsequirks(value, &quirks)) == 0)
-               setquirk(class, name, quirks);
+       if ((retval = parsequirks(value, &qrks)) == 0)
+               setquirk(class, name, qrks);
        return (retval);
 }
 
@@ -7407,13 +7407,12 @@ clientmessage(xcb_client_message_event_t *e)
        xcb_flush(conn);
 }
 
-#ifdef XCB_CONN_ERROR
 void
 check_conn(void)
 {
        int      errcode = xcb_connection_has_error(conn);
        char    *s;
-
+#ifdef XCB_CONN_ERROR
        switch (errcode) {
        case XCB_CONN_ERROR:
                s = "Socket error, pipe error or other stream error.";
@@ -7433,18 +7432,13 @@ check_conn(void)
        default:
                s = "Unknown error.";
        }
-
        if (errcode)
                errx(errcode, "X CONNECTION ERROR: %s", s);
-}
 #else
-void
-check_conn(void)
-{
-       if (conn->has_error)
-               errx(1, "X CONNECTION ERROR");
-}
+       if (errcode)
+               errx(errcode, "X CONNECTION ERROR");
 #endif
+}
 
 int
 enable_wm(void)