From 139dea29870cd84038e8b39d2f4fb5104fa5b038 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 26 Jan 2009 09:35:40 +0100 Subject: [PATCH] atexit: fix shadow declaration Signed-off-by: Julien Danjou --- awesome.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awesome.c b/awesome.c index 17ddcc64..c1773465 100644 --- a/awesome.c +++ b/awesome.c @@ -61,7 +61,6 @@ awesome_atexit(void) { client_t *c; int screen_nbr, nscreens; - xcb_setup_t *s; a_dbus_cleanup(); luaA_cs_cleanup(); @@ -75,7 +74,8 @@ awesome_atexit(void) } /* do this only for real screen */ - nscreens = ((s = xcb_get_setup(globalconf.connection)) ? xcb_setup_roots_length(s) : -1); + const xcb_setup_t *setup = xcb_get_setup(globalconf.connection); + nscreens = setup ? xcb_setup_roots_length(setup) : -1; for(screen_nbr = 0; screen_nbr < nscreens; screen_nbr++)