mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
scripts: Remove duplicate newlines
Drop all duplicate newlines. No functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
@@ -360,10 +360,8 @@ void init_right_tree(void)
|
||||
gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
|
||||
}
|
||||
|
||||
|
||||
/* Utility Functions */
|
||||
|
||||
|
||||
static void text_insert_help(struct menu *menu)
|
||||
{
|
||||
GtkTextBuffer *buffer;
|
||||
@@ -388,7 +386,6 @@ static void text_insert_help(struct menu *menu)
|
||||
str_free(&help);
|
||||
}
|
||||
|
||||
|
||||
static void text_insert_msg(const char *title, const char *message)
|
||||
{
|
||||
GtkTextBuffer *buffer;
|
||||
@@ -409,7 +406,6 @@ static void text_insert_msg(const char *title, const char *message)
|
||||
NULL);
|
||||
}
|
||||
|
||||
|
||||
/* Main Windows Callbacks */
|
||||
|
||||
void on_save_activate(GtkMenuItem * menuitem, gpointer user_data);
|
||||
@@ -457,13 +453,11 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
void on_window1_destroy(GtkObject * object, gpointer user_data)
|
||||
{
|
||||
gtk_main_quit();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
on_window1_size_request(GtkWidget * widget,
|
||||
GtkRequisition * requisition, gpointer user_data)
|
||||
@@ -483,10 +477,8 @@ on_window1_size_request(GtkWidget * widget,
|
||||
gtk_paned_set_position(GTK_PANED(vpaned), 2 * h / 3);
|
||||
}
|
||||
|
||||
|
||||
/* Menu & Toolbar Callbacks */
|
||||
|
||||
|
||||
static void
|
||||
load_filename(GtkFileSelection * file_selector, gpointer user_data)
|
||||
{
|
||||
@@ -520,14 +512,12 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
gtk_widget_show(fs);
|
||||
}
|
||||
|
||||
|
||||
void on_save_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
{
|
||||
if (conf_write(NULL))
|
||||
text_insert_msg("Error", "Unable to save configuration !");
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
store_filename(GtkFileSelection * file_selector, gpointer user_data)
|
||||
{
|
||||
@@ -561,14 +551,12 @@ void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
gtk_widget_show(fs);
|
||||
}
|
||||
|
||||
|
||||
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)
|
||||
{
|
||||
GtkTreeViewColumn *col;
|
||||
@@ -579,7 +567,6 @@ 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)
|
||||
{
|
||||
GtkTreeViewColumn *col;
|
||||
@@ -597,7 +584,6 @@ void on_show_range1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
|
||||
}
|
||||
|
||||
|
||||
void on_show_data1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
{
|
||||
GtkTreeViewColumn *col;
|
||||
@@ -608,7 +594,6 @@ 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)
|
||||
{
|
||||
@@ -617,7 +602,6 @@ on_set_option_mode1_activate(GtkMenuItem *menuitem, gpointer user_data)
|
||||
display_tree(&rootmenu); /* instead of update_tree to speed-up */
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
on_set_option_mode2_activate(GtkMenuItem *menuitem, gpointer user_data)
|
||||
{
|
||||
@@ -626,7 +610,6 @@ on_set_option_mode2_activate(GtkMenuItem *menuitem, gpointer user_data)
|
||||
display_tree(&rootmenu); /* instead of update_tree to speed-up */
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data)
|
||||
{
|
||||
@@ -635,7 +618,6 @@ on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data)
|
||||
display_tree(&rootmenu); /* instead of update_tree to speed-up */
|
||||
}
|
||||
|
||||
|
||||
void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
@@ -666,7 +648,6 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
gtk_widget_show_all(dialog);
|
||||
}
|
||||
|
||||
|
||||
void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
@@ -684,7 +665,6 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
gtk_widget_show_all(dialog);
|
||||
}
|
||||
|
||||
|
||||
void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
{
|
||||
GtkWidget *dialog;
|
||||
@@ -703,7 +683,6 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data)
|
||||
gtk_widget_show_all(dialog);
|
||||
}
|
||||
|
||||
|
||||
void on_back_clicked(GtkButton * button, gpointer user_data)
|
||||
{
|
||||
enum prop_type ptype;
|
||||
@@ -718,13 +697,11 @@ 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)
|
||||
{
|
||||
on_load1_activate(NULL, user_data);
|
||||
}
|
||||
|
||||
|
||||
void on_single_clicked(GtkButton * button, gpointer user_data)
|
||||
{
|
||||
view_mode = SINGLE_VIEW;
|
||||
@@ -733,7 +710,6 @@ void on_single_clicked(GtkButton * button, gpointer user_data)
|
||||
display_tree_part();
|
||||
}
|
||||
|
||||
|
||||
void on_split_clicked(GtkButton * button, gpointer user_data)
|
||||
{
|
||||
gint w, h;
|
||||
@@ -749,7 +725,6 @@ void on_split_clicked(GtkButton * button, gpointer user_data)
|
||||
gtk_widget_set_sensitive(back_btn, FALSE);
|
||||
}
|
||||
|
||||
|
||||
void on_full_clicked(GtkButton * button, gpointer user_data)
|
||||
{
|
||||
view_mode = FULL_VIEW;
|
||||
@@ -760,19 +735,16 @@ void on_full_clicked(GtkButton * button, gpointer user_data)
|
||||
gtk_widget_set_sensitive(back_btn, FALSE);
|
||||
}
|
||||
|
||||
|
||||
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)
|
||||
{
|
||||
gtk_tree_view_expand_all(GTK_TREE_VIEW(tree2_w));
|
||||
}
|
||||
|
||||
|
||||
/* CTree Callbacks */
|
||||
|
||||
/* Change hex/int/string value in the cell */
|
||||
@@ -874,7 +846,6 @@ static gint column2index(GtkTreeViewColumn * column)
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/* User click: update choice (full) or goes down (single) */
|
||||
gboolean
|
||||
on_treeview2_button_press_event(GtkWidget * widget,
|
||||
@@ -976,7 +947,6 @@ on_treeview2_key_press_event(GtkWidget * widget,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
/* Row selection changed: update help */
|
||||
void
|
||||
on_treeview2_cursor_changed(GtkTreeView * treeview, gpointer user_data)
|
||||
@@ -992,7 +962,6 @@ 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,
|
||||
@@ -1032,7 +1001,6 @@ on_treeview1_button_press_event(GtkWidget * widget,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
/* Fill a row of strings */
|
||||
static gchar **fill_row(struct menu *menu)
|
||||
{
|
||||
@@ -1157,7 +1125,6 @@ static gchar **fill_row(struct menu *menu)
|
||||
return row;
|
||||
}
|
||||
|
||||
|
||||
/* Set the node content with a row of strings */
|
||||
static void set_node(GtkTreeIter * node, struct menu *menu, gchar ** row)
|
||||
{
|
||||
@@ -1193,7 +1160,6 @@ static void set_node(GtkTreeIter * node, struct menu *menu, gchar ** row)
|
||||
g_object_unref(pix);
|
||||
}
|
||||
|
||||
|
||||
/* Add a node to the tree */
|
||||
static void place_node(struct menu *menu, char **row)
|
||||
{
|
||||
@@ -1204,7 +1170,6 @@ static void place_node(struct menu *menu, char **row)
|
||||
set_node(node, menu, row);
|
||||
}
|
||||
|
||||
|
||||
/* Find a node in the GTK+ tree */
|
||||
static GtkTreeIter found;
|
||||
|
||||
@@ -1240,7 +1205,6 @@ GtkTreeIter *gtktree_iter_find_node(GtkTreeIter * parent,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Update the tree by adding/removing entries
|
||||
* Does not change other nodes
|
||||
@@ -1329,7 +1293,6 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Display the whole tree (single/split/full view) */
|
||||
static void display_tree(struct menu *menu)
|
||||
{
|
||||
@@ -1439,7 +1402,6 @@ void fixup_rootmenu(struct menu *menu)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Main */
|
||||
int main(int ac, char *av[])
|
||||
{
|
||||
|
||||
@@ -20,12 +20,10 @@
|
||||
const typeof( ((type *)0)->member ) *__mptr = (ptr); \
|
||||
(type *)( (char *)__mptr - offsetof(type,member) );})
|
||||
|
||||
|
||||
struct list_head {
|
||||
struct list_head *next, *prev;
|
||||
};
|
||||
|
||||
|
||||
#define LIST_HEAD_INIT(name) { &(name), &(name) }
|
||||
|
||||
#define LIST_HEAD(name) \
|
||||
|
||||
@@ -131,7 +131,6 @@ static inline tristate sym_get_tristate_value(struct symbol *sym)
|
||||
return sym->curr.tri;
|
||||
}
|
||||
|
||||
|
||||
static inline struct symbol *sym_get_choice_value(struct symbol *sym)
|
||||
{
|
||||
return (struct symbol *)sym->curr.val;
|
||||
|
||||
@@ -213,7 +213,6 @@ int dialog_yesno(const char *title, const char *prompt, int height, int width);
|
||||
int dialog_msgbox(const char *title, const char *prompt, int height,
|
||||
int width, int pause);
|
||||
|
||||
|
||||
typedef void (*update_text_fn)(char *buf, size_t start, size_t end, void
|
||||
*_data);
|
||||
int dialog_textbox(const char *title, char *tbuf, int initial_height,
|
||||
|
||||
@@ -33,7 +33,6 @@ static void refresh_text_box(WINDOW *dialog, WINDOW *box, int boxh, int boxw,
|
||||
wrefresh(dialog);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Display text from a file in a dialog box.
|
||||
*
|
||||
|
||||
@@ -853,7 +853,6 @@ struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
void menu_get_ext_help(struct menu *menu, struct gstr *help)
|
||||
{
|
||||
struct symbol *sym = menu->sym;
|
||||
|
||||
@@ -687,7 +687,6 @@ static int do_exit(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void search_conf(void)
|
||||
{
|
||||
struct symbol **sym_arr;
|
||||
@@ -731,7 +730,6 @@ again:
|
||||
str_free(&title);
|
||||
}
|
||||
|
||||
|
||||
static void build_conf(struct menu *menu)
|
||||
{
|
||||
struct symbol *sym;
|
||||
|
||||
@@ -143,7 +143,6 @@ void set_colors(void)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* this changes the windows attributes !!! */
|
||||
void print_in_middle(WINDOW *win,
|
||||
int starty,
|
||||
@@ -154,7 +153,6 @@ void print_in_middle(WINDOW *win,
|
||||
{ int length, x, y;
|
||||
float temp;
|
||||
|
||||
|
||||
if (win == NULL)
|
||||
win = stdscr;
|
||||
getyx(win, y, x);
|
||||
@@ -256,7 +254,6 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
|
||||
int i, x, y;
|
||||
int res = -1;
|
||||
|
||||
|
||||
va_start(ap, btn_num);
|
||||
for (i = 0; i < btn_num; i++) {
|
||||
btn = va_arg(ap, char *);
|
||||
@@ -280,7 +277,6 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
|
||||
y = (getmaxy(stdscr)-(msg_lines+4))/2;
|
||||
x = (getmaxx(stdscr)-(total_width+4))/2;
|
||||
|
||||
|
||||
/* create the windows */
|
||||
if (btn_num > 0)
|
||||
win_rows = msg_lines+4;
|
||||
@@ -315,7 +311,6 @@ int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
|
||||
set_menu_mark(menu, "");
|
||||
post_menu(menu);
|
||||
|
||||
|
||||
touchwin(win);
|
||||
refresh_all_windows(main_window);
|
||||
while ((res = wgetch(win))) {
|
||||
|
||||
Reference in New Issue
Block a user