diff options
| -rw-r--r-- | gtk/capture_dlg.c | 20 | ||||
| -rw-r--r-- | gtk/capture_prefs.c | 6 | ||||
| -rw-r--r-- | gtk/color_dlg.c | 40 | ||||
| -rw-r--r-- | gtk/column_prefs.c | 16 | ||||
| -rw-r--r-- | gtk/decode_as_dlg.c | 28 | ||||
| -rw-r--r-- | gtk/dfilter_expr_dlg.c | 12 | ||||
| -rw-r--r-- | gtk/display_opts.c | 12 | ||||
| -rw-r--r-- | gtk/dlg_utils.c | 4 | ||||
| -rw-r--r-- | gtk/file_dlg.c | 22 | ||||
| -rw-r--r-- | gtk/filter_prefs.c | 34 | ||||
| -rw-r--r-- | gtk/find_dlg.c | 10 | ||||
| -rw-r--r-- | gtk/follow_dlg.c | 26 | ||||
| -rw-r--r-- | gtk/goto_dlg.c | 8 | ||||
| -rw-r--r-- | gtk/gtkclist.c | 28 | ||||
| -rw-r--r-- | gtk/gui_prefs.c | 22 | ||||
| -rw-r--r-- | gtk/help_dlg.c | 8 | ||||
| -rw-r--r-- | gtk/main.c | 56 | ||||
| -rw-r--r-- | gtk/nameres_prefs.c | 6 | ||||
| -rw-r--r-- | gtk/packet_win.c | 12 | ||||
| -rw-r--r-- | gtk/plugins_dlg.c | 6 | ||||
| -rw-r--r-- | gtk/prefs_dlg.c | 22 | ||||
| -rw-r--r-- | gtk/print_dlg.c | 20 | ||||
| -rw-r--r-- | gtk/print_prefs.c | 8 | ||||
| -rw-r--r-- | gtk/progress_dlg.c | 6 | ||||
| -rw-r--r-- | gtk/proto_dlg.c | 16 | ||||
| -rw-r--r-- | gtk/proto_draw.c | 12 | ||||
| -rw-r--r-- | gtk/proto_hier_stats_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/simple_dialog.c | 4 | ||||
| -rw-r--r-- | gtk/stream_prefs.c | 10 | ||||
| -rw-r--r-- | gtk/summary_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/tcp_graph.c | 22 | ||||
| -rw-r--r-- | gtk/ui_util.c | 12 |
32 files changed, 258 insertions, 258 deletions
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 9055493d5f..1d96406287 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1,7 +1,7 @@ /* capture_dlg.c * Routines for packet capture windows * - * $Id: capture_dlg.c,v 1.63 2002/03/05 02:25:09 guy Exp $ + * $Id: capture_dlg.c,v 1.64 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -113,7 +113,7 @@ static void capture_prep_destroy_cb(GtkWidget *win, gpointer user_data); void -capture_stop_cb(GtkWidget *w, gpointer d) +capture_stop_cb(GtkWidget *w _U_, gpointer d _U_) { capture_stop(); } @@ -127,7 +127,7 @@ capture_stop_cb(GtkWidget *w, gpointer d) static GtkWidget *cap_open_w; void -capture_prep_cb(GtkWidget *w, gpointer d) +capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) { GtkWidget *main_vb, *capture_fr, *capture_vb, @@ -627,7 +627,7 @@ capture_prep_file_cb(GtkWidget *w, gpointer file_te) } static void -cap_prep_fs_ok_cb(GtkWidget *w, gpointer data) +cap_prep_fs_ok_cb(GtkWidget *w _U_, gpointer data) { gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data), E_CAP_FILE_TE_KEY)), @@ -636,13 +636,13 @@ cap_prep_fs_ok_cb(GtkWidget *w, gpointer data) } static void -cap_prep_fs_cancel_cb(GtkWidget *w, gpointer data) +cap_prep_fs_cancel_cb(GtkWidget *w _U_, gpointer data) { gtk_widget_destroy(GTK_WIDGET(data)); } static void -cap_prep_fs_destroy_cb(GtkWidget *win, gpointer data) +cap_prep_fs_destroy_cb(GtkWidget *win, gpointer data _U_) { GtkWidget *caller; @@ -660,7 +660,7 @@ cap_prep_fs_destroy_cb(GtkWidget *win, gpointer data) } static void -capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w) { +capture_prep_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { GtkWidget *if_cb, *snap_cb, *snap_sb, *promisc_cb, *filter_te, *file_te, *ringbuffer_on_tb, *ringbuffer_nbf_sb, *sync_cb, *auto_scroll_cb, @@ -806,14 +806,14 @@ capture_prep_ok_cb(GtkWidget *ok_bt, gpointer parent_w) { } static void -capture_prep_close_cb(GtkWidget *close_bt, gpointer parent_w) +capture_prep_close_cb(GtkWidget *close_bt _U_, gpointer parent_w) { gtk_grab_remove(GTK_WIDGET(parent_w)); gtk_widget_destroy(GTK_WIDGET(parent_w)); } static void -capture_prep_destroy_cb(GtkWidget *win, gpointer user_data) +capture_prep_destroy_cb(GtkWidget *win, gpointer user_data _U_) { GtkWidget *capture_prep_filter_w; GtkWidget *fs; @@ -845,7 +845,7 @@ capture_prep_destroy_cb(GtkWidget *win, gpointer user_data) * of other widgets. */ static void -capture_prep_adjust_sensitivity(GtkWidget *tb, gpointer parent_w) +capture_prep_adjust_sensitivity(GtkWidget *tb _U_, gpointer parent_w) { GtkWidget *snap_cb, *snap_sb, *ringbuffer_on_tb, *ringbuffer_nbf_lb, *ringbuffer_nbf_sb, diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c index fdf6863c48..7dbf6ccbff 100644 --- a/gtk/capture_prefs.c +++ b/gtk/capture_prefs.c @@ -1,7 +1,7 @@ /* capture_prefs.c * Dialog box for capture preferences * - * $Id: capture_prefs.c,v 1.8 2002/01/20 20:05:18 guy Exp $ + * $Id: capture_prefs.c,v 1.9 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -153,12 +153,12 @@ capture_prefs_fetch(GtkWidget *w) } void -capture_prefs_apply(GtkWidget *w) +capture_prefs_apply(GtkWidget *w _U_) { } void -capture_prefs_destroy(GtkWidget *w) +capture_prefs_destroy(GtkWidget *w _U_) { } diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index a04416c24c..74aa0b3788 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -1,7 +1,7 @@ /* color_dlg.c * Definitions for dialog boxes for color filters * - * $Id: color_dlg.c,v 1.12 2002/01/21 07:37:41 guy Exp $ + * $Id: color_dlg.c,v 1.13 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -92,7 +92,7 @@ static gchar *titles[2] = { "Name", "Filter String" }; #define COLOR_SELECTION_PARENT "color_selection_parent" static void -filter_expr_cb(GtkWidget *w, gpointer filter_te) +filter_expr_cb(GtkWidget *w _U_, gpointer filter_te) { dfilter_expr_dlg_new(GTK_WIDGET(filter_te)); @@ -101,7 +101,7 @@ filter_expr_cb(GtkWidget *w, gpointer filter_te) /* Callback for the "Display:Colorize Display" menu item. */ void -color_display_cb(GtkWidget *w, gpointer d) +color_display_cb(GtkWidget *w _U_, gpointer d _U_) { if (colorize_win != NULL) { /* There's already a color dialog box active; reactivate it. */ @@ -431,10 +431,10 @@ color_filter_down_cb (GtkButton *button, /* Set selected row in cf */ static void -remember_selected_row (GtkCList *clist, +remember_selected_row (GtkCList *clist _U_, gint row, - gint column, - GdkEvent *event, + gint column _U_, + GdkEvent *event _U_, gpointer user_data) { colfilter *filter = (colfilter *)user_data; @@ -447,8 +447,8 @@ remember_selected_row (GtkCList *clist, * dialog. jjj*/ static void -color_destroy_cb (GtkButton *button, - gpointer user_data) +color_destroy_cb (GtkButton *button _U_, + gpointer user_data _U_) { /* Destroy any edit dialogs we have open. */ g_slist_foreach(filter_list, destroy_edit_dialog_cb, NULL); @@ -457,7 +457,7 @@ color_destroy_cb (GtkButton *button, } static void -destroy_edit_dialog_cb(gpointer filter_arg, gpointer dummy) +destroy_edit_dialog_cb(gpointer filter_arg, gpointer dummy _U_) { color_filter_t *colorf = (color_filter_t *)filter_arg; @@ -575,7 +575,7 @@ color_delete_cb(GtkWidget *widget, gpointer user_data) /* Save color filters to the color filter file. */ static void -color_save_cb (GtkButton *button, +color_save_cb (GtkButton *button _U_, gpointer user_data) { colfilter *filter = (colfilter *)user_data; @@ -588,8 +588,8 @@ color_save_cb (GtkButton *button, /* Exit dialog and apply new list of color filters to the capture. */ static void -color_ok_cb (GtkButton *button, - gpointer user_data) +color_ok_cb (GtkButton *button _U_, + gpointer user_data _U_) { /* colorize list */ colorize_packets(&cfile); @@ -601,8 +601,8 @@ color_ok_cb (GtkButton *button, /* Exit dialog without colorizing packets with the new list. XXX - should really undo any changes to the list.... */ static void -color_cancel_cb (GtkWidget *widget, - gpointer user_data) +color_cancel_cb (GtkWidget *widget _U_, + gpointer user_data _U_) { /* Destroy the dialog box. */ gtk_widget_destroy(colorize_win); @@ -610,8 +610,8 @@ color_cancel_cb (GtkWidget *widget, /* Apply new list of color filters to the capture. */ static void -color_apply_cb (GtkButton *button, - gpointer user_data) +color_apply_cb (GtkButton *button _U_, + gpointer user_data _U_) { colorize_packets(&cfile); } @@ -817,7 +817,7 @@ edit_color_filter_dialog_new (colfilter *filter, to this dialog. */ static void edit_color_filter_destroy_cb (GtkObject *object, - gpointer user_data) + gpointer user_data _U_) { color_filter_t *colorf; GtkWidget *color_sel; @@ -965,7 +965,7 @@ edit_color_filter_ok_cb (GtkButton *button, /* Exit dialog and do not process list */ static void -edit_color_filter_cancel_cb (GtkObject *object, +edit_color_filter_cancel_cb (GtkObject *object _U_, gpointer user_data) { GtkWidget *dialog; @@ -1081,7 +1081,7 @@ color_sel_win_destroy(GtkWidget *sel_win) /* Retrieve selected color */ static void -color_sel_ok_cb (GtkButton *button, +color_sel_ok_cb (GtkButton *button _U_, gpointer user_data) { GdkColor new_color; /* Color from color selection dialog */ @@ -1134,7 +1134,7 @@ color_sel_ok_cb (GtkButton *button, /* Don't choose the selected color as the foreground or background color for the filter. */ static void -color_sel_cancel_cb (GtkObject *object, +color_sel_cancel_cb (GtkObject *object _U_, gpointer user_data) { GtkWidget *color_dialog; diff --git a/gtk/column_prefs.c b/gtk/column_prefs.c index e5991571a3..bca6f9b0a2 100644 --- a/gtk/column_prefs.c +++ b/gtk/column_prefs.c @@ -1,7 +1,7 @@ /* column_prefs.c * Dialog box for column preferences * - * $Id: column_prefs.c,v 1.7 2002/01/11 07:40:31 guy Exp $ + * $Id: column_prefs.c,v 1.8 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -225,7 +225,7 @@ column_sel_list_cb(GtkWidget *l, gpointer data) { /* To do: add input checking to each of these callbacks */ static void -column_sel_new_cb(GtkWidget *w, gpointer data) { +column_sel_new_cb(GtkWidget *w _U_, gpointer data _U_) { fmt_data *cfmt; gchar *title; GtkWidget *nl_item, *nl_lb; @@ -252,7 +252,7 @@ column_sel_new_cb(GtkWidget *w, gpointer data) { } static void -column_sel_chg_cb(GtkWidget *w, gpointer data) { +column_sel_chg_cb(GtkWidget *w _U_, gpointer data _U_) { fmt_data *cfmt; gchar *title = ""; GList *sl, *clp; @@ -281,7 +281,7 @@ column_sel_chg_cb(GtkWidget *w, gpointer data) { } static void -column_sel_del_cb(GtkWidget *w, gpointer data) { +column_sel_del_cb(GtkWidget *w _U_, gpointer data _U_) { GList *sl, *clp; fmt_data *cfmt; GtkObject *l_item; @@ -304,7 +304,7 @@ column_sel_del_cb(GtkWidget *w, gpointer data) { } static void -column_sel_arrow_cb(GtkWidget *w, gpointer data) { +column_sel_arrow_cb(GtkWidget *w, gpointer data _U_) { GList *sl, *clp, *il; fmt_data *cfmt; GtkObject *l_item; @@ -336,16 +336,16 @@ column_sel_arrow_cb(GtkWidget *w, gpointer data) { } void -column_set_fmt_cb(GtkWidget *w, gpointer data) { +column_set_fmt_cb(GtkWidget *w _U_, gpointer data) { cur_fmt = (gint) data; } void -column_prefs_fetch(GtkWidget *w) { +column_prefs_fetch(GtkWidget *w _U_) { } void -column_prefs_apply(GtkWidget *w) { +column_prefs_apply(GtkWidget *w _U_) { } void diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index ddcff3fa05..599f8e0245 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -1,6 +1,6 @@ /* decode_as_dlg.c * - * $Id: decode_as_dlg.c,v 1.22 2002/01/21 07:37:41 guy Exp $ + * $Id: decode_as_dlg.c,v 1.23 2002/03/05 11:55:58 guy Exp $ * * Routines to modify dissector tables on the fly. * @@ -191,13 +191,13 @@ GSList *dissector_reset_list = NULL; * * @param value A pointer to the value for this entry in the dissector * hash table. This is an opaque pointer that can only be handed back - * to routine in the file packet.c + * to routine in the file packet.c - but it's unused. * * @param user_data Unused. */ static void decode_build_reset_list (gchar *table_name, gpointer key, - gpointer value, gpointer user_data) + gpointer value _U_, gpointer user_data _U_) { dissector_delete_item_t *item; @@ -309,7 +309,7 @@ decode_build_show_list (gchar *table_name, gpointer key, * @param gpointer A pointer to the dialog window. */ static void -decode_show_ok_cb (GtkWidget *ok_bt, gpointer parent_w) +decode_show_ok_cb (GtkWidget *ok_bt _U_, gpointer parent_w) { gtk_widget_destroy(GTK_WIDGET(parent_w)); } @@ -326,7 +326,7 @@ decode_show_ok_cb (GtkWidget *ok_bt, gpointer parent_w) * @param gpointer A pointer to the dialog window. */ static void -decode_show_reset_cb (GtkWidget *reset_bt, gpointer parent_w) +decode_show_reset_cb (GtkWidget *reset_bt _U_, gpointer parent_w) { dissector_delete_item_t *item; GSList *tmp; @@ -358,7 +358,7 @@ decode_show_reset_cb (GtkWidget *reset_bt, gpointer parent_w) * @param gpointer Unknown */ static gboolean -decode_show_delete_cb (GtkWidget *decode_w, gpointer dummy) +decode_show_delete_cb (GtkWidget *decode_w _U_, gpointer dummy _U_) { decode_show_ok_cb(NULL, decode_show_w); return FALSE; @@ -376,7 +376,7 @@ decode_show_delete_cb (GtkWidget *decode_w, gpointer dummy) * @param gpointer Unknown */ static void -decode_show_destroy_cb (GtkWidget *win, gpointer user_data) +decode_show_destroy_cb (GtkWidget *win _U_, gpointer user_data _U_) { /* Note that we no longer have a "Decode As:Show" dialog box. */ decode_show_w = NULL; @@ -391,7 +391,7 @@ decode_show_destroy_cb (GtkWidget *win, gpointer user_data) * @param data Unknown */ void -decode_show_cb (GtkWidget * w, gpointer data) +decode_show_cb (GtkWidget * w _U_, gpointer data _U_) { GtkWidget *main_vb, *bbox, *ok_bt, *button, *scrolled_window; GtkCList *clist; @@ -650,7 +650,7 @@ decode_transport (GtkObject *notebook_pg) * @param parent_w A pointer to the dialog window. */ static void -decode_ok_cb (GtkWidget *ok_bt, gpointer parent_w) +decode_ok_cb (GtkWidget *ok_bt _U_, gpointer parent_w) { GtkWidget *notebook, *notebook_pg; GtkSignalFunc func; @@ -683,7 +683,7 @@ decode_ok_cb (GtkWidget *ok_bt, gpointer parent_w) * @param parent_w A pointer to the dialog window. */ static void -decode_cancel_cb (GtkWidget *cancel_bt, gpointer parent_w) +decode_cancel_cb (GtkWidget *cancel_bt _U_, gpointer parent_w) { gtk_widget_destroy(GTK_WIDGET(parent_w)); g_slist_free(decode_dimmable); @@ -702,7 +702,7 @@ decode_cancel_cb (GtkWidget *cancel_bt, gpointer parent_w) * @param dummy Unknown */ static gboolean -decode_delete_cb (GtkWidget *decode_w, gpointer dummy) +decode_delete_cb (GtkWidget *decode_w, gpointer dummy _U_) { decode_cancel_cb(NULL, decode_w); return FALSE; @@ -722,7 +722,7 @@ decode_delete_cb (GtkWidget *decode_w, gpointer dummy) * @return void */ static void -decode_destroy_cb (GtkWidget *win, gpointer user_data) +decode_destroy_cb (GtkWidget *win _U_, gpointer user_data _U_) { /* Note that we no longer have a "Decode As" dialog box. */ decode_w = NULL; @@ -744,7 +744,7 @@ decode_destroy_cb (GtkWidget *win, gpointer user_data) * will be either E_DECODE_YES or E_DECODE_NO */ static void -decode_update_action (GtkWidget *w, gpointer data) +decode_update_action (GtkWidget *w _U_, gpointer data) { GSList *tmp; gboolean enable; @@ -1210,7 +1210,7 @@ decode_add_notebook (GtkWidget *format_hb) * @param data Unknown */ void -decode_as_cb (GtkWidget * w, gpointer data) +decode_as_cb (GtkWidget * w _U_, gpointer data _U_) { GtkWidget *main_vb, *format_hb, *bbox, *ok_bt, *cancel_bt, *button; GtkWidget *button_vb; diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index 921dd0d495..5693bfaed6 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -7,7 +7,7 @@ * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and * Guy Harris <guy@alum.mit.edu> * - * $Id: dfilter_expr_dlg.c,v 1.24 2002/01/11 06:43:17 guy Exp $ + * $Id: dfilter_expr_dlg.c,v 1.25 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -104,8 +104,8 @@ static void display_value_fields(header_field_info *hfinfo, * whether it is already selected or not. */ static void -field_select_row_cb(GtkWidget *tree, GList *node, gint column, - gpointer user_data) +field_select_row_cb(GtkWidget *tree, GList *node, gint column _U_, + gpointer user_data _U_) { GtkWidget *window = gtk_widget_get_toplevel(tree); GtkWidget *relation_label = gtk_object_get_data(GTK_OBJECT(window), @@ -291,8 +291,8 @@ add_relation_list(GtkWidget *relation_list, char *relation) } static void -relation_list_sel_cb(GtkList *relation_list, GtkWidget *child, - gpointer user_data) +relation_list_sel_cb(GtkList *relation_list, GtkWidget *child _U_, + gpointer user_data _U_) { GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(relation_list)); GtkWidget *range_label = gtk_object_get_data(GTK_OBJECT(window), @@ -899,7 +899,7 @@ dfilter_expr_dlg_accept_cb(GtkWidget *w, gpointer filter_te_arg) } static void -dfilter_expr_dlg_cancel_cb(GtkWidget *w, gpointer parent_w) +dfilter_expr_dlg_cancel_cb(GtkWidget *w _U_, gpointer parent_w) { /* * User pressed the cancel button; close the dialog box. diff --git a/gtk/display_opts.c b/gtk/display_opts.c index b0cd04af61..a82996b830 100644 --- a/gtk/display_opts.c +++ b/gtk/display_opts.c @@ -1,7 +1,7 @@ /* display_opts.c * Routines for packet display windows * - * $Id: display_opts.c,v 1.25 2002/01/21 07:37:41 guy Exp $ + * $Id: display_opts.c,v 1.26 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -92,7 +92,7 @@ static ts_type initial_timestamp_type; static ts_type current_timestamp_type; void -display_opt_cb(GtkWidget *w, gpointer d) { +display_opt_cb(GtkWidget *w _U_, gpointer d _U_) { GtkWidget *button, *main_vb, *bbox, *ok_bt, *apply_bt, *cancel_bt; GtkAccelGroup *accel_group; @@ -244,7 +244,7 @@ display_opt_cb(GtkWidget *w, gpointer d) { } static void -display_opt_ok_cb(GtkWidget *ok_bt, gpointer parent_w) { +display_opt_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { get_display_options(GTK_WIDGET(parent_w)); gtk_widget_destroy(GTK_WIDGET(parent_w)); @@ -253,7 +253,7 @@ display_opt_ok_cb(GtkWidget *ok_bt, gpointer parent_w) { } static void -display_opt_apply_cb(GtkWidget *ok_bt, gpointer parent_w) { +display_opt_apply_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { get_display_options(GTK_WIDGET(parent_w)); update_display(); @@ -325,7 +325,7 @@ update_display(void) } static void -display_opt_close_cb(GtkWidget *close_bt, gpointer parent_w) +display_opt_close_cb(GtkWidget *close_bt _U_, gpointer parent_w) { /* Revert the timestamp type to the value it has when we started. */ timestamp_type = initial_timestamp_type; @@ -338,7 +338,7 @@ display_opt_close_cb(GtkWidget *close_bt, gpointer parent_w) } static void -display_opt_destroy_cb(GtkWidget *win, gpointer user_data) +display_opt_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) { /* Note that we no longer have a "Display Options" dialog box. */ display_opt_w = NULL; diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c index 23bc45eb4e..773e2db026 100644 --- a/gtk/dlg_utils.c +++ b/gtk/dlg_utils.c @@ -1,7 +1,7 @@ /* dlg_utils.c * Utilities to use when constructing dialogs * - * $Id: dlg_utils.c,v 1.6 2001/12/12 21:38:58 gerald Exp $ + * $Id: dlg_utils.c,v 1.7 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -70,7 +70,7 @@ dlg_set_activate(GtkWidget *widget, GtkWidget *ok_button) } static void -dlg_activate (GtkWidget *widget, gpointer ok_button) +dlg_activate (GtkWidget *widget _U_, gpointer ok_button) { gtk_widget_activate(GTK_WIDGET(ok_button)); } diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c index e95c7a812b..c2ace7912c 100644 --- a/gtk/file_dlg.c +++ b/gtk/file_dlg.c @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c,v 1.48 2002/01/21 07:37:41 guy Exp $ + * $Id: file_dlg.c,v 1.49 2002/03/05 11:55:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -72,7 +72,7 @@ static GtkWidget *file_open_w; /* Open a file */ void -file_open_cmd_cb(GtkWidget *w, gpointer data) +file_open_cmd_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *main_vb, *filter_hbox, *filter_bt, *filter_te, *m_resolv_cb, *n_resolv_cb, *t_resolv_cb; @@ -263,7 +263,7 @@ file_open_ok_cb(GtkWidget *w, GtkFileSelection *fs) { } static void -file_open_destroy_cb(GtkWidget *win, gpointer user_data) +file_open_destroy_cb(GtkWidget *win, gpointer user_data _U_) { GtkWidget *file_open_filter_w; @@ -282,7 +282,7 @@ file_open_destroy_cb(GtkWidget *win, gpointer user_data) /* Close a file */ void -file_close_cmd_cb(GtkWidget *widget, gpointer data) { +file_close_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { close_cap_file(&cfile); } @@ -369,7 +369,7 @@ set_file_type_list(GtkWidget *option_menu) } static void -select_file_type_cb(GtkWidget *w, gpointer data) +select_file_type_cb(GtkWidget *w _U_, gpointer data) { int new_filetype = (int)data; @@ -383,7 +383,7 @@ select_file_type_cb(GtkWidget *w, gpointer data) } static void -toggle_filtered_cb(GtkWidget *widget, gpointer data) +toggle_filtered_cb(GtkWidget *widget, gpointer data _U_) { gboolean new_filtered; @@ -397,7 +397,7 @@ toggle_filtered_cb(GtkWidget *widget, gpointer data) } static void -toggle_marked_cb(GtkWidget *widget, gpointer data) +toggle_marked_cb(GtkWidget *widget, gpointer data _U_) { gboolean new_marked; @@ -419,7 +419,7 @@ toggle_marked_cb(GtkWidget *widget, gpointer data) static GtkWidget *file_save_as_w; void -file_save_as_cmd_cb(GtkWidget *w, gpointer data) +file_save_as_cmd_cb(GtkWidget *w _U_, gpointer data _U_) { GtkWidget *ok_bt, *main_vb, *ft_hb, *ft_lb; @@ -562,7 +562,7 @@ file_set_save_marked_sensitive(void) } static void -file_save_as_ok_cb(GtkWidget *w, GtkFileSelection *fs) { +file_save_as_ok_cb(GtkWidget *w _U_, GtkFileSelection *fs) { gchar *cf_name; cf_name = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs))); @@ -579,7 +579,7 @@ file_save_as_ok_cb(GtkWidget *w, GtkFileSelection *fs) { } static void -file_save_as_destroy_cb(GtkWidget *win, gpointer user_data) +file_save_as_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) { /* Note that we no longer have a "Save Capture File As" dialog box. */ file_save_as_w = NULL; @@ -587,7 +587,7 @@ file_save_as_destroy_cb(GtkWidget *win, gpointer user_data) /* Reload a file using the current read and display filters */ void -file_reload_cmd_cb(GtkWidget *w, gpointer data) { +file_reload_cmd_cb(GtkWidget *w, gpointer data _U_) { /*GtkWidget *filter_te = gtk_object_get_data(GTK_OBJECT(w), E_DFILTER_TE_KEY);*/ GtkWidget *filter_te; gchar *filename; diff --git a/gtk/filter_prefs.c b/gtk/filter_prefs.c index 778273d740..401bff34d9 100644 --- a/gtk/filter_prefs.c +++ b/gtk/filter_prefs.c @@ -3,7 +3,7 @@ * (This used to be a notebook page under "Preferences", hence the * "prefs" in the file name.) * - * $Id: filter_prefs.c,v 1.33 2002/01/11 07:40:31 guy Exp $ + * $Id: filter_prefs.c,v 1.34 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -107,7 +107,7 @@ static void filter_filter_te_destroy_cb(GtkWidget *, gpointer); lists, but we don't yet have that, so the list of filters this shows is a list of all filters. */ void -capture_filter_construct_cb(GtkWidget *w, gpointer user_data) +capture_filter_construct_cb(GtkWidget *w, gpointer user_data _U_) { GtkWidget *caller = gtk_widget_get_toplevel(w); GtkWidget *filter_browse_w; @@ -208,7 +208,7 @@ static GtkWidget *global_cfilter_w; /* Create a filter dialog for editing capture filters; this is to be used as a callback for menu items, toolbars, etc.. */ void -cfilter_dialog_cb(GtkWidget *w) +cfilter_dialog_cb(GtkWidget *w _U_) { /* No Apply button, and there's no text widget to set, much less activate, on "OK". */ @@ -240,7 +240,7 @@ static GtkWidget *global_dfilter_w; /* Create a filter dialog for editing display filters; this is to be used as a callback for menu items, toolbars, etc.. */ void -dfilter_dialog_cb(GtkWidget *w) +dfilter_dialog_cb(GtkWidget *w _U_) { /* No Apply button, and there's no text widget to set, much less activate, on "OK". */ @@ -321,7 +321,7 @@ get_filter_dialog_list(filter_list_type_t list) } static GtkWidget * -filter_dialog_new(GtkWidget *caller, GtkWidget *parent_filter_te, +filter_dialog_new(GtkWidget *caller _U_, GtkWidget *parent_filter_te, filter_list_type_t list, construct_args_t *construct_args) { GtkWidget *main_w, /* main window */ @@ -653,7 +653,7 @@ filter_dlg_dclick(GtkWidget *filter_l, gpointer main_w_arg) } static void -filter_dlg_ok_cb(GtkWidget *ok_bt, gpointer data) +filter_dlg_ok_cb(GtkWidget *ok_bt, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(ok_bt); @@ -669,7 +669,7 @@ filter_dlg_ok_cb(GtkWidget *ok_bt, gpointer data) } static void -filter_dlg_apply_cb(GtkWidget *apply_bt, gpointer dummy) +filter_dlg_apply_cb(GtkWidget *apply_bt, gpointer dummy _U_) { filter_apply(gtk_widget_get_toplevel(apply_bt)); } @@ -704,7 +704,7 @@ filter_apply(GtkWidget *main_w) } static void -filter_dlg_save_cb(GtkWidget *save_bt, gpointer data) +filter_dlg_save_cb(GtkWidget *save_bt _U_, gpointer data) { filter_list_type_t list = *(filter_list_type_t *)data; char *pf_dir_path; @@ -748,7 +748,7 @@ filter_dlg_save_cb(GtkWidget *save_bt, gpointer data) } static void -filter_dlg_close_cb(GtkWidget *close_bt, gpointer parent_w) +filter_dlg_close_cb(GtkWidget *close_bt _U_, gpointer parent_w) { gtk_widget_destroy(GTK_WIDGET(parent_w)); } @@ -819,7 +819,7 @@ filter_sel_list_button_cb (GtkWidget *widget, GdkEventButton *event, } static void -filter_sel_list_cb(GtkWidget *l, gpointer data) +filter_sel_list_cb(GtkWidget *l, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(l); GtkWidget *name_te = gtk_object_get_data(GTK_OBJECT(main_w), E_FILT_NAME_TE_KEY); @@ -880,7 +880,7 @@ filter_sel_list_cb(GtkWidget *l, gpointer data) } static void -filter_list_destroy_cb(GtkWidget *l, gpointer data) +filter_list_destroy_cb(GtkWidget *l, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(l); @@ -1021,7 +1021,7 @@ filter_chg_bt_clicked_cb(GtkWidget *w, gpointer data) } static void -filter_chg_bt_destroy_cb(GtkWidget *chg_bt, gpointer data) +filter_chg_bt_destroy_cb(GtkWidget *chg_bt, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(chg_bt); @@ -1062,7 +1062,7 @@ filter_copy_bt_clicked_cb(GtkWidget *w, gpointer data) } static void -filter_copy_bt_destroy_cb(GtkWidget *copy_bt, gpointer data) +filter_copy_bt_destroy_cb(GtkWidget *copy_bt, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(copy_bt); @@ -1107,7 +1107,7 @@ filter_del_bt_clicked_cb(GtkWidget *w, gpointer data) } static void -filter_del_bt_destroy_cb(GtkWidget *del_bt, gpointer data) +filter_del_bt_destroy_cb(GtkWidget *del_bt, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(del_bt); @@ -1115,7 +1115,7 @@ filter_del_bt_destroy_cb(GtkWidget *del_bt, gpointer data) } static void -filter_expr_cb(GtkWidget *w, gpointer main_w_arg) +filter_expr_cb(GtkWidget *w _U_, gpointer main_w_arg) { GtkWidget *main_w = GTK_WIDGET(main_w_arg); GtkWidget *filter_te; @@ -1126,7 +1126,7 @@ filter_expr_cb(GtkWidget *w, gpointer main_w_arg) } static void -filter_name_te_destroy_cb(GtkWidget *name_te, gpointer data) +filter_name_te_destroy_cb(GtkWidget *name_te, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(name_te); @@ -1134,7 +1134,7 @@ filter_name_te_destroy_cb(GtkWidget *name_te, gpointer data) } static void -filter_filter_te_destroy_cb(GtkWidget *filter_te, gpointer data) +filter_filter_te_destroy_cb(GtkWidget *filter_te, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(filter_te); diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 99dc35ef6d..35bc25ae4c 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -1,7 +1,7 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c,v 1.20 2002/01/21 07:37:41 guy Exp $ + * $Id: find_dlg.c,v 1.21 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -67,7 +67,7 @@ find_frame_destroy_cb(GtkWidget *win, gpointer user_data); static GtkWidget *find_frame_w; void -find_frame_cb(GtkWidget *w, gpointer d) +find_frame_cb(GtkWidget *w _U_, gpointer d _U_) { GtkWidget *main_vb, *filter_hb, *filter_bt, *filter_te, *direction_hb, *forward_rb, *backward_rb, @@ -182,7 +182,7 @@ find_frame_cb(GtkWidget *w, gpointer d) } static void -find_frame_ok_cb(GtkWidget *ok_bt, gpointer parent_w) +find_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { GtkWidget *filter_te, *backward_rb; gchar *filter_text; @@ -229,14 +229,14 @@ find_frame_ok_cb(GtkWidget *ok_bt, gpointer parent_w) } static void -find_frame_close_cb(GtkWidget *close_bt, gpointer parent_w) +find_frame_close_cb(GtkWidget *close_bt _U_, gpointer parent_w) { gtk_grab_remove(GTK_WIDGET(parent_w)); gtk_widget_destroy(GTK_WIDGET(parent_w)); } static void -find_frame_destroy_cb(GtkWidget *win, gpointer user_data) +find_frame_destroy_cb(GtkWidget *win, gpointer user_data _U_) { GtkWidget *find_frame_filter_w; diff --git a/gtk/follow_dlg.c b/gtk/follow_dlg.c index 29c6df3b96..1ac03a0f27 100644 --- a/gtk/follow_dlg.c +++ b/gtk/follow_dlg.c @@ -1,6 +1,6 @@ /* follow_dlg.c * - * $Id: follow_dlg.c,v 1.21 2002/02/28 19:35:09 gram Exp $ + * $Id: follow_dlg.c,v 1.22 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -135,7 +135,7 @@ forget_follow_info(follow_info_t *follow_info) } static void -follow_redraw(gpointer data, gpointer user_data) +follow_redraw(gpointer data, gpointer user_data _U_) { follow_load_text((follow_info_t *)data); } @@ -151,7 +151,7 @@ follow_redraw_all(void) a dissection routine on belongs (this might be the most recently selected packet, or it might be the last packet in the file). */ void -follow_stream_cb(GtkWidget * w, gpointer data) +follow_stream_cb(GtkWidget * w, gpointer data _U_) { GtkWidget *streamwindow, *vbox, *txt_scrollw, *text, *filter_te; GtkWidget *hbox, *button, *radio_bt; @@ -399,7 +399,7 @@ follow_stream_cb(GtkWidget * w, gpointer data) /* The destroy call back has the responsibility of * unlinking the temporary file */ static void -follow_destroy_cb(GtkWidget *w, gpointer data) +follow_destroy_cb(GtkWidget *w, gpointer data _U_) { follow_info_t *follow_info; @@ -413,7 +413,7 @@ follow_destroy_cb(GtkWidget *w, gpointer data) /* XXX - can I emulate follow_charset_toggle_cb() instead of having * 3 different functions here? */ static void -follow_stream_om_both(GtkWidget *w, gpointer data) +follow_stream_om_both(GtkWidget *w _U_, gpointer data) { follow_info_t *follow_info = data; follow_info->show_stream = BOTH_HOSTS; @@ -421,7 +421,7 @@ follow_stream_om_both(GtkWidget *w, gpointer data) } static void -follow_stream_om_client(GtkWidget *w, gpointer data) +follow_stream_om_client(GtkWidget *w _U_, gpointer data) { follow_info_t *follow_info = data; follow_info->show_stream = FROM_CLIENT; @@ -429,7 +429,7 @@ follow_stream_om_client(GtkWidget *w, gpointer data) } static void -follow_stream_om_server(GtkWidget *w, gpointer data) +follow_stream_om_server(GtkWidget *w _U_, gpointer data) { follow_info_t *follow_info = data; follow_info->show_stream = FROM_SERVER; @@ -439,7 +439,7 @@ follow_stream_om_server(GtkWidget *w, gpointer data) /* Handles the ASCII/EBCDIC toggling */ static void -follow_charset_toggle_cb(GtkWidget * w, gpointer data) +follow_charset_toggle_cb(GtkWidget * w _U_, gpointer data) { follow_info_t *follow_info = data; @@ -603,7 +603,7 @@ follow_read_stream(follow_info_t *follow_info, * For now, we support only text printing. */ static void -follow_print_text(char *buffer, int nchars, gboolean is_server, void *arg) +follow_print_text(char *buffer, int nchars, gboolean is_server _U_, void *arg) { FILE *fh = arg; @@ -611,7 +611,7 @@ follow_print_text(char *buffer, int nchars, gboolean is_server, void *arg) } static void -follow_print_stream(GtkWidget * w, gpointer data) +follow_print_stream(GtkWidget * w _U_, gpointer data) { FILE *fh; gboolean to_file; @@ -718,7 +718,7 @@ follow_load_text(follow_info_t *follow_info) * up the existing one, rather than creating a new one. */ static void -follow_save_as_cmd_cb(GtkWidget *w, gpointer data) +follow_save_as_cmd_cb(GtkWidget *w _U_, gpointer data) { GtkWidget *ok_bt, *new_win; follow_info_t *follow_info = data; @@ -770,7 +770,7 @@ follow_save_as_cmd_cb(GtkWidget *w, gpointer data) static void -follow_save_as_ok_cb(GtkWidget * w, GtkFileSelection * fs) +follow_save_as_ok_cb(GtkWidget * w _U_, GtkFileSelection * fs) { gchar *to_name; follow_info_t *follow_info; @@ -795,7 +795,7 @@ follow_save_as_ok_cb(GtkWidget * w, GtkFileSelection * fs) } static void -follow_save_as_destroy_cb(GtkWidget * win, gpointer data) +follow_save_as_destroy_cb(GtkWidget * win _U_, gpointer data) { follow_info_t *follow_info = data; diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c index 0fed71f650..ba23ad7a0f 100644 --- a/gtk/goto_dlg.c +++ b/gtk/goto_dlg.c @@ -1,7 +1,7 @@ /* goto_dlg.c * Routines for "go to frame" window * - * $Id: goto_dlg.c,v 1.14 2002/01/21 07:37:41 guy Exp $ + * $Id: goto_dlg.c,v 1.15 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -54,7 +54,7 @@ static void goto_frame_close_cb(GtkWidget *close_bt, gpointer parent_w); void -goto_frame_cb(GtkWidget *w, gpointer d) +goto_frame_cb(GtkWidget *w _U_, gpointer d _U_) { GtkWidget *goto_frame_w, *main_vb, *fnumber_hb, *fnumber_lb, *fnumber_te, *bbox, *ok_bt, *cancel_bt; @@ -123,7 +123,7 @@ goto_frame_cb(GtkWidget *w, gpointer d) } static void -goto_frame_ok_cb(GtkWidget *ok_bt, gpointer parent_w) +goto_frame_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { GtkWidget *fnumber_te; gchar *fnumber_text; @@ -162,7 +162,7 @@ goto_frame_ok_cb(GtkWidget *ok_bt, gpointer parent_w) } static void -goto_frame_close_cb(GtkWidget *close_bt, gpointer parent_w) +goto_frame_close_cb(GtkWidget *close_bt _U_, gpointer parent_w) { gtk_grab_remove(GTK_WIDGET(parent_w)); gtk_widget_destroy(GTK_WIDGET(parent_w)); diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 423d1b85d8..c3c76a7dea 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2139,9 +2139,9 @@ column_button_clicked (GtkWidget *widget, } static gint -column_title_passive_func (GtkWidget *widget, +column_title_passive_func (GtkWidget *widget _U_, GdkEvent *event, - gpointer data) + gpointer data _U_) { g_return_val_if_fail (event != NULL, FALSE); @@ -3509,7 +3509,7 @@ gtk_clist_undo_selection (GtkCList *clist) static GList * selection_find (GtkCList *clist, gint row_number, - GList *row_list_element) + GList *row_list_element _U_) { return g_list_find (clist->selection, GINT_TO_POINTER (row_number)); } @@ -3700,8 +3700,8 @@ real_select_row (GtkCList *clist, static void real_unselect_row (GtkCList *clist, gint row, - gint column, - GdkEvent *event) + gint column _U_, + GdkEvent *event _U_) { GtkCListRow *clist_row; @@ -7566,7 +7566,7 @@ gtk_clist_drag_end (GtkWidget *widget, static void gtk_clist_drag_leave (GtkWidget *widget, GdkDragContext *context, - guint time) + guint time _U_) { GtkCList *clist; GtkCListDestInfo *dest_info; @@ -7703,9 +7703,9 @@ gtk_clist_drag_motion (GtkWidget *widget, static gboolean gtk_clist_drag_drop (GtkWidget *widget, GdkDragContext *context, - gint x, - gint y, - guint time) + gint x _U_, + gint y _U_, + guint time _U_) { g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE); @@ -7734,8 +7734,8 @@ gtk_clist_drag_data_received (GtkWidget *widget, gint x, gint y, GtkSelectionData *selection_data, - guint info, - guint time) + guint info _U_, + guint time _U_) { GtkCList *clist; @@ -7778,8 +7778,8 @@ static void gtk_clist_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, - guint info, - guint time) + guint info _U_, + guint time _U_) { g_return_if_fail (widget != NULL); g_return_if_fail (GTK_IS_CLIST (widget)); @@ -7812,7 +7812,7 @@ gtk_clist_drag_data_get (GtkWidget *widget, static void draw_drag_highlight (GtkCList *clist, - GtkCListRow *dest_row, + GtkCListRow *dest_row _U_, gint dest_row_number, GtkCListDragPos drag_pos) { diff --git a/gtk/gui_prefs.c b/gtk/gui_prefs.c index 875161a856..58fe1d15ce 100644 --- a/gtk/gui_prefs.c +++ b/gtk/gui_prefs.c @@ -1,7 +1,7 @@ /* gui_prefs.c * Dialog box for GUI preferences * - * $Id: gui_prefs.c,v 1.33 2002/01/20 20:05:18 guy Exp $ + * $Id: gui_prefs.c,v 1.34 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -226,7 +226,7 @@ gui_prefs_show(void) /* Create a font dialog for browsing. */ static void -font_browse_cb(GtkWidget *w, gpointer data) +font_browse_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *caller = gtk_widget_get_toplevel(w); GtkWidget *font_browse_w; @@ -305,7 +305,7 @@ font_browse_cb(GtkWidget *w, gpointer data) } static void -font_browse_ok_cb(GtkWidget *w, GtkFontSelectionDialog *fs) +font_browse_ok_cb(GtkWidget *w _U_, GtkFontSelectionDialog *fs) { gchar *font_name, *bold_font_name; GdkFont *new_r_font, *new_b_font; @@ -360,7 +360,7 @@ font_browse_ok_cb(GtkWidget *w, GtkFontSelectionDialog *fs) } static void -font_browse_destroy(GtkWidget *win, gpointer data) +font_browse_destroy(GtkWidget *win, gpointer data _U_) { GtkWidget *caller; @@ -425,7 +425,7 @@ gui_prefs_fetch(GtkWidget *w) } void -gui_prefs_apply(GtkWidget *w) +gui_prefs_apply(GtkWidget *w _U_) { GdkFont *new_r_font, *new_b_font; char *bold_font_name; @@ -528,7 +528,7 @@ static color_info_t color_info[MAX_HANDLED_COL] = { static GdkColor *curcolor = NULL; static void -color_browse_cb(GtkWidget *w, gpointer data) +color_browse_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *main_vb, *main_tb, *label, *optmenu, *menu, *menuitem; @@ -651,7 +651,7 @@ color_browse_cb(GtkWidget *w, gpointer data) } static void -update_text_color(GtkWidget *w, gpointer data) { +update_text_color(GtkWidget *w, gpointer data _U_) { GtkText *sample = gtk_object_get_data(GTK_OBJECT(w), COLOR_SAMPLE_PTR_KEY); gdouble scolor[4]; @@ -689,7 +689,7 @@ update_current_color(GtkWidget *w, gpointer data) } static void -color_ok_cb(GtkWidget *w, gpointer data) +color_ok_cb(GtkWidget *w _U_, gpointer data) { /* We assume the user actually changed a color here. */ colors_changed = TRUE; @@ -699,7 +699,7 @@ color_ok_cb(GtkWidget *w, gpointer data) } static void -color_cancel_cb(GtkWidget *w, gpointer data) +color_cancel_cb(GtkWidget *w _U_, gpointer data) { /* Revert the colors to the current preference settings. */ color_t_to_gdkcolor(&color_info[MFG_IDX].color, &prefs.gui_marked_fg); @@ -713,14 +713,14 @@ color_cancel_cb(GtkWidget *w, gpointer data) a higher-level handler that says "OK, we've been asked to delete this, so destroy it"? */ static gboolean -color_delete_cb(GtkWidget *prefs_w, gpointer dummy) +color_delete_cb(GtkWidget *prefs_w _U_, gpointer dummy _U_) { color_cancel_cb(NULL, NULL); return FALSE; } static void -color_destroy_cb(GtkWidget *w, gpointer data) +color_destroy_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *caller = gtk_object_get_data(GTK_OBJECT(w), COLOR_CALLER_PTR_KEY); diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index 2f4087d1cb..9a2e6a7a53 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -1,6 +1,6 @@ /* help_dlg.c * - * $Id: help_dlg.c,v 1.21 2002/01/21 07:37:41 guy Exp $ + * $Id: help_dlg.c,v 1.22 2002/03/05 11:55:59 guy Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -73,7 +73,7 @@ static GtkWidget *help_w = NULL; */ GtkWidget *overview_text, *proto_text, *dfilter_text, *cfilter_text; -void help_cb(GtkWidget *w, gpointer data) +void help_cb(GtkWidget *w _U_, gpointer data _U_) { GtkWidget *main_vb, *bbox, *help_nb, *close_bt, *label, *txt_scrollw, @@ -239,12 +239,12 @@ void help_cb(GtkWidget *w, gpointer data) } /* help_cb */ -static void help_close_cb(GtkWidget *w, gpointer data) +static void help_close_cb(GtkWidget *w _U_, gpointer data) { gtk_widget_destroy(GTK_WIDGET(data)); } -static void help_destroy_cb(GtkWidget *w, gpointer data) +static void help_destroy_cb(GtkWidget *w _U_, gpointer data _U_) { /* Note that we no longer have a Help window. */ help_w = NULL; diff --git a/gtk/main.c b/gtk/main.c index 5438bc662b..2f344cbcb4 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.238 2002/03/05 05:58:35 guy Exp $ + * $Id: main.c,v 1.239 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -193,7 +193,7 @@ static void create_main_window(gint, gint, gint, e_prefs*); /* About Ethereal window */ void -about_ethereal( GtkWidget *w, gpointer data ) { +about_ethereal( GtkWidget *w _U_, gpointer data _U_ ) { simple_dialog(ESD_TYPE_INFO, NULL, "Ethereal - Network Protocol Analyzer\n" "Version " VERSION " (C) 1998-2000 Gerald Combs <gerald@ethereal.com>\n" @@ -434,7 +434,7 @@ get_text_from_packet_list(gpointer data) } void -match_selected_cb_replace2(GtkWidget *w, gpointer data) +match_selected_cb_replace2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW, @@ -442,7 +442,7 @@ match_selected_cb_replace2(GtkWidget *w, gpointer data) } void -match_selected_cb_and2(GtkWidget *w, gpointer data) +match_selected_cb_and2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW, @@ -450,7 +450,7 @@ match_selected_cb_and2(GtkWidget *w, gpointer data) } void -match_selected_cb_or2(GtkWidget *w, gpointer data) +match_selected_cb_or2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW, @@ -458,7 +458,7 @@ match_selected_cb_or2(GtkWidget *w, gpointer data) } void -match_selected_cb_not2(GtkWidget *w, gpointer data) +match_selected_cb_not2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW, @@ -466,7 +466,7 @@ match_selected_cb_not2(GtkWidget *w, gpointer data) } void -match_selected_cb_and_not2(GtkWidget *w, gpointer data) +match_selected_cb_and_not2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW, @@ -474,7 +474,7 @@ match_selected_cb_and_not2(GtkWidget *w, gpointer data) } void -match_selected_cb_or_not2(GtkWidget *w, gpointer data) +match_selected_cb_or_not2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW, @@ -482,7 +482,7 @@ match_selected_cb_or_not2(GtkWidget *w, gpointer data) } void -prepare_selected_cb_replace2(GtkWidget *w, gpointer data) +prepare_selected_cb_replace2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_REPLACE, @@ -490,7 +490,7 @@ prepare_selected_cb_replace2(GtkWidget *w, gpointer data) } void -prepare_selected_cb_and2(GtkWidget *w, gpointer data) +prepare_selected_cb_and2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_AND, @@ -498,7 +498,7 @@ prepare_selected_cb_and2(GtkWidget *w, gpointer data) } void -prepare_selected_cb_or2(GtkWidget *w, gpointer data) +prepare_selected_cb_or2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_OR, @@ -506,7 +506,7 @@ prepare_selected_cb_or2(GtkWidget *w, gpointer data) } void -prepare_selected_cb_not2(GtkWidget *w, gpointer data) +prepare_selected_cb_not2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_NOT, @@ -514,7 +514,7 @@ prepare_selected_cb_not2(GtkWidget *w, gpointer data) } void -prepare_selected_cb_and_not2(GtkWidget *w, gpointer data) +prepare_selected_cb_and_not2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_AND_NOT, @@ -522,7 +522,7 @@ prepare_selected_cb_and_not2(GtkWidget *w, gpointer data) } void -prepare_selected_cb_or_not2(GtkWidget *w, gpointer data) +prepare_selected_cb_or_not2(GtkWidget *w _U_, gpointer data) { match_selected_cb_do(data, MATCH_SELECTED_OR_NOT, @@ -569,7 +569,7 @@ filter_activate_cb(GtkWidget *w, gpointer data) /* redisplay with no display filter */ static void -filter_reset_cb(GtkWidget *w, gpointer data) +filter_reset_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *filter_te = NULL; @@ -679,7 +679,7 @@ set_frame_mark(gboolean set, frame_data *frame, gint row) { } static void -packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data) { +packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data _U_) { GdkEventButton *event_button = (GdkEventButton *)event; gint row, column; @@ -695,7 +695,7 @@ packet_list_button_pressed_cb(GtkWidget *w, GdkEvent *event, gpointer data) { } } -void mark_frame_cb(GtkWidget *w, gpointer data) { +void mark_frame_cb(GtkWidget *w _U_, gpointer data _U_) { if (cfile.current_frame) { /* XXX hum, should better have a "cfile->current_row" here ... */ set_frame_mark(!cfile.current_frame->flags.marked, @@ -726,17 +726,17 @@ void update_marked_frames(void) { } } -void mark_all_frames_cb(GtkWidget *w, gpointer data) { +void mark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_) { mark_all_frames(TRUE); } -void unmark_all_frames_cb(GtkWidget *w, gpointer data) { +void unmark_all_frames_cb(GtkWidget *w _U_, gpointer data _U_) { mark_all_frames(FALSE); } /* What to do when a list item is selected/unselected */ static void -packet_list_select_cb(GtkWidget *w, gint row, gint col, gpointer evt) { +packet_list_select_cb(GtkWidget *w _U_, gint row, gint col _U_, gpointer evt _U_) { /* Remove the hex display tabbed pages */ while( (gtk_notebook_get_nth_page( GTK_NOTEBOOK(byte_nb_ptr), 0))) @@ -747,14 +747,14 @@ packet_list_select_cb(GtkWidget *w, gint row, gint col, gpointer evt) { static void -packet_list_unselect_cb(GtkWidget *w, gint row, gint col, gpointer evt) { +packet_list_unselect_cb(GtkWidget *w _U_, gint row _U_, gint col _U_, gpointer evt _U_) { unselect_packet(&cfile); } static void -tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column, gpointer user_data) +tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, gpointer user_data _U_) { field_info *finfo; gchar *help_str = NULL; @@ -823,7 +823,7 @@ tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column, gpointer user } static void -tree_view_unselect_row_cb(GtkCTree *ctree, GList *node, gint column, gpointer user_data) +tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column _U_, gpointer user_data _U_) { GtkWidget *byte_view; const guint8 *data; @@ -846,17 +846,17 @@ tree_view_unselect_row_cb(GtkCTree *ctree, GList *node, gint column, gpointer us NULL, len); } -void collapse_all_cb(GtkWidget *widget, gpointer data) { +void collapse_all_cb(GtkWidget *widget _U_, gpointer data _U_) { if (cfile.edt->tree) collapse_all_tree(cfile.edt->tree, tree_view); } -void expand_all_cb(GtkWidget *widget, gpointer data) { +void expand_all_cb(GtkWidget *widget _U_, gpointer data _U_) { if (cfile.edt->tree) expand_all_tree(cfile.edt->tree, tree_view); } -void resolve_name_cb(GtkWidget *widget, gpointer data) { +void resolve_name_cb(GtkWidget *widget _U_, gpointer data _U_) { if (cfile.edt->tree) { guint32 tmp = g_resolv_flags; g_resolv_flags = RESOLV_ALL; @@ -1037,7 +1037,7 @@ do_quit(void) } static gboolean -main_window_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) +main_window_delete_event_cb(GtkWidget *widget _U_, GdkEvent *event _U_, gpointer data _U_) { gint desk_x, desk_y; @@ -1059,7 +1059,7 @@ main_window_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) } void -file_quit_cmd_cb (GtkWidget *widget, gpointer data) +file_quit_cmd_cb (GtkWidget *widget _U_, gpointer data _U_) { do_quit(); } diff --git a/gtk/nameres_prefs.c b/gtk/nameres_prefs.c index 6ae9ea49af..da8d1f2d64 100644 --- a/gtk/nameres_prefs.c +++ b/gtk/nameres_prefs.c @@ -1,7 +1,7 @@ /* nameres_prefs.c * Dialog box for name resolution preferences * - * $Id: nameres_prefs.c,v 1.3 2002/01/21 07:37:41 guy Exp $ + * $Id: nameres_prefs.c,v 1.4 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -114,7 +114,7 @@ nameres_prefs_fetch(GtkWidget *w) } void -nameres_prefs_apply(GtkWidget *w) +nameres_prefs_apply(GtkWidget *w _U_) { /* * XXX - force a regeneration of the protocol list if this has @@ -124,6 +124,6 @@ nameres_prefs_apply(GtkWidget *w) } void -nameres_prefs_destroy(GtkWidget *w) +nameres_prefs_destroy(GtkWidget *w _U_) { } diff --git a/gtk/packet_win.c b/gtk/packet_win.c index 25a44e1293..8e6128d0a7 100644 --- a/gtk/packet_win.c +++ b/gtk/packet_win.c @@ -3,7 +3,7 @@ * * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet_win.c,v 1.33 2002/02/18 01:08:44 guy Exp $ + * $Id: packet_win.c,v 1.34 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -90,7 +90,7 @@ static void new_tree_view_unselect_row_cb( GtkCTree *ctree, GList *node, static void create_new_window( char *Title, gint tv_size, gint bv_size); static void destroy_new_window(GtkObject *object, gpointer user_data); -void new_window_cb(GtkWidget *w){ +void new_window_cb(GtkWidget *w _U_){ #define NewWinTitleLen 1000 @@ -193,7 +193,7 @@ create_new_window(char *Title, gint tv_size, gint bv_size) } static void -destroy_new_window(GtkObject *object, gpointer user_data) +destroy_new_window(GtkObject *object _U_, gpointer user_data) { struct PacketWinData *DataPtr = user_data; @@ -206,7 +206,7 @@ destroy_new_window(GtkObject *object, gpointer user_data) /* called when a tree row is selected in the popup packet window */ static void -new_tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column, +new_tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column _U_, gpointer user_data) { field_info *finfo; @@ -239,7 +239,7 @@ new_tree_view_select_row_cb(GtkCTree *ctree, GList *node, gint column, /* called when a tree row is unselected in the popup packet window */ static void -new_tree_view_unselect_row_cb(GtkCTree *ctree, GList *node, gint column, +new_tree_view_unselect_row_cb(GtkCTree *ctree _U_, GList *node _U_, gint column _U_, gpointer user_data) { GtkWidget* byte_view; @@ -279,7 +279,7 @@ destroy_packet_wins(void) } static void -redraw_hex_dump_cb(gpointer data, gpointer user_data) +redraw_hex_dump_cb(gpointer data, gpointer user_data _U_) { struct PacketWinData *DataPtr = (struct PacketWinData *)data; diff --git a/gtk/plugins_dlg.c b/gtk/plugins_dlg.c index 41d861dd29..ad5e58c05e 100644 --- a/gtk/plugins_dlg.c +++ b/gtk/plugins_dlg.c @@ -1,7 +1,7 @@ /* plugins_dlg.c * Dialog boxes for plugins * - * $Id: plugins_dlg.c,v 1.23 2002/01/21 07:37:42 guy Exp $ + * $Id: plugins_dlg.c,v 1.24 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -46,7 +46,7 @@ static void plugins_close_cb(GtkWidget *, gpointer); static void plugins_scan(GtkWidget *); void -tools_plugins_cmd_cb(GtkWidget *widget, gpointer data) +tools_plugins_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { GtkWidget *plugins_window; GtkWidget *main_vbox; @@ -134,7 +134,7 @@ plugins_scan(GtkWidget *clist) } static void -plugins_close_cb(GtkWidget *close_bt, gpointer parent_w) +plugins_close_cb(GtkWidget *close_bt _U_, gpointer parent_w) { gtk_grab_remove(GTK_WIDGET(parent_w)); gtk_widget_destroy(GTK_WIDGET(parent_w)); diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index 20b121437f..0e43b35a81 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -1,7 +1,7 @@ /* prefs_dlg.c * Routines for handling preferences * - * $Id: prefs_dlg.c,v 1.42 2002/02/14 10:58:49 gram Exp $ + * $Id: prefs_dlg.c,v 1.43 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -239,7 +239,7 @@ module_prefs_show(module_t *module, gpointer user_data) } void -prefs_cb(GtkWidget *w, gpointer dummy) +prefs_cb(GtkWidget *w _U_, gpointer dummy _U_) { GtkWidget *main_vb, *top_hb, *bbox, *prefs_nb, *ct_sb, *frame, *ok_bt, *apply_bt, *save_bt, *cancel_bt; @@ -761,7 +761,7 @@ module_prefs_fetch(module_t *module, gpointer user_data) } static void -pref_clean(pref_t *pref, gpointer user_data) +pref_clean(pref_t *pref, gpointer user_data _U_) { switch (pref->type) { @@ -788,7 +788,7 @@ pref_clean(pref_t *pref, gpointer user_data) } static void -module_prefs_clean(module_t *module, gpointer user_data) +module_prefs_clean(module_t *module, gpointer user_data _U_) { /* For all preferences in this module, clean up any cruft allocated for use by the GUI code. */ @@ -796,7 +796,7 @@ module_prefs_clean(module_t *module, gpointer user_data) } static void -prefs_main_ok_cb(GtkWidget *ok_bt, gpointer parent_w) +prefs_main_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { gboolean must_redissect = FALSE; @@ -830,7 +830,7 @@ prefs_main_ok_cb(GtkWidget *ok_bt, gpointer parent_w) } static void -prefs_main_apply_cb(GtkWidget *apply_bt, gpointer parent_w) +prefs_main_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w) { gboolean must_redissect = FALSE; @@ -861,7 +861,7 @@ prefs_main_apply_cb(GtkWidget *apply_bt, gpointer parent_w) } static void -prefs_main_save_cb(GtkWidget *save_bt, gpointer parent_w) +prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w) { gboolean must_redissect = FALSE; int err; @@ -990,7 +990,7 @@ module_prefs_revert(module_t *module, gpointer user_data) } static void -prefs_main_cancel_cb(GtkWidget *cancel_bt, gpointer parent_w) +prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) { gboolean must_redissect = FALSE; @@ -1023,14 +1023,14 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt, gpointer parent_w) a higher-level handler that says "OK, we've been asked to delete this, so destroy it"? */ static gboolean -prefs_main_delete_cb(GtkWidget *prefs_w, gpointer dummy) +prefs_main_delete_cb(GtkWidget *prefs_w, gpointer dummy _U_) { prefs_main_cancel_cb(NULL, prefs_w); return FALSE; } static void -prefs_main_destroy_cb(GtkWidget *win, gpointer user_data) +prefs_main_destroy_cb(GtkWidget *win _U_, gpointer user_data _U_) { /* Let the preference tabs clean up anything they've done. */ printer_prefs_destroy(gtk_object_get_data(GTK_OBJECT(prefs_w), E_PRINT_PAGE_KEY)); @@ -1108,7 +1108,7 @@ properties_cb(GtkWidget *w, gpointer dummy) /* Prefs tree selection callback. The node data has been loaded with the proper notebook page to load. */ static void -prefs_tree_select_cb(GtkCTree *ct, GtkCTreeNode *node, gint col, gpointer dummy) +prefs_tree_select_cb(GtkCTree *ct, GtkCTreeNode *node, gint col _U_, gpointer dummy _U_) { gint page = GPOINTER_TO_INT(gtk_ctree_node_get_row_data(ct, node)); diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index 6cdd14211a..632069124e 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -1,7 +1,7 @@ /* print_dlg.c * Dialog boxes for printing * - * $Id: print_dlg.c,v 1.29 2002/01/21 07:37:42 guy Exp $ + * $Id: print_dlg.c,v 1.30 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -93,7 +93,7 @@ static GtkWidget *print_w; /* Print the capture */ void -file_print_cmd_cb(GtkWidget *widget, gpointer data) +file_print_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { GtkAccelGroup *accel_group; GtkWidget *main_vb, *main_tb, *button; @@ -369,7 +369,7 @@ file_print_cmd_cb(GtkWidget *widget, gpointer data) #ifndef _WIN32 static void -print_cmd_toggle_dest(GtkWidget *widget, gpointer data) +print_cmd_toggle_dest(GtkWidget *widget, gpointer data _U_) { GtkWidget *cmd_lb, *cmd_te, *file_bt, *file_te; int to_file; @@ -397,7 +397,7 @@ print_cmd_toggle_dest(GtkWidget *widget, gpointer data) #endif static void -print_cmd_toggle_detail(GtkWidget *widget, gpointer data) +print_cmd_toggle_detail(GtkWidget *widget, gpointer data _U_) { GtkWidget *expand_all_rb, *as_displayed_rb, *hex_cb; gboolean print_detail; @@ -466,7 +466,7 @@ print_file_cb(GtkWidget *file_bt, gpointer file_te) } static void -print_fs_ok_cb(GtkWidget *w, gpointer data) +print_fs_ok_cb(GtkWidget *w _U_, gpointer data) { gtk_entry_set_text(GTK_ENTRY(gtk_object_get_data(GTK_OBJECT(data), @@ -476,13 +476,13 @@ print_fs_ok_cb(GtkWidget *w, gpointer data) } static void -print_fs_cancel_cb(GtkWidget *w, gpointer data) +print_fs_cancel_cb(GtkWidget *w _U_, gpointer data) { gtk_widget_destroy(GTK_WIDGET(data)); } static void -print_fs_destroy_cb(GtkWidget *win, gpointer data) +print_fs_destroy_cb(GtkWidget *win, gpointer data _U_) { GtkWidget *caller; @@ -561,14 +561,14 @@ print_ok_cb(GtkWidget *ok_bt, gpointer parent_w) } static void -print_close_cb(GtkWidget *close_bt, gpointer parent_w) +print_close_cb(GtkWidget *close_bt _U_, gpointer parent_w) { gtk_grab_remove(GTK_WIDGET(parent_w)); gtk_widget_destroy(GTK_WIDGET(parent_w)); } static void -print_destroy_cb(GtkWidget *win, gpointer user_data) +print_destroy_cb(GtkWidget *win, gpointer user_data _U_) { GtkWidget *fs; @@ -587,7 +587,7 @@ print_destroy_cb(GtkWidget *win, gpointer user_data) /* Print a packet */ void -file_print_packet_cmd_cb(GtkWidget *widget, gpointer data) { +file_print_packet_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { FILE *fh; print_args_t print_args; diff --git a/gtk/print_prefs.c b/gtk/print_prefs.c index aafb2c9f78..c37f6c73f2 100644 --- a/gtk/print_prefs.c +++ b/gtk/print_prefs.c @@ -1,7 +1,7 @@ /* print_prefs.c * Dialog boxes for preferences for printing * - * $Id: print_prefs.c,v 1.11 2002/01/20 20:05:18 guy Exp $ + * $Id: print_prefs.c,v 1.12 2002/03/05 11:55:59 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -170,13 +170,13 @@ printer_opts_fs_ok_cb(GtkWidget *w, gpointer data) { } static void -printer_opts_fs_cancel_cb(GtkWidget *w, gpointer data) { +printer_opts_fs_cancel_cb(GtkWidget *w _U_, gpointer data) { gtk_widget_destroy(GTK_WIDGET(data)); } static void -printer_opts_fs_destroy_cb(GtkWidget *win, gpointer data) +printer_opts_fs_destroy_cb(GtkWidget *win, gpointer data _U_) { GtkWidget *caller; @@ -218,7 +218,7 @@ printer_prefs_fetch(GtkWidget *w) } void -printer_prefs_apply(GtkWidget *w) +printer_prefs_apply(GtkWidget *w _U_) { } diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index 6df6b72a46..08583709ea 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -1,7 +1,7 @@ /* progress_dlg.c * Routines for progress-bar (modal) dialog * - * $Id: progress_dlg.c,v 1.9 2001/03/24 02:07:22 guy Exp $ + * $Id: progress_dlg.c,v 1.10 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -145,7 +145,7 @@ create_progress_dlg(const gchar *title, const gchar *stop_title, * "stop" flag is TRUE and abort the operation. */ static gint -delete_event_cb(GtkWidget *w, GdkEvent *event, gpointer data) +delete_event_cb(GtkWidget *w _U_, GdkEvent *event _U_, gpointer data) { gboolean *stop_flag = (gboolean *) data; @@ -160,7 +160,7 @@ delete_event_cb(GtkWidget *w, GdkEvent *event, gpointer data) * true and abort the operation. */ static void -stop_cb(GtkWidget *w, gpointer data) +stop_cb(GtkWidget *w _U_, gpointer data) { gboolean *stop_flag = (gboolean *) data; diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index 4a137a78a9..e739369e07 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -1,6 +1,6 @@ /* proto_dlg.c * - * $Id: proto_dlg.c,v 1.9 2002/01/11 07:40:31 guy Exp $ + * $Id: proto_dlg.c,v 1.10 2002/03/05 11:56:00 guy Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -70,7 +70,7 @@ typedef struct protocol_data { gboolean was_enabled; } protocol_data_t; -void proto_cb(GtkWidget *w, gpointer data) +void proto_cb(GtkWidget *w _U_, gpointer data _U_) { GtkWidget *main_vb, *bbox, *proto_nb, *apply_bt, *cancel_bt, *ok_bt, @@ -199,7 +199,7 @@ void proto_cb(GtkWidget *w, gpointer data) /* Toggle All */ static void -toggle_all_cb(GtkWidget *button, gpointer parent_w) +toggle_all_cb(GtkWidget *button _U_, gpointer parent_w) { GSList *entry; @@ -247,7 +247,7 @@ disable_all_cb(GtkWidget *button, gpointer parent_w) set_active_all(button, parent_w, FALSE); } -static void proto_destroy_cb(GtkWidget *w, gpointer data) +static void proto_destroy_cb(GtkWidget *w _U_, gpointer data _U_) { GSList *entry; @@ -269,13 +269,13 @@ static void proto_destroy_cb(GtkWidget *w, gpointer data) XXX - that'll destroy the Protocols dialog; will that upset a higher-level handler that says "OK, we've been asked to delete this, so destroy it"? */ -static gboolean proto_delete_cb(GtkWidget *proto_w, gpointer dummy) +static gboolean proto_delete_cb(GtkWidget *proto_w, gpointer dummy _U_) { proto_cancel_cb(NULL, proto_w); return FALSE; } -static void proto_ok_cb(GtkWidget *ok_bt, gpointer parent_w) +static void proto_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { gboolean redissect; @@ -285,13 +285,13 @@ static void proto_ok_cb(GtkWidget *ok_bt, gpointer parent_w) redissect_packets(&cfile); } -static void proto_apply_cb(GtkWidget *apply_bt, gpointer parent_w) +static void proto_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w) { if (set_proto_selection(GTK_WIDGET(parent_w))) redissect_packets(&cfile); } -static void proto_cancel_cb(GtkWidget *cancel_bt, gpointer parent_w) +static void proto_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) { gboolean redissect; diff --git a/gtk/proto_draw.c b/gtk/proto_draw.c index d737e5bfed..d74a6c8722 100644 --- a/gtk/proto_draw.c +++ b/gtk/proto_draw.c @@ -1,7 +1,7 @@ /* proto_draw.c * Routines for GTK+ packet display * - * $Id: proto_draw.c,v 1.46 2002/02/18 01:08:44 guy Exp $ + * $Id: proto_draw.c,v 1.47 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -159,7 +159,7 @@ redraw_hex_dump_all(void) } static void -expand_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data) +expand_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data _U_) { field_info *finfo; gboolean *val; @@ -172,7 +172,7 @@ expand_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data) } static void -collapse_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data) +collapse_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data _U_) { field_info *finfo; gboolean *val; @@ -185,7 +185,7 @@ collapse_tree(GtkCTree *ctree, GtkCTreeNode *node, gpointer user_data) } static void -toggle_tree(GtkCTree *ctree, GdkEventKey *event, gpointer user_data) +toggle_tree(GtkCTree *ctree, GdkEventKey *event, gpointer user_data _U_) { if (event->keyval != GDK_Return) return; @@ -364,7 +364,7 @@ create_byte_view(gint bv_size, GtkWidget *pane, int pos) } static void -byte_view_realize_cb(GtkWidget *bv, gpointer data) +byte_view_realize_cb(GtkWidget *bv, gpointer data _U_) { const guint8 *byte_data; guint byte_len; @@ -742,7 +742,7 @@ remember_ptree_widget(GtkWidget *ptreew) /* Remove a protocol tree widget from the list of protocol tree widgets. */ static void -forget_ptree_widget(GtkWidget *ptreew, gpointer data) +forget_ptree_widget(GtkWidget *ptreew, gpointer data _U_) { ptree_widgets = g_list_remove(ptree_widgets, ptreew); } diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c index c3133b8fcc..e9e53be1d5 100644 --- a/gtk/proto_hier_stats_dlg.c +++ b/gtk/proto_hier_stats_dlg.c @@ -1,6 +1,6 @@ /* proto_hier_stats_dlg.c * - * $Id: proto_hier_stats_dlg.c,v 1.8 2002/01/11 06:43:18 guy Exp $ + * $Id: proto_hier_stats_dlg.c,v 1.9 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -169,7 +169,7 @@ create_tree(GtkWidget *container, ph_stats_t *ps) #define WNAME "Protocol Hierarchy Statistics" void -proto_hier_stats_cb(GtkWidget *w, gpointer d) +proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_) { ph_stats_t *ps; GtkWidget *dlg, *bt, *vbox, *frame, *bbox; diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index d4f5608092..8bda7f5a04 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -1,7 +1,7 @@ /* simple_dialog.c * Simple message dialog box routines. * - * $Id: simple_dialog.c,v 1.8 2001/12/12 21:38:59 gerald Exp $ + * $Id: simple_dialog.c,v 1.9 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -168,7 +168,7 @@ simple_dialog(gint type, gint *btn_mask, gchar *msg_format, ...) { } static void -simple_dialog_cancel_cb(GtkWidget *w, gpointer win) { +simple_dialog_cancel_cb(GtkWidget *w _U_, gpointer win) { gint *btn_mask = (gint *) gtk_object_get_data(win, bm_key); if (btn_mask) diff --git a/gtk/stream_prefs.c b/gtk/stream_prefs.c index 6d336833fe..d926c104a0 100644 --- a/gtk/stream_prefs.c +++ b/gtk/stream_prefs.c @@ -1,7 +1,7 @@ /* stream_prefs.c * Dialog boxes for preferences for the stream window * - * $Id: stream_prefs.c,v 1.10 2002/01/11 07:40:32 guy Exp $ + * $Id: stream_prefs.c,v 1.11 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -138,7 +138,7 @@ stream_prefs_show() } static void -update_text_color(GtkWidget *w, gpointer data) { +update_text_color(GtkWidget *w, gpointer data _U_) { GtkText *sample = gtk_object_get_data(GTK_OBJECT(w), STREAM_SAMPLE_KEY); gdouble scolor[4]; @@ -176,7 +176,7 @@ update_current_color(GtkWidget *w, gpointer data) } void -stream_prefs_fetch(GtkWidget *w) +stream_prefs_fetch(GtkWidget *w _U_) { gdkcolor_to_color_t(&prefs.st_client_fg, &tcolors[CFG_IDX]); gdkcolor_to_color_t(&prefs.st_client_bg, &tcolors[CBG_IDX]); @@ -189,11 +189,11 @@ stream_prefs_fetch(GtkWidget *w) that calling "stream_prefs_apply()" without calling "gui_prefs_apply()" won't work. */ void -stream_prefs_apply(GtkWidget *w) +stream_prefs_apply(GtkWidget *w _U_) { } void -stream_prefs_destroy(GtkWidget *w) +stream_prefs_destroy(GtkWidget *w _U_) { } diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index 58dc208f00..1913c29230 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -1,7 +1,7 @@ /* summary_dlg.c * Routines for capture file summary window * - * $Id: summary_dlg.c,v 1.11 2002/02/08 10:07:38 guy Exp $ + * $Id: summary_dlg.c,v 1.12 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -58,7 +58,7 @@ add_string_to_box(gchar *str, GtkWidget *box) void -summary_open_cb(GtkWidget *w, gpointer d) +summary_open_cb(GtkWidget *w _U_, gpointer d _U_) { summary_tally summary; GtkWidget *sum_open_w, diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c index 01077add8e..a390fa5036 100644 --- a/gtk/tcp_graph.c +++ b/gtk/tcp_graph.c @@ -3,7 +3,7 @@ * By Pavel Mores <pvl@uh.cz> * Win32 port: rwh@unifiedtech.com * - * $Id: tcp_graph.c,v 1.15 2002/03/05 05:58:35 guy Exp $ + * $Id: tcp_graph.c,v 1.16 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -535,7 +535,7 @@ static char helptext[] = "; #endif -void tcp_graph_cb (GtkWidget *w, gpointer data, guint graph_type) +void tcp_graph_cb (GtkWidget *w _U_, gpointer data _U_, guint graph_type) { struct segment current; struct graph *g; @@ -788,7 +788,7 @@ static void create_drawing_area (struct graph *g) /* puts ("exiting create_drawing_area()"); */ } -static void callback_toplevel_destroy (GtkWidget *widget, gpointer data) +static void callback_toplevel_destroy (GtkWidget *widget _U_, gpointer data) { struct graph *g = (struct graph * )data; @@ -947,7 +947,7 @@ static void control_panel_add_graph_type_page (struct graph *g, GtkWidget *n) gtk_notebook_append_page (GTK_NOTEBOOK (n), frame, label); } -static void callback_close (GtkWidget *widget, gpointer data) +static void callback_close (GtkWidget *widget _U_, gpointer data) { struct graph *g = (struct graph * )data; @@ -957,7 +957,7 @@ static void callback_close (GtkWidget *widget, gpointer data) } } -static void callback_create_help (GtkWidget *widget, gpointer data) +static void callback_create_help (GtkWidget *widget _U_, gpointer data) { struct graph *g = (struct graph * )data; GtkWidget *toplevel, *box, *text, *scroll, *close; @@ -988,17 +988,17 @@ static void callback_create_help (GtkWidget *widget, gpointer data) gtk_widget_show_all (toplevel); } -static void callback_close_help (GtkWidget *widget, gpointer data) +static void callback_close_help (GtkWidget *widget _U_, gpointer data) { gtk_widget_destroy ((GtkWidget * )data); } -static void callback_time_origin (GtkWidget *toggle, gpointer data) +static void callback_time_origin (GtkWidget *toggle _U_, gpointer data) { toggle_time_origin ((struct graph * )data); } -static void callback_seq_origin (GtkWidget *toggle, gpointer data) +static void callback_seq_origin (GtkWidget *toggle _U_, gpointer data) { toggle_seq_origin ((struct graph * )data); } @@ -1583,7 +1583,7 @@ static void callback_graph_type (GtkWidget *toggle, gpointer data) graph_init_sequence (g); } -static void callback_graph_init_on_typechg (GtkWidget *toggle, gpointer data) +static void callback_graph_init_on_typechg (GtkWidget *toggle _U_, gpointer data) { ((struct graph * )data)->flags ^= GRAPH_INIT_ON_TYPE_CHANGE; } @@ -3012,7 +3012,7 @@ static gint key_release_event (GtkWidget *widget, GdkEventKey *event) return TRUE; } -static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) +static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_) { struct graph *g; @@ -3026,7 +3026,7 @@ static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event) return TRUE; } -static gint enter_notify_event (GtkWidget *widget, GdkEventCrossing *event) +static gint enter_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_) { struct graph *g; diff --git a/gtk/ui_util.c b/gtk/ui_util.c index 023de01b52..f1e2d86609 100644 --- a/gtk/ui_util.c +++ b/gtk/ui_util.c @@ -1,7 +1,7 @@ /* ui_util.c * UI utility routines * - * $Id: ui_util.c,v 1.8 2002/01/11 07:40:32 guy Exp $ + * $Id: ui_util.c,v 1.9 2002/03/05 11:56:00 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -116,7 +116,7 @@ reactivate_window(GtkWidget *win) part of the installation of Ethereal. */ void -window_icon_realize_cb (GtkWidget *win, gpointer data) +window_icon_realize_cb (GtkWidget *win, gpointer data _U_) { #ifndef WIN32 static GdkPixmap *icon_pmap = NULL; @@ -171,7 +171,7 @@ setup_scrolled_window(GtkWidget *scrollw) /* Remove a GtkScrolledWindow from the list of GtkScrolledWindows. */ static void -forget_scrolled_window(GtkWidget *scrollw, gpointer data) +forget_scrolled_window(GtkWidget *scrollw, gpointer data _U_) { scrolled_windows = g_list_remove(scrolled_windows, scrollw); } @@ -191,7 +191,7 @@ set_scrollbar_placement_scrollw(GtkWidget *scrollw) } static void -set_scrollbar_placement_cb(gpointer data, gpointer user_data) +set_scrollbar_placement_cb(gpointer data, gpointer user_data _U_) { set_scrollbar_placement_scrollw((GtkWidget *)data); } @@ -249,7 +249,7 @@ setup_ctree(GtkWidget *ctree) /* Remove a GtkCTree from the list of GtkCTrees. */ static void -forget_ctree(GtkWidget *ctree, gpointer data) +forget_ctree(GtkWidget *ctree, gpointer data _U_) { ctrees = g_list_remove(ctrees, ctree); } @@ -268,7 +268,7 @@ set_ctree_styles(GtkWidget *ctree) } static void -set_ctree_styles_cb(gpointer data, gpointer user_data) +set_ctree_styles_cb(gpointer data, gpointer user_data _U_) { set_ctree_styles((GtkWidget *)data); } |