declare variables at the beginning of blocks, because it is nice to do so. and polite?

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index a3aee8bef2b63c5350cbe216c83111915f34b619..e9fc32da0a946510e1d85e7b4f3a06a19cce01e1 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -676,13 +676,14 @@ void menu_frame_hide(ObMenuFrame *self)
 
 void menu_frame_hide_all()
 {
+    GList *it;
+
     if (config_submenu_show_delay) {
         /* remove any submenu open requests */
         ob_main_loop_timeout_remove(ob_main_loop,
                                     menu_entry_frame_submenu_timeout);
     }
-    GList *it = g_list_last(menu_frame_visible);
-    if (it) 
+    if ((it = g_list_last(menu_frame_visible)))
         menu_frame_hide(it->data);
 }
 

diff --git a/render/gradient.c b/render/gradient.c
index 91fe4e27eff4e5bf76852d7c031e557f8dd6692c..620848b043aac592c7a4091e1be8d9e9361c3911 100644 (file)
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -371,6 +371,9 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
     RrPixel32 current;
     RrColor *primary_light, *secondary_light;
 
+    VARS(y1);
+    VARS(y3);
+
     r = sf->primary->r;
     r += r >> 2;
     g = sf->primary->g;
@@ -393,10 +396,7 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
     if (b > 0xFF) b = 0xFF;
     secondary_light = RrColorNew(a->inst, r, g, b);
 
-    VARS(y1);
     SETUP(y1, primary_light, sf->primary, (h / 2) -1);
-  
-    VARS(y3);
     SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
 
     for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */