Ethereal-dev: Re: [Ethereal-dev] gcc warnings about unused variables
Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.
From: Joerg Mayer <jmayer@xxxxxxxxx>
Date: Sun, 3 Mar 2002 05:49:40 +0100
On Sat, Mar 02, 2002 at 06:36:56PM -0800, Guy Harris wrote:
> On Sun, Mar 03, 2002 at 03:32:22AM +0100, Joerg Mayer wrote:
> > My idea goes a bit differently: After the rest is done, turn on the
> > warnings and wait for 4 weeks so that anyone who wants to properly
> > fix it will have a chance to do so,
>
> OK, although one problem with turning "-Wno-unused" off is that a *lot*
> of warning start coming out, so that legitimate warnings might get lost.
>
> I'm inclined not to turn "-Wno-unused" off until the next release comes
> out (i.e., still have "-Wno-unused" in the top-level configure script in
> the next release).
That's fine with me.
Attached are the automatically generated patches to gtk/*.c and the
script that I used to generate the patches on a per file basis. The
rest was done with bash :)
Ciao
Jörg
--
Joerg Mayer <jmayer@xxxxxxxxx>
I found out that "pro" means "instead of" (as in proconsul). Now I know
what proactive means.
--- capture_dlg.c Wed Feb 27 15:16:23 2002
+++ capture_dlg.c.new-unused Sun Mar 3 05:41:50 2002
@@ -113,7 +113,7 @@
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 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
* 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,
--- capture_prefs.c Sun Jan 20 21:05:18 2002
+++ capture_prefs.c.new-unused Sun Mar 3 05:41:52 2002
@@ -153,12 +153,12 @@
}
void
-capture_prefs_apply(GtkWidget *w)
+capture_prefs_apply(GtkWidget *w _U_)
{
}
void
-capture_prefs_destroy(GtkWidget *w)
+capture_prefs_destroy(GtkWidget *w _U_)
{
}
--- color_dlg.c Mon Jan 21 08:37:41 2002
+++ color_dlg.c.new-unused Sun Mar 3 05:41:56 2002
@@ -92,7 +92,7 @@
#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 @@
/* 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 @@
/* 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 @@
* 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 @@
}
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 @@
/* 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 @@
/* 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 @@
/* 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 @@
/* 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 @@
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 @@
/* 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 @@
/* 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 @@
/* 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;
--- colors.c Mon Jan 21 08:37:41 2002
+++ colors.c.new-unused Sun Mar 3 05:41:59 2002
@@ -98,7 +98,7 @@
/* Create a new filter */
color_filter_t *
-new_color_filter(colfilter *filters, /* The filter list (unused) */
+new_color_filter(colfilter *filters _U_, /* The filter list (unused) */
gchar *name, /* The name of the filter to create */
gchar *filter_string) /* The string representing the filter */
{
@@ -259,7 +259,7 @@
/* save filters in filter file */
gboolean
-write_filters(colfilter *filter)
+write_filters(colfilter *filter _U_)
{
gchar *pf_dir_path;
const gchar *path;
--- column_prefs.c Fri Jan 11 08:40:31 2002
+++ column_prefs.c.new-unused Sun Mar 3 05:42:02 2002
@@ -225,7 +225,7 @@
/* 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 @@
}
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 @@
}
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 @@
}
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 @@
}
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
--- decode_as_dlg.c Mon Jan 21 08:37:41 2002
+++ decode_as_dlg.c.new-unused Sun Mar 3 05:42:04 2002
@@ -197,7 +197,7 @@
*/
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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* 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 @@
* @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;
--- dfilter_expr_dlg.c Fri Jan 11 07:43:17 2002
+++ dfilter_expr_dlg.c.new-unused Sun Mar 3 05:42:07 2002
@@ -104,8 +104,8 @@
* 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 @@
}
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),
@@ -371,7 +371,7 @@
}
static void
-build_enum_values(GtkWidget *value_list_scrolled_win, GtkWidget *value_list,
+build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
const value_string *values)
{
/*
@@ -425,7 +425,7 @@
*/
static void
display_value_fields(header_field_info *hfinfo, gboolean is_comparison,
- GtkWidget *value_label, GtkWidget *value_entry, GtkWidget *value_list,
+ GtkWidget *value_label, GtkWidget *value_entry, GtkWidget *value_list _U_,
GtkWidget *value_list_scrolled_win, GtkWidget *range_label,
GtkWidget *range_entry)
{
@@ -899,7 +899,7 @@
}
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.
--- display_opts.c Mon Jan 21 08:37:41 2002
+++ display_opts.c.new-unused Sun Mar 3 05:42:09 2002
@@ -92,7 +92,7 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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;
--- dlg_utils.c Wed Dec 12 22:38:58 2001
+++ dlg_utils.c.new-unused Sun Mar 3 05:42:11 2002
@@ -70,7 +70,7 @@
}
static void
-dlg_activate (GtkWidget *widget, gpointer ok_button)
+dlg_activate (GtkWidget *widget _U_, gpointer ok_button)
{
gtk_widget_activate(GTK_WIDGET(ok_button));
}
--- file_dlg.c Mon Jan 21 08:37:41 2002
+++ file_dlg.c.new-unused Sun Mar 3 05:42:14 2002
@@ -72,7 +72,7 @@
/* 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 @@
}
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 @@
/* 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 @@
}
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 @@
}
static void
-toggle_filtered_cb(GtkWidget *widget, gpointer data)
+toggle_filtered_cb(GtkWidget *widget, gpointer data _U_)
{
gboolean new_filtered;
@@ -397,7 +397,7 @@
}
static void
-toggle_marked_cb(GtkWidget *widget, gpointer data)
+toggle_marked_cb(GtkWidget *widget, gpointer data _U_)
{
gboolean new_marked;
@@ -419,7 +419,7 @@
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 @@
}
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 @@
}
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 @@
/* 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;
--- filter_prefs.c Fri Jan 11 08:40:31 2002
+++ filter_prefs.c.new-unused Sun Mar 3 05:42:17 2002
@@ -107,7 +107,7 @@
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 @@
/* 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 @@
/* 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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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);
--- find_dlg.c Mon Jan 21 08:37:41 2002
+++ find_dlg.c.new-unused Sun Mar 3 05:42:19 2002
@@ -67,7 +67,7 @@
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 @@
}
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 @@
}
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;
--- follow_dlg.c Sat Mar 2 23:55:16 2002
+++ follow_dlg.c.new-unused Sun Mar 3 05:42:21 2002
@@ -135,7 +135,7 @@
}
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 @@
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 @@
/* 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 @@
/* 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 @@
}
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 @@
}
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 @@
/* 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 @@
* 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 @@
}
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 @@
* 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 @@
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 @@
}
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;
--- goto_dlg.c Mon Jan 21 08:37:41 2002
+++ goto_dlg.c.new-unused Sun Mar 3 05:42:24 2002
@@ -54,7 +54,7 @@
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 @@
}
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 @@
}
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));
--- gtkclist.c Mon Aug 20 17:23:33 2001
+++ gtkclist.c.new-unused Sun Mar 3 05:42:34 2002
@@ -2139,9 +2139,9 @@
}
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 @@
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 @@
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 @@
static void
gtk_clist_drag_leave (GtkWidget *widget,
GdkDragContext *context,
- guint time)
+ guint time _U_)
{
GtkCList *clist;
GtkCListDestInfo *dest_info;
@@ -7703,9 +7703,9 @@
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 @@
gint x,
gint y,
GtkSelectionData *selection_data,
- guint info,
- guint time)
+ guint info _U_,
+ guint time _U_)
{
GtkCList *clist;
@@ -7778,8 +7778,8 @@
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 @@
static void
draw_drag_highlight (GtkCList *clist,
- GtkCListRow *dest_row,
+ GtkCListRow *dest_row _U_,
gint dest_row_number,
GtkCListDragPos drag_pos)
{
--- gui_prefs.c Sun Jan 20 21:05:18 2002
+++ gui_prefs.c.new-unused Sun Mar 3 05:42:37 2002
@@ -226,7 +226,7 @@
/* 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 @@
}
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 @@
}
static void
-font_browse_destroy(GtkWidget *win, gpointer data)
+font_browse_destroy(GtkWidget *win, gpointer data _U_)
{
GtkWidget *caller;
@@ -425,7 +425,7 @@
}
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 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 @@
}
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 @@
}
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 @@
}
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 @@
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);
--- help_dlg.c Mon Jan 21 08:37:41 2002
+++ help_dlg.c.new-unused Sun Mar 3 05:42:39 2002
@@ -73,7 +73,7 @@
*/
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 @@
} /* 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;
--- main.c Wed Feb 27 15:16:23 2002
+++ main.c.new-unused Sun Mar 3 05:42:43 2002
@@ -193,7 +193,7 @@
/* 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@xxxxxxxxxxxx>\n"
@@ -432,7 +432,7 @@
}
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,
@@ -440,7 +440,7 @@
}
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,
@@ -448,7 +448,7 @@
}
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,
@@ -456,7 +456,7 @@
}
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,
@@ -464,7 +464,7 @@
}
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,
@@ -472,7 +472,7 @@
}
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,
@@ -480,7 +480,7 @@
}
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,
@@ -488,7 +488,7 @@
}
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,
@@ -496,7 +496,7 @@
}
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,
@@ -504,7 +504,7 @@
}
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,
@@ -512,7 +512,7 @@
}
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,
@@ -520,7 +520,7 @@
}
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,
@@ -567,7 +567,7 @@
/* 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;
@@ -677,7 +677,7 @@
}
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;
@@ -693,7 +693,7 @@
}
}
-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,
@@ -724,17 +724,17 @@
}
}
-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)))
@@ -745,14 +745,14 @@
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;
@@ -821,7 +821,7 @@
}
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;
@@ -844,17 +844,17 @@
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;
@@ -1035,7 +1035,7 @@
}
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;
@@ -1057,7 +1057,7 @@
}
void
-file_quit_cmd_cb (GtkWidget *widget, gpointer data)
+file_quit_cmd_cb (GtkWidget *widget _U_, gpointer data _U_)
{
do_quit();
}
--- nameres_prefs.c Mon Jan 21 08:37:41 2002
+++ nameres_prefs.c.new-unused Sun Mar 3 05:42:47 2002
@@ -114,7 +114,7 @@
}
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 @@
}
void
-nameres_prefs_destroy(GtkWidget *w)
+nameres_prefs_destroy(GtkWidget *w _U_)
{
}
--- packet_win.c Mon Feb 18 02:08:44 2002
+++ packet_win.c.new-unused Sun Mar 3 05:42:49 2002
@@ -90,7 +90,7 @@
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 @@
}
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 @@
/* 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 @@
/* 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 @@
}
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;
--- plugins_dlg.c Mon Jan 21 08:37:42 2002
+++ plugins_dlg.c.new-unused Sun Mar 3 05:42:51 2002
@@ -46,7 +46,7 @@
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 @@
}
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));
--- prefs_dlg.c Thu Feb 14 11:58:49 2002
+++ prefs_dlg.c.new-unused Sun Mar 3 05:42:54 2002
@@ -239,7 +239,7 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
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 @@
/* 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));
--- print_dlg.c Mon Jan 21 08:37:42 2002
+++ print_dlg.c.new-unused Sun Mar 3 05:42:57 2002
@@ -93,7 +93,7 @@
/* 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 @@
#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 @@
#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 @@
}
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 @@
}
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 @@
}
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 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;
--- print_prefs.c Sun Jan 20 21:05:18 2002
+++ print_prefs.c.new-unused Sun Mar 3 05:42:59 2002
@@ -170,13 +170,13 @@
}
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 @@
}
void
-printer_prefs_apply(GtkWidget *w)
+printer_prefs_apply(GtkWidget *w _U_)
{
}
--- progress_dlg.c Sat Mar 24 03:07:22 2001
+++ progress_dlg.c.new-unused Sun Mar 3 05:43:01 2002
@@ -145,7 +145,7 @@
* "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 @@
* 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;
--- proto_dlg.c Fri Jan 11 08:40:31 2002
+++ proto_dlg.c.new-unused Sun Mar 3 05:43:04 2002
@@ -70,7 +70,7 @@
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 @@
/* Toggle All */
static void
-toggle_all_cb(GtkWidget *button, gpointer parent_w)
+toggle_all_cb(GtkWidget *button _U_, gpointer parent_w)
{
GSList *entry;
@@ -218,7 +218,7 @@
/* Enable/Disable All Helper */
static void
-set_active_all(GtkWidget *button, gpointer parent_w, gboolean new_state)
+set_active_all(GtkWidget *button _U_, gpointer parent_w, gboolean new_state)
{
GSList *entry;
@@ -247,7 +247,7 @@
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 @@
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 @@
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;
--- proto_draw.c Mon Feb 18 02:08:44 2002
+++ proto_draw.c.new-unused Sun Mar 3 05:43:06 2002
@@ -134,7 +134,7 @@
/* Redraw a given byte view window. */
void
-redraw_hex_dump(GtkWidget *nb, frame_data *fd, field_info *finfo)
+redraw_hex_dump(GtkWidget *nb _U_, frame_data *fd, field_info *finfo)
{
GtkWidget *bv;
const guint8 *data;
@@ -159,7 +159,7 @@
}
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 @@
}
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 @@
}
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;
@@ -205,7 +205,7 @@
* the item in the GUI proto_tree that corresponds to that byte, and
* select it. */
static gint
-byte_view_select(GtkWidget *widget, GdkEventButton *event, gpointer data)
+byte_view_select(GtkWidget *widget, GdkEventButton *event, gpointer data _U_)
{
proto_tree *tree;
GtkCTree *ctree;
@@ -346,7 +346,7 @@
}
GtkWidget *
-create_byte_view(gint bv_size, GtkWidget *pane, int pos)
+create_byte_view(gint bv_size _U_, GtkWidget *pane, int pos _U_)
{
GtkWidget *byte_nb;
@@ -364,7 +364,7 @@
}
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 @@
/* 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);
}
@@ -802,7 +802,7 @@
void
create_tree_view(gint tv_size, e_prefs *prefs, GtkWidget *pane,
- GtkWidget **tv_scrollw_p, GtkWidget **tree_view_p, int pos)
+ GtkWidget **tv_scrollw_p, GtkWidget **tree_view_p, int pos _U_)
{
GtkWidget *tv_scrollw, *tree_view;
--- proto_hier_stats_dlg.c Fri Jan 11 07:43:18 2002
+++ proto_hier_stats_dlg.c.new-unused Sun Mar 3 05:43:08 2002
@@ -169,7 +169,7 @@
#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;
--- simple_dialog.c Wed Dec 12 22:38:59 2001
+++ simple_dialog.c.new-unused Sun Mar 3 05:43:10 2002
@@ -168,7 +168,7 @@
}
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)
--- stream_prefs.c Fri Jan 11 08:40:32 2002
+++ stream_prefs.c.new-unused Sun Mar 3 05:43:12 2002
@@ -138,7 +138,7 @@
}
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 @@
}
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 @@
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_)
{
}
--- summary_dlg.c Fri Feb 8 11:07:38 2002
+++ summary_dlg.c.new-unused Sun Mar 3 05:43:14 2002
@@ -58,7 +58,7 @@
void
-summary_open_cb(GtkWidget *w, gpointer d)
+summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
{
summary_tally summary;
GtkWidget *sum_open_w,
--- tcp_graph.c Thu Jan 31 00:08:27 2002
+++ tcp_graph.c.new-unused Sun Mar 3 05:43:20 2002
@@ -535,7 +535,7 @@
";
#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 @@
/* 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 @@
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_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 @@
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 @@
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;
}
@@ -3009,7 +3009,7 @@
return TRUE;
}
-static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event)
+static gint leave_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_)
{
struct graph *g;
@@ -3023,7 +3023,7 @@
return TRUE;
}
-static gint enter_notify_event (GtkWidget *widget, GdkEventCrossing *event)
+static gint enter_notify_event (GtkWidget *widget, GdkEventCrossing *event _U_)
{
struct graph *g;
--- ui_util.c Fri Jan 11 08:40:32 2002
+++ ui_util.c.new-unused Sun Mar 3 05:43:21 2002
@@ -116,7 +116,7 @@
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 @@
/* 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 @@
}
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 @@
/* 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 @@
}
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);
}
Attachment:
unused.pl
Description: Perl program
This message has been 'sanitized'. This means that potentially
dangerous content has been rewritten or removed. The following
log describes which actions were taken.
Sanitizer (start="1015130987"):
Part (pos="1898"):
SanitizeFile (filename="unnamed.txt", mimetype="text/plain"):
Match (rule="2"):
Enforced policy: accept
Part (pos="3037"):
SanitizeFile (filename="gtk-unused.diff", mimetype="text/plain"):
Match (rule="default"):
Enforced policy: accept
Part (pos="60829"):
SanitizeFile (filename="unused.pl", mimetype="application/x-perl"):
Match (rule="default"):
Enforced policy: accept
Defanged UNIX shell script(s).
Total modifications so far: 1
Anomy 0.0.0 : Sanitizer.pm
$Id: Sanitizer.pm,v 1.32 2001/10/11 19:27:15 bre Exp $
- Follow-Ups:
- Re: [Ethereal-dev] gcc warnings about unused variables
- From: Joerg Mayer
- Re: [Ethereal-dev] gcc warnings about unused variables
- From: Guy Harris
- Re: [Ethereal-dev] gcc warnings about unused variables
- References:
- Re: [Ethereal-dev] gcc warnings about unused variables
- From: Guy Harris
- Re: [Ethereal-dev] gcc warnings about unused variables
- From: Joerg Mayer
- Re: [Ethereal-dev] gcc warnings about unused variables
- From: Guy Harris
- Re: [Ethereal-dev] gcc warnings about unused variables
- Prev by Date: Re: [Ethereal-dev] Windows UI
- Next by Date: Re: [Ethereal-dev] Re: Windows UI
- Previous by thread: Re: [Ethereal-dev] gcc warnings about unused variables
- Next by thread: Re: [Ethereal-dev] gcc warnings about unused variables
- Index(es):
