From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7CAE817A30B; Mon, 30 Jun 2025 02:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.92.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751252133; cv=none; b=AZea4ebuZYQepgyLQ6UNdcHNTr5BqIgyaoR4Ov3RYSttqY1ZyzmYF1X2S/u0gsVghzg9mCTyzb30ODPoVwmM21sjJAdiXc2KugU8UaGGjAZQ5NZqaA8rOnoulnfULRmWIUqI7sNIEzyYM4dpJXZAK/Jbyzs+GTqhkQRDUTSKDoI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751252133; c=relaxed/simple; bh=nHMwre0FnXsyOmp0bg9DGSvJNEEWsEeCtW2rCrwIkZk=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=kVTOtYBKFLGrK4O/vsYAoWkCddLgSZjBL6A/DPSmixS4cldWrFW0OR+u/CPz+A4vc5PIY8dzHSONA4VTm+Tnvb/l9IxOtRay+Q+vpGJrD9kPhKf7jpMa3HuqWGRVAfwc2yoPBazB3zxsSY0jdeEEll3/lYo6WKS9a2KIfEWiakg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=Ev6KbqvN; arc=none smtp.client-ip=90.155.92.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Ev6KbqvN" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:Content-Type :In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID: Sender:Reply-To:Content-ID:Content-Description; bh=jPLlvlNhkyWZDvYS/BN+b6gutnSYD4uNUAGYX2yJwh8=; b=Ev6KbqvNvuuK94XxMlZ0UMTS6s SfNC2b0V38IjqSPbr0NrPiJmO2gA3YpYmGAHCigAwxm+Ng42CVnzi6DUq774K54CtlUDNWk/dO5JS KqidJE0WYaJrR2p7RhzAse7IIm33b73FD6yDMQa0FJ2Yhs7r1Env7QZUs3CiIkYx5DBNKxvYiFes+ t7VCgdv13YDgApysa++FcvogqmqQr4BtzDibsJ3LuXXzC9SsPk7GXg7rLxI+Zd/MvDeldoAI8gyO2 Xen53ZtMlZ/Lr+FKR0jWEnENDuKFmVtFr+MDiNwqfcav5tOyCjtriWRts8OClI4D6EwmdwfMlnKDO 6nLnb/kQ==; Received: from [50.53.25.54] (helo=[192.168.254.17]) by desiato.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uW4g0-00000006iOL-32ql; Mon, 30 Jun 2025 02:55:29 +0000 Message-ID: <37b10343-a0fb-4c74-918d-5b49c0db77e3@infradead.org> Date: Sun, 29 Jun 2025 19:55:22 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 29/66] kconfig: gconf: add static qualifiers to event handlers To: Masahiro Yamada , linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org References: <20250624150645.1107002-1-masahiroy@kernel.org> <20250624150645.1107002-30-masahiroy@kernel.org> Content-Language: en-US From: Randy Dunlap In-Reply-To: <20250624150645.1107002-30-masahiroy@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 6/24/25 8:05 AM, Masahiro Yamada wrote: > This fixes several -Wmissing-prototypes warnings. > > Signed-off-by: Masahiro Yamada Acked-by: Randy Dunlap > --- > > scripts/kconfig/gconf.c | 173 +++++++++++++++++++++++++----------- > scripts/kconfig/gconf.glade | 30 ------- > 2 files changed, 120 insertions(+), 83 deletions(-) > > diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c > index bed4c86c2085..02bbb7ce4c4a 100644 > --- a/scripts/kconfig/gconf.c > +++ b/scripts/kconfig/gconf.c > @@ -172,7 +172,7 @@ load_filename(GtkFileSelection * file_selector, gpointer user_data) > display_tree_part(); > } > > -void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_load1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkWidget *fs; > > @@ -191,8 +191,7 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data) > gtk_widget_show(fs); > } > > - > -void on_save_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_save_activate(GtkMenuItem *menuitem, gpointer user_data) > { > if (conf_write(NULL)) > text_insert_msg("Error", "Unable to save configuration !"); > @@ -214,7 +213,7 @@ store_filename(GtkFileSelection * file_selector, gpointer user_data) > gtk_widget_destroy(GTK_WIDGET(user_data)); > } > > -void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkWidget *fs; > > @@ -233,7 +232,7 @@ void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data) > gtk_widget_show(fs); > } > > -void on_show_name1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_show_name1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkTreeViewColumn *col; > > @@ -243,8 +242,7 @@ void on_show_name1_activate(GtkMenuItem * menuitem, gpointer user_data) > gtk_tree_view_column_set_visible(col, show_name); > } > > - > -void on_show_range1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_show_range1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkTreeViewColumn *col; > > @@ -261,8 +259,7 @@ void on_show_range1_activate(GtkMenuItem * menuitem, gpointer user_data) > > } > > - > -void on_show_data1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_show_data1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkTreeViewColumn *col; > > @@ -272,35 +269,31 @@ void on_show_data1_activate(GtkMenuItem * menuitem, gpointer user_data) > gtk_tree_view_column_set_visible(col, show_value); > } > > - > -void > -on_set_option_mode1_activate(GtkMenuItem *menuitem, gpointer user_data) > +static void on_set_option_mode1_activate(GtkMenuItem *menuitem, > + gpointer user_data) > { > opt_mode = OPT_NORMAL; > gtk_tree_store_clear(tree2); > display_tree(&rootmenu); /* instead of update_tree to speed-up */ > } > > - > -void > -on_set_option_mode2_activate(GtkMenuItem *menuitem, gpointer user_data) > +static void on_set_option_mode2_activate(GtkMenuItem *menuitem, > + gpointer user_data) > { > opt_mode = OPT_ALL; > gtk_tree_store_clear(tree2); > display_tree(&rootmenu); /* instead of update_tree to speed-up */ > } > > - > -void > -on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data) > +static void on_set_option_mode3_activate(GtkMenuItem *menuitem, > + gpointer user_data) > { > opt_mode = OPT_PROMPT; > gtk_tree_store_clear(tree2); > display_tree(&rootmenu); /* instead of update_tree to speed-up */ > } > > - > -void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_introduction1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkWidget *dialog; > const gchar *intro_text = > @@ -327,8 +320,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) > gtk_widget_show_all(dialog); > } > > - > -void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_about1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkWidget *dialog; > const gchar *about_text = > @@ -345,8 +337,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) > gtk_widget_show_all(dialog); > } > > - > -void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) > +static void on_license1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > GtkWidget *dialog; > const gchar *license_text = > @@ -364,8 +355,8 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) > gtk_widget_show_all(dialog); > } > > - > -void on_back_clicked(GtkButton * button, gpointer user_data) > +/* toolbar handlers */ > +static void on_back_clicked(GtkButton *button, gpointer user_data) > { > enum prop_type ptype; > > @@ -379,50 +370,44 @@ void on_back_clicked(GtkButton * button, gpointer user_data) > gtk_widget_set_sensitive(back_btn, FALSE); > } > > - > -void on_load_clicked(GtkButton * button, gpointer user_data) > +static void on_load_clicked(GtkButton *button, gpointer user_data) > { > on_load1_activate(NULL, user_data); > } > > - > -void on_single_clicked(GtkButton * button, gpointer user_data) > +static void on_single_clicked(GtkButton *button, gpointer user_data) > { > set_view_mode(SINGLE_VIEW); > } > > - > -void on_split_clicked(GtkButton * button, gpointer user_data) > +static void on_split_clicked(GtkButton *button, gpointer user_data) > { > set_view_mode(SPLIT_VIEW); > } > > - > -void on_full_clicked(GtkButton * button, gpointer user_data) > +static void on_full_clicked(GtkButton *button, gpointer user_data) > { > set_view_mode(FULL_VIEW); > } > > - > -void on_collapse_clicked(GtkButton * button, gpointer user_data) > +static void on_collapse_clicked(GtkButton *button, gpointer user_data) > { > gtk_tree_view_collapse_all(GTK_TREE_VIEW(tree2_w)); > } > > - > -void on_expand_clicked(GtkButton * button, gpointer user_data) > +static void on_expand_clicked(GtkButton *button, gpointer user_data) > { > gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w)); > } > > /* Main Windows Callbacks */ > > -void on_window1_destroy(GtkObject *object, gpointer user_data) > +static void on_window1_destroy(GtkObject *object, gpointer user_data) > { > gtk_main_quit(); > } > > -void on_window1_size_request(GtkWidget *widget, > +static void on_window1_size_request(GtkWidget *widget, > GtkRequisition *requisition, > gpointer user_data) > { > @@ -441,7 +426,7 @@ void on_window1_size_request(GtkWidget *widget, > gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3); > } > > -gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event, > +static gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event, > gpointer user_data) > { > GtkWidget *dialog, *label; > @@ -488,7 +473,7 @@ gboolean on_window1_delete_event(GtkWidget *widget, GdkEvent *event, > return ret; > } > > -void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data) > +static void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data) > { > if (!on_window1_delete_event(NULL, NULL, NULL)) > gtk_widget_destroy(GTK_WIDGET(main_wnd)); > @@ -598,9 +583,9 @@ static gint column2index(GtkTreeViewColumn * column) > > > /* User click: update choice (full) or goes down (single) */ > -gboolean > -on_treeview2_button_press_event(GtkWidget * widget, > - GdkEventButton * event, gpointer user_data) > +static gboolean on_treeview2_button_press_event(GtkWidget *widget, > + GdkEventButton *event, > + gpointer user_data) > { > GtkTreeView *view = GTK_TREE_VIEW(widget); > GtkTreePath *path; > @@ -648,9 +633,9 @@ on_treeview2_button_press_event(GtkWidget * widget, > } > > /* Key pressed: update choice */ > -gboolean > -on_treeview2_key_press_event(GtkWidget * widget, > - GdkEventKey * event, gpointer user_data) > +static gboolean on_treeview2_key_press_event(GtkWidget *widget, > + GdkEventKey *event, > + gpointer user_data) > { > GtkTreeView *view = GTK_TREE_VIEW(widget); > GtkTreePath *path; > @@ -690,8 +675,8 @@ on_treeview2_key_press_event(GtkWidget * widget, > > > /* Row selection changed: update help */ > -void > -on_treeview2_cursor_changed(GtkTreeView * treeview, gpointer user_data) > +static void on_treeview2_cursor_changed(GtkTreeView *treeview, > + gpointer user_data) > { > GtkTreeSelection *selection; > GtkTreeIter iter; > @@ -706,9 +691,9 @@ on_treeview2_cursor_changed(GtkTreeView * treeview, gpointer user_data) > > > /* User click: display sub-tree in the right frame. */ > -gboolean > -on_treeview1_button_press_event(GtkWidget * widget, > - GdkEventButton * event, gpointer user_data) > +static gboolean on_treeview1_button_press_event(GtkWidget *widget, > + GdkEventButton *event, > + gpointer user_data) > { > GtkTreeView *view = GTK_TREE_VIEW(widget); > GtkTreePath *path; > @@ -1138,47 +1123,129 @@ static void init_main_window(const gchar *glade_file) > glade_xml_signal_autoconnect(xml); > > main_wnd = glade_xml_get_widget(xml, "window1"); > + g_signal_connect(main_wnd, "destroy", > + G_CALLBACK(on_window1_destroy), NULL); > + g_signal_connect(main_wnd, "size_request", > + G_CALLBACK(on_window1_size_request), NULL); > + g_signal_connect(main_wnd, "delete_event", > + G_CALLBACK(on_window1_delete_event), NULL); > + > hpaned = glade_xml_get_widget(xml, "hpaned1"); > vpaned = glade_xml_get_widget(xml, "vpaned1"); > tree1_w = glade_xml_get_widget(xml, "treeview1"); > + g_signal_connect(tree1_w, "cursor_changed", > + G_CALLBACK(on_treeview2_cursor_changed), NULL); > + g_signal_connect(tree1_w, "button_press_event", > + G_CALLBACK(on_treeview1_button_press_event), NULL); > + g_signal_connect(tree1_w, "key_press_event", > + G_CALLBACK(on_treeview2_key_press_event), NULL); > + > tree2_w = glade_xml_get_widget(xml, "treeview2"); > + g_signal_connect(tree2_w, "cursor_changed", > + G_CALLBACK(on_treeview2_cursor_changed), NULL); > + g_signal_connect(tree2_w, "button_press_event", > + G_CALLBACK(on_treeview2_button_press_event), NULL); > + g_signal_connect(tree2_w, "key_press_event", > + G_CALLBACK(on_treeview2_key_press_event), NULL); > + > text_w = glade_xml_get_widget(xml, "textview3"); > > /* menubar */ > + widget = glade_xml_get_widget(xml, "load1"); > + g_signal_connect(widget, "activate", G_CALLBACK(on_load1_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "save1"); > + g_signal_connect(widget, "activate", G_CALLBACK(on_save_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "save_as1"); > + g_signal_connect(widget, "activate", G_CALLBACK(on_save_as1_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "quit1"); > + g_signal_connect(widget, "activate", G_CALLBACK(on_quit1_activate), NULL); > + > widget = glade_xml_get_widget(xml, "show_name1"); > + g_signal_connect(widget, "activate", G_CALLBACK(on_show_name1_activate), NULL); > gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, > show_name); > > widget = glade_xml_get_widget(xml, "show_range1"); > + g_signal_connect(widget, "activate", G_CALLBACK(on_show_range1_activate), NULL); > gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, > show_range); > > widget = glade_xml_get_widget(xml, "show_data1"); > + g_signal_connect(widget, "activate", G_CALLBACK(on_show_data1_activate), NULL); > gtk_check_menu_item_set_active((GtkCheckMenuItem *) widget, > show_value); > > + widget = glade_xml_get_widget(xml, "set_option_mode1"); > + g_signal_connect(widget, "activate", > + G_CALLBACK(on_set_option_mode1_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "set_option_mode2"); > + g_signal_connect(widget, "activate", > + G_CALLBACK(on_set_option_mode2_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "set_option_mode3"); > + g_signal_connect(widget, "activate", > + G_CALLBACK(on_set_option_mode3_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "introduction1"); > + g_signal_connect(widget, "activate", > + G_CALLBACK(on_introduction1_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "about1"); > + g_signal_connect(widget, "activate", > + G_CALLBACK(on_about1_activate), NULL); > + > + widget = glade_xml_get_widget(xml, "license1"); > + g_signal_connect(widget, "activate", > + G_CALLBACK(on_license1_activate), NULL); > + > /* toolbar */ > back_btn = glade_xml_get_widget(xml, "button1"); > + g_signal_connect(back_btn, "clicked", > + G_CALLBACK(on_back_clicked), NULL); > gtk_widget_set_sensitive(back_btn, FALSE); > > + widget = glade_xml_get_widget(xml, "button2"); > + g_signal_connect(widget, "clicked", > + G_CALLBACK(on_load_clicked), NULL); > + > save_btn = glade_xml_get_widget(xml, "button3"); > + g_signal_connect(save_btn, "clicked", > + G_CALLBACK(on_save_activate), NULL); > save_menu_item = glade_xml_get_widget(xml, "save1"); > conf_set_changed_callback(conf_changed); > > style = gtk_widget_get_style(main_wnd); > > single_btn = glade_xml_get_widget(xml, "button4"); > + g_signal_connect(single_btn, "clicked", > + G_CALLBACK(on_single_clicked), NULL); > replace_button_icon(xml, main_wnd->window, style, > "button4", (gchar **) xpm_single_view); > > split_btn = glade_xml_get_widget(xml, "button5"); > + g_signal_connect(split_btn, "clicked", > + G_CALLBACK(on_split_clicked), NULL); > replace_button_icon(xml, main_wnd->window, style, > "button5", (gchar **) xpm_split_view); > > full_btn = glade_xml_get_widget(xml, "button6"); > + g_signal_connect(full_btn, "clicked", > + G_CALLBACK(on_full_clicked), NULL); > replace_button_icon(xml, main_wnd->window, style, > "button6", (gchar **) xpm_tree_view); > > + widget = glade_xml_get_widget(xml, "button7"); > + g_signal_connect(widget, "clicked", > + G_CALLBACK(on_collapse_clicked), NULL); > + > + widget = glade_xml_get_widget(xml, "button8"); > + g_signal_connect(widget, "clicked", > + G_CALLBACK(on_expand_clicked), NULL); > + > txtbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_w)); > tag1 = gtk_text_buffer_create_tag(txtbuf, "mytag1", > "foreground", "red", > diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade > index 19b80f2ec1ff..8519104a3c2b 100644 > --- a/scripts/kconfig/gconf.glade > +++ b/scripts/kconfig/gconf.glade > @@ -17,9 +17,6 @@ > False > GDK_WINDOW_TYPE_HINT_NORMAL > GDK_GRAVITY_NORTH_WEST > - > - > - > > > > @@ -46,7 +43,6 @@ > Load a config file > _Load > True > - > > > > @@ -57,7 +53,6 @@ > Save the config in .config > _Save > True > - > > > > @@ -68,7 +63,6 @@ > Save the config in a file > Save _as > True > - > > > > @@ -83,7 +77,6 @@ > True > _Quit > True > - > > > > @@ -108,7 +101,6 @@ > Show _name > True > False > - > > > > @@ -119,7 +111,6 @@ > Show _range > True > False > - > > > > @@ -130,7 +121,6 @@ > Show _data > True > False > - > > > > @@ -147,7 +137,6 @@ > Show normal options > True > True > - > > > > @@ -159,7 +148,6 @@ > True > False > set_option_mode1 > - > > > > @@ -171,7 +159,6 @@ > True > False > set_option_mode1 > - > > > > @@ -194,7 +181,6 @@ > True > _Introduction > True > - > > > > @@ -204,7 +190,6 @@ > True > _About > True > - > > > > @@ -214,7 +199,6 @@ > True > _License > True > - > > > > @@ -254,7 +238,6 @@ > True > True > False > - > > > False > @@ -291,7 +274,6 @@ > True > True > False > - > > > False > @@ -309,7 +291,6 @@ > True > True > False > - > > > False > @@ -346,7 +327,6 @@ > True > True > False > - > > > False > @@ -364,7 +344,6 @@ > True > True > False > - > > > False > @@ -382,7 +361,6 @@ > True > True > False > - > > > False > @@ -419,7 +397,6 @@ > True > True > False > - > > > False > @@ -437,7 +414,6 @@ > True > True > False > - > > > False > @@ -477,9 +453,6 @@ > False > False > False > - > - > - > > > > @@ -512,9 +485,6 @@ > False > False > False > - > - > - > > > -- ~Randy