kconfig: gconf: remove global 'tree' variable

Pass the tree store as a function parameter to make it clearer which
tree is being updated.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 0e9e078f9c34502c48cde1031def36bede3cde86..b0dffca142a0a48742f7068c20d9c64df5595bca 100644 (file)
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -43,7 +43,7 @@ static GtkWidget *save_menu_item;
 
 static GtkTextTag *tag1, *tag2;
 
-static GtkTreeStore *tree1, *tree2, *tree;
+static GtkTreeStore *tree1, *tree2;
 static GtkTreeModel *model1, *model2;
 
 static struct menu *current; // current node for SINGLE view
@@ -57,7 +57,7 @@ enum {
 };
 
 static void display_list(void);
-static void display_tree(struct menu *menu);
+static void display_tree(GtkTreeStore *store, struct menu *menu);
 static void display_tree_part(void);
 static void update_tree(struct menu *src, GtkTreeIter * dst);
 
@@ -147,7 +147,7 @@ static void set_view_mode(enum view_mode mode)
                break;
        case FULL_VIEW:
                gtk_tree_store_clear(tree2);
-               display_tree(&rootmenu);
+               display_tree(tree2, &rootmenu);
                gtk_widget_set_sensitive(full_btn, FALSE);
                break;
        }
@@ -273,7 +273,7 @@ static void on_set_option_mode1_activate(GtkMenuItem *menuitem,
 {
        opt_mode = OPT_NORMAL;
        gtk_tree_store_clear(tree2);
-       display_tree(&rootmenu);        /* instead of update_tree to speed-up */
+       display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */
 }
 
 static void on_set_option_mode2_activate(GtkMenuItem *menuitem,
@@ -281,7 +281,7 @@ static void on_set_option_mode2_activate(GtkMenuItem *menuitem,
 {
        opt_mode = OPT_ALL;
        gtk_tree_store_clear(tree2);
-       display_tree(&rootmenu);        /* instead of update_tree to speed-up */
+       display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */
 }
 
 static void on_set_option_mode3_activate(GtkMenuItem *menuitem,
@@ -289,7 +289,7 @@ static void on_set_option_mode3_activate(GtkMenuItem *menuitem,
 {
        opt_mode = OPT_PROMPT;
        gtk_tree_store_clear(tree2);
-       display_tree(&rootmenu);        /* instead of update_tree to speed-up */
+       display_tree(tree2, &rootmenu); /* instead of update_tree to speed-up */
 }
 
 static void on_introduction1_activate(GtkMenuItem *menuitem, gpointer user_data)
@@ -853,7 +853,8 @@ static gchar **fill_row(struct menu *menu)
 
 
 /* Set the node content with a row of strings */
-static void set_node(GtkTreeIter * node, struct menu *menu, gchar ** row)
+static void set_node(GtkTreeStore *tree, GtkTreeIter *node,
+                    struct menu *menu, gchar **row)
 {
        GdkColor color;
        gboolean success;
@@ -977,7 +978,7 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
                                gtk_tree_store_insert_before(tree2,
                                                             child2,
                                                             dst, sibling);
-                               set_node(child2, menu1, fill_row(menu1));
+                               set_node(tree2, child2, menu1, fill_row(menu1));
                                if (menu2 == NULL)
                                        valid = TRUE;
                        } else {        // remove node
@@ -991,7 +992,7 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
                                        goto reparse;   // next child
                        }
                } else if (sym && (child1->flags & MENU_CHANGED)) {
-                       set_node(child2, menu1, fill_row(menu1));
+                       set_node(tree2, child2, menu1, fill_row(menu1));
                }
 
                update_tree(child1, child2);
@@ -1002,7 +1003,8 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
 
 
 /* Display the whole tree (single/split/full view) */
-static void _display_tree(struct menu *menu, GtkTreeIter *parent)
+static void _display_tree(GtkTreeStore *tree, struct menu *menu,
+                         GtkTreeIter *parent)
 {
        struct property *prop;
        struct menu *child;
@@ -1030,7 +1032,7 @@ static void _display_tree(struct menu *menu, GtkTreeIter *parent)
                    (opt_mode == OPT_PROMPT && menu_has_prompt(child)) ||
                    (opt_mode == OPT_ALL    && menu_get_prompt(child))) {
                        gtk_tree_store_append(tree, &iter, parent);
-                       set_node(&iter, child, fill_row(child));
+                       set_node(tree, &iter, child, fill_row(child));
                }
 
                if ((view_mode != FULL_VIEW) && (ptype == P_MENU)
@@ -1044,13 +1046,13 @@ static void _display_tree(struct menu *menu, GtkTreeIter *parent)
                if (((view_mode == SINGLE_VIEW) && (menu->flags & MENU_ROOT))
                    || (view_mode == FULL_VIEW)
                    || (view_mode == SPLIT_VIEW))
-                       _display_tree(child, &iter);
+                       _display_tree(tree, child, &iter);
        }
 }
 
-static void display_tree(struct menu *menu)
+static void display_tree(GtkTreeStore *store, struct menu *menu)
 {
-       _display_tree(menu, NULL);
+       _display_tree(store, menu, NULL);
 }
 
 /* Display a part of the tree starting at current node (single/split view) */
@@ -1058,11 +1060,11 @@ static void display_tree_part(void)
 {
        gtk_tree_store_clear(tree2);
        if (view_mode == SINGLE_VIEW)
-               display_tree(current);
+               display_tree(tree2, current);
        else if (view_mode == SPLIT_VIEW)
-               display_tree(browsed);
+               display_tree(tree2, browsed);
        else if (view_mode == FULL_VIEW)
-               display_tree(&rootmenu);
+               display_tree(tree2, &rootmenu);
        gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w));
 }
 
@@ -1071,10 +1073,8 @@ static void display_list(void)
 {
        gtk_tree_store_clear(tree1);
 
-       tree = tree1;
-       display_tree(&rootmenu);
+       display_tree(tree1, &rootmenu);
        gtk_tree_view_expand_all(GTK_TREE_VIEW(tree1_w));
-       tree = tree2;
 }
 
 static void fixup_rootmenu(struct menu *menu)
@@ -1259,7 +1259,7 @@ static void init_main_window(const gchar *glade_file)
 
 static void init_tree_model(void)
 {
-       tree = tree2 = gtk_tree_store_new(COL_NUMBER,
+       tree2 = gtk_tree_store_new(COL_NUMBER,
                                          G_TYPE_STRING, G_TYPE_STRING,
                                          G_TYPE_STRING, G_TYPE_STRING,
                                          G_TYPE_STRING, G_TYPE_STRING,