cleanup warnings

[spectrwm] / spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index f9a80052a2e23997eccbc66056876ff50f7a8b0c..5840b0d2b1d3df5e2d4e62065a9fa4ecda4aa0bc 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -3688,7 +3688,7 @@ find_frame_window(xcb_window_t id) {
 struct ws_win *
 find_window(xcb_window_t id)
 {
-       struct ws_win           *win;
+       struct ws_win           *win = NULL;
        int                     i, j, num_screens;
        xcb_query_tree_reply_t  *qtr;
 
@@ -3701,7 +3701,6 @@ find_window(xcb_window_t id)
                                if (id == win->id || id == win->frame)
                                        return (win);
 
-       /* win NULL */
 
        /* If window isn't top-level, try to find managed ancestor. */
        qtr = xcb_query_tree_reply(conn, xcb_query_tree(conn, id), NULL);
@@ -5158,6 +5157,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, bool flip)
        DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d, rot: %s, "
            "flip: %s\n", ws->idx, YESNO(rot), YESNO(flip));
 
+       memset(&cell, 0, sizeof(cell));
+
        /* Prepare tiling variables, if needed. */
        if ((winno = count_win(ws, false)) > 0) {
                /* Find first tiled window. */
@@ -6738,7 +6739,7 @@ struct event {
 SIMPLEQ_HEAD(event_queue, event) events = SIMPLEQ_HEAD_INITIALIZER(events);
 
 xcb_generic_event_t *
-get_next_event(bool wait)
+get_next_event(bool dowait)
 {
        struct event            *ep;
        xcb_generic_event_t     *evt;
@@ -6748,7 +6749,7 @@ get_next_event(bool wait)
                evt = ep->ev;
                SIMPLEQ_REMOVE_HEAD(&events, entry);
                free(ep);
-       } else if (wait)
+       } else if (dowait)
                evt = xcb_wait_for_event(conn);
        else
                evt = xcb_poll_for_event(conn);
@@ -9736,7 +9737,7 @@ unparent_window(struct ws_win *win)
 struct ws_win *
 manage_window(xcb_window_t id, int spawn_pos, bool mapping)
 {
-       struct ws_win                           *win, *ww;
+       struct ws_win                           *win = NULL, *ww;
        struct swm_region                       *r;
        struct pid_e                            *p;
        struct quirk                            *qp;
@@ -11569,32 +11570,27 @@ screenchange(xcb_randr_screen_change_notify_event_t *e)
        print_win_geom(e->root);
 #endif
        /* add bars to all regions */
-       for (i = 0; i < num_screens; i++) {
-               TAILQ_FOREACH(r, &screens[i].rl, entry)
-                       bar_setup(r);
-       }
+       TAILQ_FOREACH(r, &screens[i].rl, entry)
+               bar_setup(r);
 
        /* Stack all regions. */
        TAILQ_FOREACH(r, &screens[i].rl, entry)
                stack(r);
 
-       /* Make sure a region has focus on each screen. */
-       for (i = 0; i < num_screens; i++) {
-               if (screens[i].r_focus == NULL) {
-                       r = TAILQ_FIRST(&screens[i].rl);
-                       if (r != NULL)
-                               focus_region(r);
-               }
+       /* Make sure a region has focus. */
+       if (screens[i].r_focus == NULL) {
+               r = TAILQ_FIRST(&screens[i].rl);
+               if (r != NULL)
+                       focus_region(r);
        }
 
        focus_flush();
 
        /* Update workspace state and bar on all regions. */
-       for (i = 0; i < num_screens; i++)
-               TAILQ_FOREACH(r, &screens[i].rl, entry) {
-                       r->ws->state = SWM_WS_STATE_MAPPED;
-                       bar_draw(r->bar);
-               }
+       TAILQ_FOREACH(r, &screens[i].rl, entry) {
+               r->ws->state = SWM_WS_STATE_MAPPED;
+               bar_draw(r->bar);
+       }
 }
 
 void