all: don't declare variables inside for loops

4 files changed, 13 insertions, 6 deletions

diff --git a/src/lib/abrt_dbus.c b/src/lib/abrt_dbus.c
index a4bab15f..51962243 100644
--- a/src/lib/abrt_dbus.c
+++ b/src/lib/abrt_dbus.c
@@ -232,12 +232,13 @@ void store_crash_data(DBusMessageIter* dbus_iter, crash_data_t *val)
 void store_vector_of_crash_data(DBusMessageIter* iter, vector_of_crash_data_t *val)
 {
     DBusMessageIter sub_iter;
+    unsigned i;
     /* "array of maps". map in dbus is an array ("a") of two element structs "({...})":
      * "s" (string) for key and "as" for value (in this case, array of strings) */
     if (!dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "a{sas}", &sub_iter))
         die_out_of_memory();
 
-    for (unsigned i = 0; i < val->len; i++)
+    for (i = 0; i < val->len; i++)
     {
         crash_data_t *crash_data = get_crash_data(val, i);
         store_crash_data(&sub_iter, crash_data);
diff --git a/src/lib/event_config.c b/src/lib/event_config.c
index 4e14c79a..a84aae0c 100644
--- a/src/lib/event_config.c
+++ b/src/lib/event_config.c
@@ -45,13 +45,15 @@ void free_event_option(event_option_t *p)
 
 void free_event_config(event_config_t *p)
 {
+    GList *opt;
+
     if (!p)
         return;
     free(p->screen_name);
     //free(p->title);
     //free(p->action);
     free(p->description);
-    for (GList *opt = p->options; opt; opt = opt->next)
+    for (opt = p->options; opt; opt = opt->next)
         free_event_option(opt->data);
     g_list_free(p->options);
     free(p);
@@ -254,7 +256,8 @@ GList *export_event_config(const char *event_name)
     event_config_t *config = get_event_config(event_name);
     if (config)
     {
-        for (GList *lopt = config->options; lopt; lopt = lopt->next)
+        GList *lopt;
+        for (lopt = config->options; lopt; lopt = lopt->next)
         {
             event_option_t *opt = lopt->data;
             if (!opt->value)
@@ -289,8 +292,9 @@ GHashTable *validate_event(const char *event_name)
 
 
     GHashTable *errors = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
+    GList *li;
 
-    for (GList *li = config->options; li; li = li->next)
+    for (li = config->options; li; li = li->next)
     {
         event_option_t *opt = (event_option_t *)li->data;
         char *err = validate_event_option(opt);
diff --git a/src/lib/event_xml_parser.c b/src/lib/event_xml_parser.c
index 74329134..a6aa9a1f 100644
--- a/src/lib/event_xml_parser.c
+++ b/src/lib/event_xml_parser.c
@@ -111,8 +111,9 @@ static void start_element(GMarkupParseContext *context,
         }
 
         event_option_t *opt = parse_data->cur_option = new_event_option();
+        int i;
 
-        for (int i = 0; attribute_names[i] != NULL; ++i)
+        for (i = 0; attribute_names[i] != NULL; ++i)
         {
             VERB2 log("attr: %s:%s", attribute_names[i], attribute_values[i]);
             if (strcmp(attribute_names[i], "name") == 0)
diff --git a/src/lib/glib_support.c b/src/lib/glib_support.c
index feb4c18b..fc4d364e 100644
--- a/src/lib/glib_support.c
+++ b/src/lib/glib_support.c
@@ -20,7 +20,8 @@
 
 void list_free_with_free(GList *list)
 {
-    for (GList *li = list; li; li = g_list_next(li))
+    GList *li;
+    for (li = list; li; li = g_list_next(li))
         free(li->data);
     g_list_free(list);
 }