kconfig: gconf: Fix errors in gconf.c
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 kconfig: gconf: Fix errors in gconf.c
The following checkpatch errors are removed:
ERROR: "foo * bar" should be "foo *bar"
ERROR: "foo ** bar" should be "foo **bar"
Signed-off-by Jie Shi <[email protected]>
--- scripts/kconfig/gconf.c | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-)
scripts/kconfig/gconf.c +41 -41
@@ -66,8 +66,8 @@ enum {static void display_list (void );static void display_tree (struct menu *menu);static void display_tree_part (void ); -static void update_tree (struct menu *src,GtkTreeIter * dst); -static void set_node (GtkTreeIter * node,struct menu *menu,gchar ** row); +static void update_tree (struct menu *src,GtkTreeIter *dst); +static void set_node (GtkTreeIter *node,struct menu *menu,gchar **row);static gchar **fill_row (struct menu *menu);static void conf_changed (void );
@@ -254,8 +254,8 @@ static void init_left_tree(void) }static void renderer_edited (GtkCellRendererText * cell, -const gchar * path_string, -const gchar * new_text,gpointer user_data); +const gchar *path_string, +const gchar *new_text,gpointer user_data);static void init_right_tree (void ) {
@@ -407,8 +407,8 @@ static void text_insert_msg(const char *title, const char *message)/* Main Windows Callbacks */ -void on_save_activate (GtkMenuItem * menuitem,gpointer user_data); -gboolean on_window1_delete_event (GtkWidget * widget,GdkEvent * event, +void on_save_activate (GtkMenuItem *menuitem,gpointer user_data); +gboolean on_window1_delete_event (GtkWidget *widget,GdkEvent *event,gpointer user_data) {GtkWidget *dialog, *label;
@@ -453,15 +453,15 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event, } -void on_window1_destroy (GtkObject * object,gpointer user_data) +void on_window1_destroy (GtkObject *object,gpointer user_data) {gtk_main_quit (); }void -on_window1_size_request (GtkWidget * widget, -GtkRequisition * requisition,gpointer user_data) +on_window1_size_request (GtkWidget *widget, +GtkRequisition *requisition,gpointer user_data) {static gint old_h;gint w, h;
@@ -483,7 +483,7 @@ on_window1_size_request(GtkWidget * widget,static void -load_filename (GtkFileSelection * file_selector,gpointer user_data) +load_filename (GtkFileSelection *file_selector,gpointer user_data) {const gchar *fn;
@@ -496,7 +496,7 @@ load_filename(GtkFileSelection * file_selector, gpointer user_data)display_tree (&rootmenu); } -void on_load1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_load1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *fs;
@@ -516,7 +516,7 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_save_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_save_activate (GtkMenuItem *menuitem,gpointer user_data) {if (conf_write (NULL ))text_insert_msg ("Error" ,"Unable to save configuration !" );
@@ -525,7 +525,7 @@ void on_save_activate(GtkMenuItem * menuitem, gpointer user_data)static void -store_filename (GtkFileSelection * file_selector,gpointer user_data) +store_filename (GtkFileSelection *file_selector,gpointer user_data) {const gchar *fn;
@@ -538,7 +538,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) +void on_save_as1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *fs;
@@ -558,14 +558,14 @@ void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_quit1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_quit1_activate (GtkMenuItem *menuitem,gpointer user_data) {if (!on_window1_delete_event (NULL ,NULL ,NULL ))gtk_widget_destroy (GTK_WIDGET (main_wnd)); } -void on_show_name1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_show_name1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkTreeViewColumn *col;
@@ -576,7 +576,7 @@ void on_show_name1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_show_range1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_show_range1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkTreeViewColumn *col;
@@ -594,7 +594,7 @@ void on_show_range1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_show_data1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_show_data1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkTreeViewColumn *col;
@@ -632,7 +632,7 @@ on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data) } -void on_introduction1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_introduction1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *dialog; const gchar *intro_text =
@@ -663,7 +663,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_about1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_about1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *dialog; const gchar *about_text =
@@ -681,7 +681,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_license1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_license1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *dialog; const gchar *license_text =
@@ -700,7 +700,7 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_back_clicked (GtkButton * button,gpointer user_data) +void on_back_clicked (GtkButton *button,gpointer user_data) {enum prop_type ptype;
@@ -715,13 +715,13 @@ void on_back_clicked(GtkButton * button, gpointer user_data) } -void on_load_clicked (GtkButton * button,gpointer user_data) +void on_load_clicked (GtkButton *button,gpointer user_data) {on_load1_activate (NULL , user_data); } -void on_single_clicked (GtkButton * button,gpointer user_data) +void on_single_clicked (GtkButton *button,gpointer user_data) { view_mode =SINGLE_VIEW ;gtk_widget_hide (tree1_w);
@@ -730,7 +730,7 @@ void on_single_clicked(GtkButton * button, gpointer user_data) } -void on_split_clicked (GtkButton * button,gpointer user_data) +void on_split_clicked (GtkButton *button,gpointer user_data) {gint w, h; view_mode =SPLIT_VIEW ;
@@ -746,7 +746,7 @@ void on_split_clicked(GtkButton * button, gpointer user_data) } -void on_full_clicked (GtkButton * button,gpointer user_data) +void on_full_clicked (GtkButton *button,gpointer user_data) { view_mode =FULL_VIEW ;gtk_widget_hide (tree1_w);
@@ -757,13 +757,13 @@ void on_full_clicked(GtkButton * button, gpointer user_data) } -void on_collapse_clicked (GtkButton * button,gpointer user_data) +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) +void on_expand_clicked (GtkButton *button,gpointer user_data) {gtk_tree_view_expand_all (GTK_TREE_VIEW (tree2_w)); }
@@ -772,9 +772,9 @@ void on_expand_clicked(GtkButton * button, gpointer user_data)/* CTree Callbacks */ /* Change hex/int/string value in the cell */ -static void renderer_edited (GtkCellRendererText * cell, -const gchar * path_string, -const gchar * new_text,gpointer user_data) +static void renderer_edited (GtkCellRendererText *cell, +const gchar *path_string, +const gchar *new_text,gpointer user_data) {GtkTreePath *path =gtk_tree_path_new_from_string (path_string);GtkTreeIter iter;
@@ -855,7 +855,7 @@ static void toggle_sym_value(struct menu *menu)display_tree_part ();//fixme: keep exp/coll } -static gint column2index (GtkTreeViewColumn * column) +static gint column2index (GtkTreeViewColumn *column) {gint i;
@@ -873,8 +873,8 @@ 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) +on_treeview2_button_press_event (GtkWidget *widget, +GdkEventButton *event,gpointer user_data) {GtkTreeView *view =GTK_TREE_VIEW (widget);GtkTreePath *path;
@@ -930,8 +930,8 @@ on_treeview2_button_press_event(GtkWidget * widget,/* Key pressed: update choice */ gboolean -on_treeview2_key_press_event (GtkWidget * widget, -GdkEventKey * event,gpointer user_data) +on_treeview2_key_press_event (GtkWidget *widget, +GdkEventKey *event,gpointer user_data) {GtkTreeView *view =GTK_TREE_VIEW (widget);GtkTreePath *path;
@@ -975,7 +975,7 @@ on_treeview2_key_press_event(GtkWidget * widget,/* Row selection changed: update help */ void -on_treeview2_cursor_changed (GtkTreeView * treeview,gpointer user_data) +on_treeview2_cursor_changed (GtkTreeView *treeview,gpointer user_data) {GtkTreeSelection *selection;GtkTreeIter iter;
@@ -991,8 +991,8 @@ 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) +on_treeview1_button_press_event (GtkWidget *widget, +GdkEventButton *event,gpointer user_data) {GtkTreeView *view =GTK_TREE_VIEW (widget);GtkTreePath *path;
@@ -1159,7 +1159,7 @@ 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 (GtkTreeIter *node,struct menu *menu,gchar **row) {GdkColor color;gboolean success;
@@ -1245,7 +1245,7 @@ static GtkTreeIter *gtktree_iter_find_node(GtkTreeIter *parent,* Update the tree by adding/removing entries * Does not change other nodes */ -static void update_tree (struct menu *src,GtkTreeIter * dst) +static void update_tree (struct menu *src,GtkTreeIter *dst) {struct menu *child1;GtkTreeIter iter, tmp;
Quoted 303 lines · On Tue, Jul 18, 2023 at 01:18:06PM +0800, [email protected] wrote:
scripts/kconfig/gconf.c +6
-6@@ -66,8 +66,8 @@ enum {static void display_list (void );static void display_tree (struct menu *menu);static void display_tree_part (void ); -static void update_tree (struct menu *src,GtkTreeIter * dst); -static void set_node (GtkTreeIter * node,struct menu *menu,gchar ** row); +static void update_tree (struct menu *src,GtkTreeIter *dst); +static void set_node (GtkTreeIter *node,struct menu *menu,gchar **row);static gchar **fill_row (struct menu *menu);static void conf_changed (void );@@ -254,8 +254,8 @@ static void init_left_tree(void) }static void renderer_edited (GtkCellRendererText * cell, -const gchar * path_string, -const gchar * new_text,gpointer user_data); +const gchar *path_string, +const gchar *new_text,gpointer user_data);static void init_right_tree (void ) {@@ -407,8 +407,8 @@ static void text_insert_msg(const char *title, const char *message)/* Main Windows Callbacks */ -void on_save_activate (GtkMenuItem * menuitem,gpointer user_data); -gboolean on_window1_delete_event (GtkWidget * widget,GdkEvent * event, +void on_save_activate (GtkMenuItem *menuitem,gpointer user_data); +gboolean on_window1_delete_event (GtkWidget *widget,GdkEvent *event,gpointer user_data) {GtkWidget *dialog, *label;scripts/kconfig/gconf.c +25
-25@@ -453,15 +453,15 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event, } -void on_window1_destroy (GtkObject * object,gpointer user_data) +void on_window1_destroy (GtkObject *object,gpointer user_data) {gtk_main_quit (); }void -on_window1_size_request (GtkWidget * widget, -GtkRequisition * requisition,gpointer user_data) +on_window1_size_request (GtkWidget *widget, +GtkRequisition *requisition,gpointer user_data) {static gint old_h;gint w, h;@@ -483,7 +483,7 @@ on_window1_size_request(GtkWidget * widget,static void -load_filename (GtkFileSelection * file_selector,gpointer user_data) +load_filename (GtkFileSelection *file_selector,gpointer user_data) {const gchar *fn;@@ -496,7 +496,7 @@ load_filename(GtkFileSelection * file_selector, gpointer user_data) display_tree(&rootmenu); } -void on_load1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_load1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *fs;@@ -516,7 +516,7 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_save_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_save_activate (GtkMenuItem *menuitem,gpointer user_data) {if (conf_write (NULL ))text_insert_msg ("Error" ,"Unable to save configuration !" );@@ -525,7 +525,7 @@ void on_save_activate(GtkMenuItem * menuitem, gpointer user_data) static void -store_filename (GtkFileSelection * file_selector,gpointer user_data) +store_filename (GtkFileSelection *file_selector,gpointer user_data) {const gchar *fn;@@ -538,7 +538,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) +void on_save_as1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *fs;@@ -558,14 +558,14 @@ void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_quit1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_quit1_activate (GtkMenuItem *menuitem,gpointer user_data) {if (!on_window1_delete_event (NULL ,NULL ,NULL ))gtk_widget_destroy (GTK_WIDGET (main_wnd)); } -void on_show_name1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_show_name1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkTreeViewColumn *col;@@ -576,7 +576,7 @@ void on_show_name1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_show_range1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_show_range1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkTreeViewColumn *col;@@ -594,7 +594,7 @@ void on_show_range1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_show_data1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_show_data1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkTreeViewColumn *col;@@ -632,7 +632,7 @@ on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data) } -void on_introduction1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_introduction1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *dialog; const gchar *intro_text =@@ -663,7 +663,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_about1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_about1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *dialog; const gchar *about_text =@@ -681,7 +681,7 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_license1_activate (GtkMenuItem * menuitem,gpointer user_data) +void on_license1_activate (GtkMenuItem *menuitem,gpointer user_data) {GtkWidget *dialog; const gchar *license_text =@@ -700,7 +700,7 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data) } -void on_back_clicked (GtkButton * button,gpointer user_data) +void on_back_clicked (GtkButton *button,gpointer user_data) {enum prop_type ptype;@@ -715,13 +715,13 @@ void on_back_clicked(GtkButton * button, gpointer user_data) } -void on_load_clicked (GtkButton * button,gpointer user_data) +void on_load_clicked (GtkButton *button,gpointer user_data) {on_load1_activate (NULL , user_data); } -void on_single_clicked (GtkButton * button,gpointer user_data) +void on_single_clicked (GtkButton *button,gpointer user_data) { view_mode =SINGLE_VIEW ;gtk_widget_hide (tree1_w);@@ -730,7 +730,7 @@ void on_single_clicked(GtkButton * button, gpointer user_data) } -void on_split_clicked (GtkButton * button,gpointer user_data) +void on_split_clicked (GtkButton *button,gpointer user_data) {gint w, h; view_mode =SPLIT_VIEW ;@@ -746,7 +746,7 @@ void on_split_clicked(GtkButton * button, gpointer user_data) } -void on_full_clicked (GtkButton * button,gpointer user_data) +void on_full_clicked (GtkButton *button,gpointer user_data) { view_mode =FULL_VIEW ;gtk_widget_hide (tree1_w);@@ -757,13 +757,13 @@ void on_full_clicked(GtkButton * button, gpointer user_data) } -void on_collapse_clicked (GtkButton * button,gpointer user_data) +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) +void on_expand_clicked (GtkButton *button,gpointer user_data) {gtk_tree_view_expand_all (GTK_TREE_VIEW (tree2_w)); }@@ -772,9 +772,9 @@ void on_expand_clicked(GtkButton * button, gpointer user_data)/* CTree Callbacks */ /* Change hex/int/string value in the cell */ -static void renderer_edited(GtkCellRendererText * cell, -const gchar * path_string, -const gchar * new_text,gpointer user_data) +static void renderer_edited(GtkCellRendererText *cell, +const gchar *path_string, +const gchar *new_text,gpointer user_data) {GtkTreePath *path =gtk_tree_path_new_from_string (path_string);GtkTreeIter iter;scripts/kconfig/gconf.c +8
-8@@ -855,7 +855,7 @@ static void toggle_sym_value(struct menu *menu)display_tree_part ();//fixme: keep exp/coll } -static gint column2index (GtkTreeViewColumn * column) +static gint column2index (GtkTreeViewColumn *column) {gint i;@@ -873,8 +873,8 @@ 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) +on_treeview2_button_press_event (GtkWidget *widget, +GdkEventButton *event,gpointer user_data) {GtkTreeView *view =GTK_TREE_VIEW (widget);GtkTreePath *path;@@ -930,8 +930,8 @@ on_treeview2_button_press_event(GtkWidget * widget,/* Key pressed: update choice */ gboolean -on_treeview2_key_press_event (GtkWidget * widget, -GdkEventKey * event,gpointer user_data) +on_treeview2_key_press_event (GtkWidget *widget, +GdkEventKey *event,gpointer user_data) {GtkTreeView *view =GTK_TREE_VIEW (widget);GtkTreePath *path;@@ -975,7 +975,7 @@ on_treeview2_key_press_event(GtkWidget * widget,/* Row selection changed: update help */ void -on_treeview2_cursor_changed (GtkTreeView * treeview,gpointer user_data) +on_treeview2_cursor_changed (GtkTreeView *treeview,gpointer user_data) {GtkTreeSelection *selection;GtkTreeIter iter;@@ -991,8 +991,8 @@ 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) +on_treeview1_button_press_event (GtkWidget *widget, +GdkEventButton *event,gpointer user_data) {GtkTreeView *view =GTK_TREE_VIEW (widget);GtkTreePath *path;scripts/kconfig/gconf.c +2
-2@@ -1159,7 +1159,7 @@ 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 (GtkTreeIter *node,struct menu *menu,gchar **row) {GdkColor color;gboolean success;@@ -1245,7 +1245,7 @@ static GtkTreeIter *gtktree_iter_find_node(GtkTreeIter*parent, * Update the tree by adding/removing entries * Does not change other nodes */ -static void update_tree (struct menu *src,GtkTreeIter * dst) +static void update_tree (struct menu *src,GtkTreeIter *dst) {struct menu *child1;
Quoted 1 line
GtkTreeIter iter, tmp;
Another checkpatch fix churn.
But hey, you still use Roundcube to send your patches while that MUA corrupts them, right?
Thanks.
Signature · 1 line
An old man doll... just what I always wanted! - Clara