diff options
Diffstat (limited to 'ui')
66 files changed, 679 insertions, 677 deletions
diff --git a/ui/gtk/about_dlg.c b/ui/gtk/about_dlg.c index 224563a44a..220eeb3ce8 100644 --- a/ui/gtk/about_dlg.c +++ b/ui/gtk/about_dlg.c @@ -277,7 +277,7 @@ splash_update(register_action_e action, const char *message, gpointer client_dat prog_bar = (GtkWidget *)g_object_get_data(G_OBJECT(win), "progress_bar"); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(prog_bar), percentage); - percentage_lb = g_object_get_data(G_OBJECT(win), "percentage_label"); + percentage_lb = (GtkWidget *)g_object_get_data(G_OBJECT(win), "percentage_label"); g_snprintf(tmp, sizeof(tmp), "%lu%%", ul_percentage); gtk_label_set_text((GtkLabel*)percentage_lb, tmp); @@ -578,7 +578,7 @@ about_wireshark_cb( GtkWidget *w _U_, gpointer data _U_ ) bbox = dlg_button_row_new(GTK_STOCK_OK, NULL); gtk_box_pack_start(GTK_BOX(main_box), bbox, FALSE, FALSE, 0); - ok_btn = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_btn = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); gtk_widget_grab_focus(ok_btn); gtk_widget_grab_default(ok_btn); window_set_cancel_button(about_wireshark_w, ok_btn, window_cancel_button_cb); diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c index aa5a19edd4..e83506e115 100644 --- a/ui/gtk/addr_resolution_dlg.c +++ b/ui/gtk/addr_resolution_dlg.c @@ -256,14 +256,14 @@ addr_resolution_dlg (GtkAction *action _U_, gpointer data _U_) bbox = dlg_button_row_new (GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL); gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - ok_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_OK); /*g_signal_connect (ok_bt, "clicked", G_CALLBACK(pkt_comment_text_buff_ok_cb), view);*/ gtk_widget_set_sensitive (ok_bt, TRUE); - cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button (addr_resolution_dlg_w, cancel_bt, window_cancel_button_cb); - help_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP); #if 0 g_signal_connect (help_bt, "clicked",/* G_CALLBACK(topic_cb)*/NULL, /*(gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG*/NULL); #endif diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c index e38063ee4b..7b4ce9d8d8 100644 --- a/ui/gtk/afp_stat.c +++ b/ui/gtk/afp_stat.c @@ -74,7 +74,7 @@ static int afpstat_packet(void *pss, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prv) { afpstat_t *ss=(afpstat_t *)pss; - const afp_request_val *request_val=prv; + const afp_request_val *request_val=(const afp_request_val *)prv; /* if we havnt seen the request, just ignore it */ if(!request_val){ @@ -128,7 +128,7 @@ gtk_afpstat_init(const char *opt_arg, void *userdata _U_) filter=NULL; } - ss=g_malloc(sizeof(afpstat_t)); + ss=(afpstat_t *)g_malloc(sizeof(afpstat_t)); ss->win=dlg_window_new("afp-stat"); /* transient_for top_level */ gtk_window_set_destroy_with_parent (GTK_WINDOW(ss->win), TRUE); @@ -172,7 +172,7 @@ gtk_afpstat_init(const char *opt_arg, void *userdata _U_) bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); + close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb); g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c index 8934fa7f78..de36143215 100644 --- a/ui/gtk/airpcap_dlg.c +++ b/ui/gtk/airpcap_dlg.c @@ -77,11 +77,11 @@ on_key_list_select_row(GtkTreeSelection *selection, gpointer data) GtkTreeModel *model; GtkTreePath *path, *path_up, *path_down; - add_new_key_bt = g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_NEW_KEY); - edit_key_bt = g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_EDIT_KEY); - remove_key_bt = g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_DELETE_KEY); - move_key_up_bt = g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_UP_KEY); - move_key_down_bt = g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_DOWN_KEY); + add_new_key_bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_NEW_KEY); + edit_key_bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_EDIT_KEY); + remove_key_bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_DELETE_KEY); + move_key_up_bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_UP_KEY); + move_key_down_bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), AIRPCAP_KEY_MGMT_DOWN_KEY); if (gtk_tree_selection_get_selected(selection, &model, &iter)) { path = gtk_tree_model_get_path(model, &iter); @@ -129,7 +129,7 @@ static void on_key_list_reorder(GtkTreeModel *model _U_, GtkTreePath *path _U_, GtkTreeIter *iter _U_, gpointer no _U_, gpointer data) { GtkTreeSelection *selection; - selection = g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); + selection = (GtkTreeSelection *)g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); on_key_list_select_row(selection, data); } @@ -172,9 +172,9 @@ on_edit_type_cb_changed(GtkWidget *w, gpointer data) edit_key_w = GTK_WIDGET(data); type_cb = w; - edit_ssid_te = g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY); - key_lb = g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_KEY_LABEL_KEY); - ssid_lb = g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_SSID_LABEL_KEY); + edit_ssid_te = (GtkWidget *)g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY); + key_lb = (GtkWidget *)g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_KEY_LABEL_KEY); + ssid_lb = (GtkWidget *)g_object_get_data(G_OBJECT(edit_key_w),AIRPCAP_ADVANCED_EDIT_KEY_SSID_LABEL_KEY); type_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(type_cb)); @@ -240,9 +240,9 @@ on_add_type_cb_changed(GtkWidget *w, gpointer data) add_key_w = GTK_WIDGET(data); type_cb = w; - add_ssid_te = g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY); - key_lb = g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_KEY_LABEL_KEY); - ssid_lb = g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_SSID_LABEL_KEY); + add_ssid_te = (GtkWidget *)g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY); + key_lb = (GtkWidget *)g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_KEY_LABEL_KEY); + ssid_lb = (GtkWidget *)g_object_get_data(G_OBJECT(add_key_w),AIRPCAP_ADVANCED_ADD_KEY_SSID_LABEL_KEY); type_text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(type_cb)); @@ -567,10 +567,10 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) unsigned int i; - key_list_store = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_LIST_KEY); - type_cb = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_TYPE_KEY); - key_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_KEY_KEY); - ssid_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_LIST_KEY); + type_cb = (GtkWidget *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_TYPE_KEY); + key_en = (GtkWidget *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_KEY_KEY); + ssid_en = (GtkWidget *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_ADD_KEY_SSID_KEY); type_entered = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT(type_cb)); key_entered = g_strdup(gtk_entry_get_text(GTK_ENTRY(key_en))); @@ -740,11 +740,11 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data) unsigned int i; - key_list_store = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_LIST_KEY); - selection = g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); - type_cb = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_TYPE_KEY); - key_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_KEY_KEY); - ssid_en = g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_LIST_KEY); + selection = (GtkTreeSelection *)g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); + type_cb = (GtkWidget *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_TYPE_KEY); + key_en = (GtkWidget *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_KEY_KEY); + ssid_en = (GtkWidget *)g_object_get_data(G_OBJECT(data),AIRPCAP_ADVANCED_EDIT_KEY_SSID_KEY); if (!gtk_tree_selection_get_selected(selection, NULL, &iter)) return; @@ -948,7 +948,7 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data) airpcap_advanced_w = GTK_WIDGET(data); - key_list_store = g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEYLIST_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(airpcap_advanced_w),AIRPCAP_ADVANCED_KEYLIST_KEY); if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(key_list_store), NULL) >= MAX_ENCRYPTION_KEYS) { @@ -1100,7 +1100,7 @@ on_remove_key_bt_clicked(GtkWidget *button _U_, gpointer data) GtkTreeSelection *selection; /* retrieve needed stuff */ - selection = g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); + selection = (GtkTreeSelection *)g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); if (!gtk_tree_selection_get_selected(selection, &model, &iter)) return; @@ -1152,8 +1152,8 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data) airpcap_advanced_w = GTK_WIDGET(data); /* Retrieve the selected item... if no row is selected, this is null... */ - selection = g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); - key_list_store = g_object_get_data (G_OBJECT(data), AIRPCAP_ADVANCED_KEYLIST_KEY); + selection = (GtkTreeSelection *)g_object_get_data(G_OBJECT(data), AIRPCAP_ADVANCED_EDIT_KEY_SELECTION_KEY); + key_list_store = (GtkListStore *)g_object_get_data (G_OBJECT(data), AIRPCAP_ADVANCED_KEYLIST_KEY); if (!gtk_tree_selection_get_selected(selection, &model, &iter)) @@ -1860,9 +1860,9 @@ display_airpcap_advanced_cb(GtkWidget *w _U_, gpointer data) gtk_box_pack_end (GTK_BOX (low_buttons_h_box), right_h_button_box, FALSE, FALSE, 0); - ok_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_OK); - apply_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_APPLY); - cancel_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_CANCEL); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_OK); + apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_APPLY); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_CANCEL); /* Connect the callbacks */ g_signal_connect (airpcap_advanced_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); @@ -2208,9 +2208,9 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data) gtk_box_pack_end (GTK_BOX (low_buttons_h_box), right_h_button_box, FALSE, FALSE, 0); - ok_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_OK); - apply_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_APPLY); - cancel_bt = g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_CANCEL); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_OK); + apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_APPLY); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(right_h_button_box), GTK_STOCK_CANCEL); /* Connect the callbacks */ g_signal_connect (key_management_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); @@ -2284,14 +2284,14 @@ on_keys_check_cancel_bt_clicked (GtkWidget *button _U_, gpointer user_data) keys_check_w = GTK_WIDGET(user_data); - key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); + key_management_w = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); /* w may be NULL if airpcap_keys_check_w() has been called while Wireshark was loading, and is not NULL if it was called when the Key Management widget has been clicked */ if (key_management_w != NULL) { /* ... */ - key_list_store = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); airpcap_fill_key_list(key_list_store); gtk_widget_show (key_management_w); } @@ -2319,7 +2319,7 @@ on_merge_bt_clicked (GtkWidget* button _U_, gpointer user_data) keys_check_w = GTK_WIDGET(user_data); - key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); + key_management_w = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); n_adapters = g_list_length(airpcap_if_list); @@ -2358,7 +2358,7 @@ on_merge_bt_clicked (GtkWidget* button _U_, gpointer user_data) if (key_management_w != NULL) { /* ... */ - key_list_store = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); airpcap_fill_key_list(key_list_store); gtk_widget_show (key_management_w); } @@ -2377,7 +2377,7 @@ on_keep_bt_clicked (GtkWidget *button _U_, gpointer user_data) keys_check_w = GTK_WIDGET(user_data); - key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); + key_management_w = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); /* Retrieve Wireshark keys */ wireshark_keys = get_wireshark_keys(); @@ -2398,7 +2398,7 @@ on_keep_bt_clicked (GtkWidget *button _U_, gpointer user_data) if (key_management_w != NULL) { /* ... */ - key_list_store = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); airpcap_fill_key_list(key_list_store); gtk_widget_show (key_management_w); } @@ -2424,7 +2424,7 @@ on_import_bt_clicked (GtkWidget* button _U_, gpointer user_data) keys_check_w = GTK_WIDGET(user_data); - key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); + key_management_w = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); n_adapters = g_list_length(airpcap_if_list); @@ -2460,7 +2460,7 @@ on_import_bt_clicked (GtkWidget* button _U_, gpointer user_data) if (key_management_w != NULL) { /* ... */ - key_list_store = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); airpcap_fill_key_list(key_list_store); gtk_widget_show (key_management_w); } @@ -2475,14 +2475,14 @@ on_ignore_bt_clicked (GtkWidget* button _U_, gpointer user_data) keys_check_w = GTK_WIDGET(user_data); - key_management_w = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); + key_management_w = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_KEY); /* w may be NULL if airpcap_keys_check_w() has been called while Wireshark was loading, and is not NULL if it was called when the Key Management widget has been clicked */ if (key_management_w != NULL) { /* ... */ - key_list_store = g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); + key_list_store = (GtkListStore *)g_object_get_data(G_OBJECT(key_management_w),AIRPCAP_ADVANCED_KEYLIST_KEY); airpcap_fill_key_list(key_list_store); gtk_widget_show (key_management_w); } @@ -2502,10 +2502,10 @@ on_keys_check_ok_bt_clicked (GtkWidget *button _U_, gpointer user_data) keys_check_w = GTK_WIDGET(user_data); - merge_rb = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_MERGE_KEY); - keep_rb = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_KEEP_KEY); - import_rb = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IMPORT_KEY); - ignore_rb = g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IGNORE_KEY); + merge_rb = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_MERGE_KEY); + keep_rb = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_KEEP_KEY); + import_rb = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IMPORT_KEY); + ignore_rb = (GtkWidget *)g_object_get_data(G_OBJECT(keys_check_w),AIRPCAP_CHECK_WINDOW_RADIO_IGNORE_KEY); /* Find out which radio button is selected and call the correct function */ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(merge_rb))) diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index c8fab31e50..e9cc4f286b 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -1212,7 +1212,7 @@ bytes_view_class_init(BytesViewClass *klass) widget_class->set_scroll_adjustments_signal = g_signal_new(g_intern_static_string("set-scroll-adjustments"), G_OBJECT_CLASS_TYPE(object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET(BytesViewClass, set_scroll_adjustments), NULL, NULL, bv_VOID__OBJECT_OBJECT, @@ -1400,7 +1400,7 @@ bytes_view_set_encoding(BytesView *bv, int enc) { g_assert(enc == PACKET_CHAR_ENC_CHAR_ASCII || enc == PACKET_CHAR_ENC_CHAR_EBCDIC); - bv->encoding = enc; + bv->encoding = (packet_char_enc)enc; } void @@ -1408,7 +1408,7 @@ bytes_view_set_format(BytesView *bv, int format) { g_assert(format == BYTES_HEX || format == BYTES_BITS); - bv->format = format; + bv->format = (bytes_view_type)format; switch (format) { case BYTES_BITS: diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index d79c6ab2f6..0c47948da3 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -505,7 +505,7 @@ init_columns_menu(void) columns_action_group = gtk_action_group_new ("ColumnsPopUpMenuActionGroup"); gtk_action_group_add_actions (columns_action_group, /* the action group */ - (gpointer)columns_menu_popup_action_entries, /* an array of action descriptions */ + (GtkActionEntry *)columns_menu_popup_action_entries, /* an array of action descriptions */ G_N_ELEMENTS(columns_menu_popup_action_entries), /* the number of entries */ columns_menu_object); /* data to pass to the action callbacks */ @@ -2044,9 +2044,9 @@ compile_tree_select_cb(GtkTreeSelection *sel, gpointer dummy _U_) text = (gchar *)g_hash_table_lookup(compile_results, name); textview = (GtkWidget *)g_object_get_data(G_OBJECT(compile_bpf_w), CR_MAIN_NB); if (error == 1) { - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), TRUE); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_CHAR); } else { - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), FALSE); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_NONE); } buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); gtk_text_buffer_set_text(buffer, text, -1); @@ -2264,9 +2264,9 @@ compile_results_win(gchar *text, gboolean error) gtk_container_add(GTK_CONTAINER(scrolled_win), textview); gtk_box_pack_start(GTK_BOX(main_box), scrolled_win, TRUE, TRUE, 0); if (error == 1) { - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), TRUE); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_CHAR); } else { - gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), FALSE); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_NONE); } buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); gtk_text_buffer_set_text(buffer, g_strdup(text), -1); @@ -5181,7 +5181,7 @@ capture_start_confirmed(void) return; /* close the currently loaded capture file */ - cf_close(global_capture_opts.cf); + cf_close((capture_file *)global_capture_opts.cf); /* Copy the selected interfaces to the set of interfaces to use for this capture. */ diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c index adabc41d2b..5b14d20af5 100644 --- a/ui/gtk/capture_file_dlg.c +++ b/ui/gtk/capture_file_dlg.c @@ -1031,7 +1031,7 @@ file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) { user whether to save the capture. */ if (cfile.is_tempfile) { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to save the captured packets before merging another capture file into it?"); @@ -1044,7 +1044,7 @@ file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) { */ display_basename = g_filename_display_basename(cfile.filename); msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to save the changes you've made " @@ -1140,7 +1140,7 @@ test_file_close(capture_file *cf, gboolean from_quit, const char *before_what) to save the data. */ if (cf->is_tempfile) { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, capture_in_progress ? @@ -1157,14 +1157,14 @@ test_file_close(capture_file *cf, gboolean from_quit, const char *before_what) display_basename = g_filename_display_basename(cf->filename); if (capture_in_progress) { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to stop the capture and save the captured packets%s?", before_what); } else { msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "Do you want to save the changes you've made " @@ -2343,7 +2343,7 @@ file_color_export_cmd_cb(GtkWidget *w _U_, gpointer filter_list) /* Write out the filters (all, or only the ones that are currently displayed or selected) to the file with the specified name. */ - if (!color_filters_export(cf_name, filter_list, color_selected)) { + if (!color_filters_export(cf_name, (GSList *)filter_list, color_selected)) { /* The write failed; don't dismiss the open dialog box, just leave it around so that the user can, after they dismiss the alert box popped up for the error, try again. */ diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c index 0f35bf4a92..10845241ae 100644 --- a/ui/gtk/capture_if_dlg.c +++ b/ui/gtk/capture_if_dlg.c @@ -178,7 +178,7 @@ store_selected(GtkWidget *choose_bt, gpointer name) for (i = 0; i < global_capture_opts.all_ifaces->len; i++) { device = g_array_index(global_capture_opts.all_ifaces, interface_t, i); - if (strcmp(name, device.if_info.name) == 0) { + if (strcmp((char *)name, device.if_info.name) == 0) { if (!device.locked) { device.selected ^= 1; if (device.selected) { diff --git a/ui/gtk/capture_info_dlg.c b/ui/gtk/capture_info_dlg.c index 828ff9b916..870f7a2045 100644 --- a/ui/gtk/capture_info_dlg.c +++ b/ui/gtk/capture_info_dlg.c @@ -243,13 +243,13 @@ capture_options *capture_opts) gtk_misc_set_alignment(GTK_MISC(info->counts[i].percent_lb), 1.0f, 0.5f); ws_gtk_grid_attach_extended(GTK_GRID(counts_grid), info->counts[i].label, - 0, i, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + 0, i, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); ws_gtk_grid_attach_extended(GTK_GRID(counts_grid), info->counts[i].value_lb, - 1, i, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + 1, i, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); ws_gtk_grid_attach_extended(GTK_GRID(counts_grid), info->counts[i].percent_pb, - 2, i, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + 2, i, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); ws_gtk_grid_attach_extended(GTK_GRID(counts_grid), info->counts[i].percent_lb, - 3, i, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + 3, i, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_widget_show(info->counts[i].label); gtk_widget_show(info->counts[i].value_lb); @@ -268,23 +268,23 @@ capture_options *capture_opts) gtk_misc_set_alignment(GTK_MISC(running_label), 0.0f, 0.0f); gtk_widget_show(running_label); ws_gtk_grid_attach_extended(GTK_GRID(running_grid), running_label, - 0, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + 0, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); info->running_time_lb = gtk_label_new("00:00:00"); gtk_misc_set_alignment(GTK_MISC(info->running_time_lb), 0.5f, 0.0f); gtk_widget_show(info->running_time_lb); ws_gtk_grid_attach_extended(GTK_GRID(running_grid), info->running_time_lb, - 1, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 5, 0); /* effect: pads *all* the columns ?? */ + 1, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 5, 0); /* effect: pads *all* the columns ?? */ /* two dummy cols to match the 4 cols above */ lb = gtk_label_new(""); gtk_widget_show(lb); ws_gtk_grid_attach_extended(GTK_GRID(running_grid), lb, - 2, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + 2, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); lb = gtk_label_new(""); gtk_widget_show(lb); ws_gtk_grid_attach_extended(GTK_GRID(running_grid), lb, - 3, 0, 1, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); + 3, 0, 1, 1, (GtkAttachOptions)(GTK_EXPAND|GTK_FILL), (GtkAttachOptions)0, 0, 0); gtk_box_pack_start(GTK_BOX(main_vb), running_grid, FALSE, FALSE, 3); gtk_widget_show(running_grid); diff --git a/ui/gtk/cfilter_combo_utils.c b/ui/gtk/cfilter_combo_utils.c index b6cbee7070..47cbd54b19 100644 --- a/ui/gtk/cfilter_combo_utils.c +++ b/ui/gtk/cfilter_combo_utils.c @@ -49,7 +49,7 @@ cfilter_combo_add(gchar *s) { while (li) { /* If the filter is already in the list, remove the old one and * append the new one at the latest position (at g_list_append() below) */ - if (li->data && strcmp(s, li->data) == 0) { + if (li->data && strcmp(s, (char *)li->data) == 0) { fl = g_list_remove(fl, li->data); break; } diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 68566d1d19..aa04e643cf 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -1940,7 +1940,7 @@ ct_create_popup_menu(conversations_table *ct) action_group = gtk_action_group_new ("ConvActionGroup"); gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)conv_filter_menu_entries, /* an array of action descriptions */ + (GtkActionEntry *)conv_filter_menu_entries, /* an array of action descriptions */ G_N_ELEMENTS(conv_filter_menu_entries), /* the number of entries */ (gpointer)ct); /* data to pass to the action callbacks */ diff --git a/ui/gtk/decode_as_ber.c b/ui/gtk/decode_as_ber.c index 13afd4725d..41f7890180 100644 --- a/ui/gtk/decode_as_ber.c +++ b/ui/gtk/decode_as_ber.c @@ -93,7 +93,7 @@ decode_ber(GtkWidget *notebook_pg) static void decode_ber_add_to_list(gpointer key, gpointer value, gpointer user_data) { - decode_add_to_list("ASN.1", key, value, user_data); + decode_add_to_list("ASN.1", (gchar *)key, value, user_data); } diff --git a/ui/gtk/decode_as_dlg.c b/ui/gtk/decode_as_dlg.c index 62baa3cea0..e0d8c62217 100644 --- a/ui/gtk/decode_as_dlg.c +++ b/ui/gtk/decode_as_dlg.c @@ -128,7 +128,7 @@ GSList *decode_dimmable = NULL; * modified in a callback routine, and read in the routine that * handles a click in the "OK" button for the dialog. */ -enum action_type requested_action = -1; +enum action_type requested_action = (enum action_type)-1; /**************************************************/ @@ -458,12 +458,12 @@ decode_build_show_list (const gchar *table_name, ftenum_t selector_type, g_assert(user_data); g_assert(value); - current = (dissector_handle_t)dtbl_entry_get_handle(value); + current = (dissector_handle_t)dtbl_entry_get_handle((dtbl_entry_t *)value); if (current == NULL) current_proto_name = "(none)"; else current_proto_name = dissector_handle_get_short_name(current); - initial = (dissector_handle_t)dtbl_entry_get_initial_handle(value); + initial = (dissector_handle_t)dtbl_entry_get_initial_handle((dtbl_entry_t *)value); if (initial == NULL) initial_proto_name = "(none)"; else @@ -1042,11 +1042,11 @@ decode_ok_cb (GtkWidget *ok_bt _U_, gpointer parent_w) void *binding = NULL; /* Call the right routine for the page that was currently in front. */ - notebook = g_object_get_data(G_OBJECT(parent_w), E_NOTEBOOK); + notebook = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_NOTEBOOK); page_num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); notebook_pg = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), page_num); - func = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_ACTION); + func = (void (*)(GtkWidget *))g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_ACTION); func(notebook_pg); /* Now destroy the "Decode As" dialog. */ @@ -1087,7 +1087,7 @@ decode_apply_cb (GtkWidget *apply_bt _U_, gpointer parent_w) page_num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); notebook_pg = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), page_num); - func = g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_ACTION); + func = (void (*)(GtkWidget *))g_object_get_data(G_OBJECT(notebook_pg), E_PAGE_ACTION); func(notebook_pg); redissect_packets(); @@ -1199,7 +1199,7 @@ decode_update_action (GtkWidget *w _U_, gpointer user_data) GSList *tmp; gboolean enable; - requested_action = GPOINTER_TO_INT(user_data); + requested_action = (enum action_type)GPOINTER_TO_INT(user_data); enable = (requested_action == E_DECODE_YES); for (tmp = decode_dimmable; tmp; tmp = g_slist_next(tmp)) { gtk_widget_set_sensitive((GtkWidget *)tmp->data, enable); @@ -1748,7 +1748,7 @@ decode_sctp_update_srcdst_combo_box(GtkWidget *w _U_, GtkWidget *page) g_object_set_data(G_OBJECT(page), E_PAGE_TABLE, (gpointer)"sctp.port"); g_object_set_data(G_OBJECT(page), E_PAGE_SPORT, GINT_TO_POINTER(cfile.edt->pi.srcport)); g_object_set_data(G_OBJECT(page), E_PAGE_DPORT, GINT_TO_POINTER(cfile.edt->pi.destport)); - sctp_store = g_object_get_data(G_OBJECT(G_OBJECT(decode_w)), "sctp_data"); + sctp_store = (GtkListStore *)g_object_get_data(G_OBJECT(G_OBJECT(decode_w)), "sctp_data"); gtk_list_store_clear(sctp_store); decode_sctp_list_menu_start(&list, &scrolled_window); dissector_table_foreach_handle("sctp.port", decode_proto_add_to_list, list); diff --git a/ui/gtk/edit_packet_comment_dlg.c b/ui/gtk/edit_packet_comment_dlg.c index 624da58ce0..1cca02e058 100644 --- a/ui/gtk/edit_packet_comment_dlg.c +++ b/ui/gtk/edit_packet_comment_dlg.c @@ -237,7 +237,7 @@ edit_capture_comment_dlg_launch (void) g_signal_connect (ok_bt, "clicked", G_CALLBACK(capture_comment_text_buff_ok_cb), view); gtk_widget_set_sensitive (ok_bt, TRUE); - cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button (edit_or_add_capture_comment_dlg, cancel_bt, window_cancel_button_cb); help_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP); diff --git a/ui/gtk/expert_comp_table.c b/ui/gtk/expert_comp_table.c index 945e0e6a35..2c27ff33ab 100644 --- a/ui/gtk/expert_comp_table.c +++ b/ui/gtk/expert_comp_table.c @@ -606,7 +606,7 @@ error_create_popup_menu(error_equiv_table *err) action_group = gtk_action_group_new ("ExpertFilterPopupActionGroup"); gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)expert_popup_entries, /* an array of action descriptions */ + (GtkActionEntry *)expert_popup_entries, /* an array of action descriptions */ G_N_ELEMENTS(expert_popup_entries), /* the number of entries */ err); /* data to pass to the action callbacks */ diff --git a/ui/gtk/export_object_dlg.c b/ui/gtk/export_object_dlg.c index 96db23272e..14fd23ff9f 100644 --- a/ui/gtk/export_object_dlg.c +++ b/ui/gtk/export_object_dlg.c @@ -294,7 +294,7 @@ eo_draw(void *tapdata) gtk_tree_store_append(object_list->store, &new_iter, object_list->iter); - size_str = format_size(eo_entry->payload_len, format_size_unit_bytes|format_size_prefix_si); + size_str = format_size(eo_entry->payload_len, (format_size_flags_e)(format_size_unit_bytes|format_size_prefix_si)); gtk_tree_store_set(object_list->store, &new_iter, EO_PKT_NUM_COLUMN, eo_entry->pkt_num, EO_HOSTNAME_COLUMN, eo_entry->hostname, diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c index 4f15f6e0d1..60c033a068 100644 --- a/ui/gtk/file_dlg.c +++ b/ui/gtk/file_dlg.c @@ -107,7 +107,7 @@ file_selection_new(const gchar *title, file_selection_action_t action) default: g_assert_not_reached(); - gtk_action = -1; + gtk_action = (GtkFileChooserAction)-1; ok_button_text = NULL; break; } @@ -339,7 +339,7 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name) if ((statbuf.st_mode & (S_IWUSR|S_IWGRP|S_IWOTH)) == 0) { display_basename = g_filename_display_basename(cf_name); msg_dialog = gtk_message_dialog_new(GTK_WINDOW(chooser_w), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "The file \"%s\" is read-only.", @@ -430,7 +430,7 @@ file_selection_browse_destroy_cb(GtkWidget *win, GtkWidget* parent_te) /* Get the widget that requested that we be popped up. (It should arrange to destroy us if it's destroyed, so that we don't get a pointer to a non-existent window here.) */ - caller = g_object_get_data(G_OBJECT(win), E_FS_CALLER_PTR_KEY); + caller = (GtkWidget *)g_object_get_data(G_OBJECT(win), E_FS_CALLER_PTR_KEY); /* Tell it we no longer exist. */ g_object_set_data(G_OBJECT(caller), E_FILE_SEL_DIALOG_PTR_KEY, NULL); diff --git a/ui/gtk/file_import_dlg.c b/ui/gtk/file_import_dlg.c index d5a1ebe2dd..2470c8f10c 100644 --- a/ui/gtk/file_import_dlg.c +++ b/ui/gtk/file_import_dlg.c @@ -589,7 +589,7 @@ setup_file_import(GtkWidget *main_w) { GtkWidget *input_frm, *import_frm; - text_import_info_t *text_import_info = g_malloc0(sizeof(text_import_info_t)); + text_import_info_t *text_import_info = (text_import_info_t *)g_malloc0(sizeof(text_import_info_t)); /* Retrieve the input and import settings from the dialog */ @@ -622,7 +622,7 @@ setup_file_import(GtkWidget *main_w) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(offset_hex_rb)) ? OFFSET_HEX : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(offset_oct_rb)) ? OFFSET_OCT : gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(offset_dec_rb)) ? OFFSET_DEC : - 0; + OFFSET_NONE; text_import_info->date_timestamp = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(timefmt_cb)); text_import_info->date_timestamp_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(timefmt_te))); } @@ -815,7 +815,7 @@ file_import_ok_cb(GtkWidget *widget _U_, gpointer data) If they cancel out of it, don't open the file. */ if (do_file_close(&cfile, FALSE, " before opening a new capture file")) { /* open the new file */ - text_import_info = setup_file_import(data); + text_import_info = setup_file_import((GtkWidget *)data); if (text_import_info) file_import_open(text_import_info); } @@ -1153,15 +1153,15 @@ file_import_dlg_new(void) bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL); gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 3); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_IMPORT_DIALOG); gtk_widget_set_tooltip_text(help_bt, "Show topic specific help"); - close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button(main_w, close_bt, window_cancel_button_cb); gtk_widget_set_tooltip_text(close_bt, "Close this dialog"); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(ok_bt, "clicked", G_CALLBACK(file_import_ok_cb), main_w); gtk_widget_grab_default(ok_bt); gtk_widget_set_tooltip_text(ok_bt, "Import the selected file into a temporary capture file"); diff --git a/ui/gtk/firewall_dlg.c b/ui/gtk/firewall_dlg.c index 5f0301219f..57e1ff609e 100644 --- a/ui/gtk/firewall_dlg.c +++ b/ui/gtk/firewall_dlg.c @@ -415,7 +415,7 @@ select_filter(GtkWidget *w, gpointer data _U_) if (ws_combo_box_get_active_pointer(GTK_COMBO_BOX(w), &ptr)) - cur_type = GPOINTER_TO_UINT(ptr); + cur_type = (rule_type_t)GPOINTER_TO_UINT(ptr); else cur_type = RT_NONE; /* If nothing selected (eg: nothing in filter list) */ @@ -756,7 +756,7 @@ firewall_save_as_ok_cb(GtkWidget * w _U_, gpointer fs) return FALSE; /* run the dialog again */ } - rule_info = g_object_get_data(G_OBJECT(fs), WS_RULE_INFO_KEY); + rule_info = (rule_info_t *)g_object_get_data(G_OBJECT(fs), WS_RULE_INFO_KEY); fh = ws_fopen(to_name, "w"); if (fh == NULL) { open_failure_alert_box(to_name, errno, TRUE); diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index f8f8338b41..41969e8760 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -97,7 +97,7 @@ follow_read_stream(follow_info_t *follow_info, default : g_assert_not_reached(); - return 0; + return (frs_return_t)0; } } @@ -352,7 +352,7 @@ follow_find_button_cb(GtkWidget * w, gpointer data) if(last_pos_mark) gtk_text_buffer_get_iter_at_mark(buffer, &iter, last_pos_mark); - found = gtk_text_iter_forward_search(&iter, find_string, 0, + found = gtk_text_iter_forward_search(&iter, find_string, (GtkTextSearchFlags)0, &match_start, &match_end, NULL); diff --git a/ui/gtk/gtk_iface_monitor.c b/ui/gtk/gtk_iface_monitor.c index 63e4c31d0f..f3797247f8 100644 --- a/ui/gtk/gtk_iface_monitor.c +++ b/ui/gtk/gtk_iface_monitor.c @@ -79,7 +79,7 @@ gtk_iface_mon_start(void) iface_mon_channel = g_io_channel_unix_new(sock); g_io_channel_set_encoding(iface_mon_channel, NULL, NULL); g_io_add_watch(iface_mon_channel, - G_IO_IN|G_IO_ERR|G_IO_HUP, + (GIOCondition)(G_IO_IN|G_IO_ERR|G_IO_HUP), >k_iface_mon_event, NULL); return 0; diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 7f8357eca2..410ecb680c 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -666,7 +666,7 @@ pipe_input_cb(GIOChannel *source _U_, /* restore pipe handler */ pipe_input->pipe_input_id = g_io_add_watch_full(pipe_input->channel, G_PRIORITY_HIGH, - G_IO_IN|G_IO_ERR|G_IO_HUP, + (GIOCondition)(G_IO_IN|G_IO_ERR|G_IO_HUP), pipe_input_cb, pipe_input, NULL); @@ -701,7 +701,7 @@ pipe_input_set_handler(gint source, g_io_channel_set_encoding(pipe_input.channel, NULL, NULL); pipe_input.pipe_input_id = g_io_add_watch_full(pipe_input.channel, G_PRIORITY_HIGH, - G_IO_IN|G_IO_ERR|G_IO_HUP, + (GIOCondition)(G_IO_IN|G_IO_ERR|G_IO_HUP), pipe_input_cb, &pipe_input, NULL); @@ -1764,7 +1764,7 @@ gdk_pixbuf_get_from_surface(cairo_surface_t *surface, g_return_val_if_fail(surface != NULL, NULL); g_return_val_if_fail(width > 0 && height > 0, NULL); - content = cairo_surface_get_content(surface) | CAIRO_CONTENT_COLOR; + content = (cairo_content_t)(cairo_surface_get_content(surface) | CAIRO_CONTENT_COLOR); dest = gdk_pixbuf_new(GDK_COLORSPACE_RGB, !!(content & CAIRO_CONTENT_ALPHA), 8, diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h index ad276fe597..8179d43202 100644 --- a/ui/gtk/gui_utils.h +++ b/ui/gtk/gui_utils.h @@ -602,13 +602,13 @@ typedef GtkTable GtkGrid; gtk_table_new(0, 0, FALSE) #define ws_gtk_grid_attach(grid, child, left, top, width, height) \ - gtk_table_attach(grid, child, left, left+width, top, top+height, 0, 0, 0, 0) + gtk_table_attach(grid, child, left, left+width, top, top+height, (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 0) #define ws_gtk_grid_attach_defaults(grid, child, left, top, width, height) \ gtk_table_attach_defaults(grid, child, left, left+width, top, top+height) #define ws_gtk_grid_attach_extended(grid, child, left, top, width, height, xoptions, yoptions, xpadding, ypadding) \ - gtk_table_attach(grid, child, left, left+width, top, top+height, xoptions, yoptions, xpadding, ypadding) + gtk_table_attach(grid, child, left, left+width, top, top+height, (GtkAttachOptions)(xoptions), (GtkAttachOptions)(yoptions), xpadding, ypadding) #define ws_gtk_grid_set_homogeneous(grid, homogeneous) \ gtk_table_set_homogeneous(grid, homogeneous) diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index d3f6ff312d..abeb38deb9 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -231,7 +231,7 @@ reset_hostlist_table_data(hostlist_table *hosts) /* delete all hosts */ for(i=0;i<hosts->num_hosts;i++){ hostlist_talker_t *host = &g_array_index(hosts->hosts, hostlist_talker_t, i); - g_free((gpointer)host->address.data); + g_free((gpointer)host->myaddress.data); } if (hosts->hosts) @@ -315,7 +315,7 @@ hostlist_sort_column(GtkTreeModel *model, switch(data_column){ case 0: /* Address */ - return(CMP_ADDRESS(&host1->address, &host2->address)); + return(CMP_ADDRESS(&host1->myaddress, &host2->myaddress)); case 1: /* (Port) */ CMP_INT(host1->port, host2->port); #ifdef HAVE_GEOIP @@ -374,10 +374,10 @@ hostlist_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint c sport=hostlist_port_to_str(host->port_type, host->port); str = g_strdup_printf("%s==%s%s%s%s%s", - hostlist_get_filter_name(&host->address, host->sat, host->port_type, FN_ANY_ADDRESS), - ep_address_to_str(&host->address), + hostlist_get_filter_name(&host->myaddress, host->sat, host->port_type, FN_ANY_ADDRESS), + ep_address_to_str(&host->myaddress), sport?" && ":"", - sport?hostlist_get_filter_name(&host->address, host->sat, host->port_type, FN_ANY_PORT):"", + sport?hostlist_get_filter_name(&host->myaddress, host->sat, host->port_type, FN_ANY_PORT):"", sport?"==":"", sport?sport:""); @@ -624,9 +624,9 @@ get_hostlist_table_address(hostlist_table *hl, hostlist_talker_t *host, const ch guint32 pt; if (!hl->resolve_names) - entries[0] = ep_address_to_str(&host->address); + entries[0] = ep_address_to_str(&host->myaddress); else - entries[0] = (char *)get_addr_name(&host->address); + entries[0] = (char *)get_addr_name(&host->myaddress); pt = host->port_type; if(!hl->resolve_names) pt = PT_NONE; @@ -716,7 +716,7 @@ draw_hostlist_table_data(hostlist_table *hl) char *geoip[NUM_GEOIP_COLS]; guint j; - if ((host->address.type == AT_IPv4 || host->address.type == AT_IPv6) && !hl->geoip_visible) { + if ((host->myaddress.type == AT_IPv4 || host->myaddress.type == AT_IPv6) && !hl->geoip_visible) { GList *columns, *list; GtkTreeViewColumn *column; columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(hl->table)); @@ -739,12 +739,12 @@ draw_hostlist_table_data(hostlist_table *hl) /* Filled in from the GeoIP config, if any */ for (j = 0; j < NUM_GEOIP_COLS; j++) { - if (host->address.type == AT_IPv4 && j < geoip_db_num_dbs()) { - const guchar *name = geoip_db_lookup_ipv4(j, pntohl(host->address.data), "-"); + if (host->myaddress.type == AT_IPv4 && j < geoip_db_num_dbs()) { + const guchar *name = geoip_db_lookup_ipv4(j, pntohl(host->myaddress.data), "-"); geoip[j] = g_strdup(name); - } else if (host->address.type == AT_IPv6 && j < geoip_db_num_dbs()) { + } else if (host->myaddress.type == AT_IPv6 && j < geoip_db_num_dbs()) { const guchar *name; - const struct e_in6_addr *addr = (const struct e_in6_addr *) host->address.data; + const struct e_in6_addr *addr = (const struct e_in6_addr *) host->myaddress.data; name = geoip_db_lookup_ipv6(j, *addr, "-"); geoip[j] = g_strdup(name); @@ -1755,7 +1755,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_) * is to be exact. */ typedef struct { - address address; + address myaddress; guint32 port; } host_key_t; @@ -1766,7 +1766,7 @@ host_hash(gconstpointer v) guint hash_val; hash_val = 0; - ADD_ADDRESS_TO_HASH(hash_val, &key->address); + ADD_ADDRESS_TO_HASH(hash_val, &key->myaddress); hash_val += key->port; return hash_val; } @@ -1781,7 +1781,7 @@ host_match(gconstpointer v, gconstpointer w) const host_key_t *v2 = (const host_key_t *)w; if (v1->port == v2->port && - ADDRESSES_EQUAL(&v1->address, &v2->address)) { + ADDRESSES_EQUAL(&v1->myaddress, &v2->myaddress)) { return 1; } /* @@ -1810,7 +1810,7 @@ add_hostlist_table_data(hostlist_table *hl, const address *addr, guint32 port, g /* try to find it among the existing known conversations */ host_key_t existing_key; - existing_key.address = *addr; + existing_key.myaddress = *addr; existing_key.port = port; talker_idx = GPOINTER_TO_UINT(g_hash_table_lookup(hl->hashtable, &existing_key)); if (talker_idx) { @@ -1825,7 +1825,7 @@ add_hostlist_table_data(hostlist_table *hl, const address *addr, guint32 port, g host_key_t *new_key; hostlist_talker_t host; - COPY_ADDRESS(&host.address, addr); + COPY_ADDRESS(&host.myaddress, addr); host.sat=sat; host.port_type=port_type_val; host.port=port; @@ -1842,7 +1842,7 @@ add_hostlist_table_data(hostlist_table *hl, const address *addr, guint32 port, g /* hl->hosts address is not a constant but address.data is */ new_key = g_new(host_key_t,1); - SET_ADDRESS(&new_key->address, talker->address.type, talker->address.len, talker->address.data); + SET_ADDRESS(&new_key->myaddress, talker->myaddress.type, talker->myaddress.len, talker->myaddress.data); new_key->port = port; g_hash_table_insert(hl->hashtable, new_key, GUINT_TO_POINTER(talker_idx +1)); hl->num_hosts++; diff --git a/ui/gtk/hostlist_table.h b/ui/gtk/hostlist_table.h index 3893d728c0..08f1017261 100644 --- a/ui/gtk/hostlist_table.h +++ b/ui/gtk/hostlist_table.h @@ -34,7 +34,7 @@ /** Hostlist information */ typedef struct _hostlist_talker_t { - address address; /**< address */ + address myaddress; /**< address */ SAT_E sat; /**< address type */ guint32 port_type; /**< port_type (e.g. PT_TCP) */ guint32 port; /**< port */ diff --git a/ui/gtk/main.c b/ui/gtk/main.c index 8bf1478d77..131f73183d 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -630,7 +630,7 @@ get_filter_from_packet_list_row_and_column(gpointer data) void match_selected_plist_cb(gpointer data, MATCH_SELECTED_E action) { - match_selected_cb_do(g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY), + match_selected_cb_do((GtkWidget *)g_object_get_data(G_OBJECT(data), E_DFILTER_TE_KEY), action, get_filter_from_packet_list_row_and_column((GtkWidget *)data)); } @@ -2188,7 +2188,7 @@ main(int argc, char *argv[]) GtkWidget *splash_win = NULL; GLogLevelFlags log_flags; guint go_to_packet = 0; - gboolean jump_backwards = FALSE; + search_direction jump_backwards = SD_FORWARD; dfilter_t *jump_to_filter = NULL; int optind_initial; int status; @@ -2498,14 +2498,14 @@ main(int argc, char *argv[]) /* We might want to have component specific log levels later ... */ - log_flags = - G_LOG_LEVEL_ERROR| + log_flags = (GLogLevelFlags) + (G_LOG_LEVEL_ERROR| G_LOG_LEVEL_CRITICAL| G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE| G_LOG_LEVEL_INFO| G_LOG_LEVEL_DEBUG| - G_LOG_FLAG_FATAL|G_LOG_FLAG_RECURSION; + G_LOG_FLAG_FATAL|G_LOG_FLAG_RECURSION); g_log_set_handler(NULL, log_flags, @@ -2644,7 +2644,7 @@ main(int argc, char *argv[]) dfilter = optarg; break; case 'j': /* Search backwards for a matching packet from filter in option J */ - jump_backwards = TRUE; + jump_backwards = SD_BACKWARD; break; case 'g': /* Go to packet with the given packet number */ go_to_packet = get_positive_int(optarg, "go to packet"); diff --git a/ui/gtk/main_airpcap_toolbar.c b/ui/gtk/main_airpcap_toolbar.c index b51e06c920..9fbcd67ad1 100644 --- a/ui/gtk/main_airpcap_toolbar.c +++ b/ui/gtk/main_airpcap_toolbar.c @@ -396,7 +396,7 @@ void airpcap_toolbar_show(GtkWidget *lcl_wireless_tb _U_) case AIRPCAP_DLL_OLD: if(recent.airpcap_driver_check_show) { - driver_warning_dialog = simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", + driver_warning_dialog = (GtkWidget *)simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", "WARNING: The version of AirPcap on this system\n" "does not support driver-level decryption. Please\n" "download a more recent version from\n" "http://www.cacetech.com/support/downloads.htm \n"); diff --git a/ui/gtk/main_filter_toolbar.c b/ui/gtk/main_filter_toolbar.c index a650f37956..1be01fa61a 100644 --- a/ui/gtk/main_filter_toolbar.c +++ b/ui/gtk/main_filter_toolbar.c @@ -88,9 +88,9 @@ filter_activate_cb(GtkWidget *w _U_, gpointer data) static void filter_changed_cb(GtkWidget *w _U_, gpointer data) { - gtk_widget_set_sensitive (g_object_get_data (G_OBJECT(data), E_DFILTER_APPLY_KEY), TRUE); - gtk_widget_set_sensitive (g_object_get_data (G_OBJECT(data), E_DFILTER_CLEAR_KEY), TRUE); - gtk_widget_set_sensitive (g_object_get_data (G_OBJECT(data), E_DFILTER_SAVE_KEY), TRUE); + gtk_widget_set_sensitive ((GtkWidget *)g_object_get_data (G_OBJECT(data), E_DFILTER_APPLY_KEY), TRUE); + gtk_widget_set_sensitive ((GtkWidget *)g_object_get_data (G_OBJECT(data), E_DFILTER_CLEAR_KEY), TRUE); + gtk_widget_set_sensitive ((GtkWidget *)g_object_get_data (G_OBJECT(data), E_DFILTER_SAVE_KEY), TRUE); } /* redisplay with no display filter */ @@ -99,7 +99,7 @@ filter_reset_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *filter_te = NULL; - if ((filter_te = g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY))) { + if ((filter_te = (GtkWidget *)g_object_get_data(G_OBJECT(w), E_DFILTER_TE_KEY))) { gtk_entry_set_text(GTK_ENTRY(filter_te), ""); } main_filter_packets(&cfile, NULL, FALSE); @@ -334,7 +334,7 @@ dfilter_combo_add(GtkWidget *filter_cm, char *s) { * of the combo box GList to the user's recent file */ void dfilter_recent_combo_write_all(FILE *rf) { - GtkWidget *filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY); + GtkWidget *filter_cm = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY); GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX(filter_cm)); GtkTreeIter iter; GValue value = { 0, {{0}}}; @@ -357,7 +357,7 @@ dfilter_recent_combo_write_all(FILE *rf) { /* add a display filter coming from the user's recent file to the dfilter combo box */ gboolean dfilter_combo_add_recent(const gchar *s) { - GtkWidget *filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY); + GtkWidget *filter_cm = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY); char *dupstr; dupstr = g_strdup(s); @@ -369,7 +369,7 @@ dfilter_combo_add_recent(const gchar *s) { gboolean main_filter_packets(capture_file *cf, const gchar *dftext, gboolean force) { - GtkWidget *filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY); + GtkWidget *filter_cm = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY); gboolean free_filter = TRUE; char *s; cf_status_t cf_status; @@ -379,10 +379,10 @@ main_filter_packets(capture_file *cf, const gchar *dftext, gboolean force) cf_status = cf_filter_packets(cf, s, force); if (cf_status == CF_OK) { - gtk_widget_set_sensitive (g_object_get_data (G_OBJECT(filter_cm), E_DFILTER_APPLY_KEY), FALSE); + gtk_widget_set_sensitive ((GtkWidget *)g_object_get_data (G_OBJECT(filter_cm), E_DFILTER_APPLY_KEY), FALSE); if (!s || strlen (s) == 0) { - gtk_widget_set_sensitive (g_object_get_data (G_OBJECT(filter_cm), E_DFILTER_CLEAR_KEY), FALSE); - gtk_widget_set_sensitive (g_object_get_data (G_OBJECT(filter_cm), E_DFILTER_SAVE_KEY), FALSE); + gtk_widget_set_sensitive ((GtkWidget *)g_object_get_data (G_OBJECT(filter_cm), E_DFILTER_CLEAR_KEY), FALSE); + gtk_widget_set_sensitive ((GtkWidget *)g_object_get_data (G_OBJECT(filter_cm), E_DFILTER_SAVE_KEY), FALSE); } } diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c index 3da0531af2..51e76b9aef 100644 --- a/ui/gtk/main_menubar.c +++ b/ui/gtk/main_menubar.c @@ -449,7 +449,7 @@ goto_conversation_frame(gboolean dir) return; } - found_packet = cf_find_packet_dfilter(&cfile, dfcode, dir); + found_packet = cf_find_packet_dfilter(&cfile, dfcode, dir?SD_BACKWARD:SD_FORWARD); if (!found_packet) { /* We didn't find a packet */ @@ -496,7 +496,7 @@ static void copy_as_filter_cb(GtkAction *action _U_, gpointer user_data _U_) { /* match_selected_ptree_cb needs the popup_menu_object to get the right object E_DFILTER_TE_KEY */ - match_selected_ptree_cb( popup_menu_object, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + match_selected_ptree_cb( popup_menu_object, (MATCH_SELECTED_E)(MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY)); } static void @@ -1939,9 +1939,9 @@ apply_selected_filter_cb(GtkAction *action, gpointer user_data) /* path starts with "<Actions>" */ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){ /* Use different callbacks depending action path */ - match_selected_plist_cb(user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW)); } else { - match_selected_ptree_cb(user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW); + match_selected_ptree_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_REPLACE|MATCH_SELECTED_APPLY_NOW)); } } @@ -1953,9 +1953,9 @@ apply_not_selected_cb(GtkAction *action, gpointer user_data) /* path starts with "<Actions>" */ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){ /* Use different callbacks depending action path */ - match_selected_plist_cb(user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW)); } else { - match_selected_ptree_cb(user_data, MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_ptree_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_NOT|MATCH_SELECTED_APPLY_NOW)); } } @@ -1967,9 +1967,9 @@ apply_and_selected_cb(GtkAction *action, gpointer user_data) /* path starts with "<Actions>" */ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){ /* Use different callbacks depending action path */ - match_selected_plist_cb(user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW)); } else { - match_selected_ptree_cb(user_data, MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW); + match_selected_ptree_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_AND|MATCH_SELECTED_APPLY_NOW)); } } @@ -1981,9 +1981,9 @@ apply_or_selected_cb(GtkAction *action, gpointer user_data) /* path starts with "<Actions>" */ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){ /* Use different callbacks depending action path */ - match_selected_plist_cb(user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW)); } else { - match_selected_ptree_cb(user_data, MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW); + match_selected_ptree_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_OR|MATCH_SELECTED_APPLY_NOW)); } } @@ -1995,9 +1995,9 @@ apply_and_not_selected_cb(GtkAction *action, gpointer user_data) /* path starts with "<Actions>" */ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){ /* Use different callbacks depending action path */ - match_selected_plist_cb(user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW)); } else { - match_selected_ptree_cb(user_data, MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_ptree_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_AND_NOT|MATCH_SELECTED_APPLY_NOW)); } } @@ -2009,9 +2009,9 @@ apply_or_not_selected_cb(GtkAction *action, gpointer user_data) /* path starts with "<Actions>" */ if (strncmp (path+9,"/PacketListPopUpMenuActionGroup",31) == 0){ /* Use different callbacks depending action path */ - match_selected_plist_cb(user_data,MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_plist_cb(user_data,(MATCH_SELECTED_E)(MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW)); } else { - match_selected_ptree_cb(user_data, MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW); + match_selected_ptree_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_OR_NOT|MATCH_SELECTED_APPLY_NOW)); } } @@ -2485,37 +2485,37 @@ packet_list_menu_copy_sum_csv(GtkAction *action _U_, gpointer user_data) static void packet_list_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data) { - match_selected_plist_cb(user_data, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + match_selected_plist_cb(user_data, (MATCH_SELECTED_E)(MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY)); } static void packet_list_menu_copy_bytes_oht_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_ALLINFO | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, (copy_data_type)(CD_ALLINFO | CD_FLAGS_SELECTEDONLY)); } static void packet_list_menu_copy_bytes_oh_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, (copy_data_type)(CD_HEXCOLUMNS | CD_FLAGS_SELECTEDONLY)); } static void packet_list_menu_copy_bytes_text_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_TEXTONLY | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, (copy_data_type)(CD_TEXTONLY | CD_FLAGS_SELECTEDONLY)); } static void packet_list_menu_copy_bytes_hex_strm_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_HEX | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, (copy_data_type)(CD_HEX | CD_FLAGS_SELECTEDONLY)); } static void packet_list_menu_copy_bytes_bin_strm_cb(GtkAction *action _U_, gpointer user_data) { - copy_hex_cb( NULL /* widget _U_ */ , user_data, CD_BINARY | CD_FLAGS_SELECTEDONLY); + copy_hex_cb( NULL /* widget _U_ */ , user_data, (copy_data_type)(CD_BINARY | CD_FLAGS_SELECTEDONLY)); } /* tree */ @@ -2609,7 +2609,7 @@ static void tree_view_menu_copy_as_flt(GtkAction *action _U_, gpointer user_data _U_) { /* match_selected_ptree_cb needs the popup_menu_object to get the right object E_DFILTER_TE_KEY */ - match_selected_ptree_cb( popup_menu_object, MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY); + match_selected_ptree_cb( popup_menu_object, (MATCH_SELECTED_E)(MATCH_SELECTED_REPLACE|MATCH_SELECTED_COPY_ONLY)); } static const char *ui_desc_packet_list_heading_menu_popup = @@ -3325,7 +3325,7 @@ menus_init(void) popup_menu_object); /* data to pass to the action callbacks */ gtk_action_group_add_toggle_actions(packet_list_heading_action_group, /* the action group */ - (gpointer)packet_list_heading_menu_toggle_action_entries, /* an array of action descriptions */ + (GtkToggleActionEntry *)packet_list_heading_menu_toggle_action_entries, /* an array of action descriptions */ G_N_ELEMENTS(packet_list_heading_menu_toggle_action_entries), /* the number of entries */ NULL); /* data to pass to the action callbacks */ @@ -3352,13 +3352,13 @@ menus_init(void) packet_list_action_group = gtk_action_group_new ("PacketListPopUpMenuActionGroup"); gtk_action_group_add_actions (packet_list_action_group, /* the action group */ - (gpointer)packet_list_menu_popup_action_entries, /* an array of action descriptions */ + (GtkActionEntry *)packet_list_menu_popup_action_entries, /* an array of action descriptions */ G_N_ELEMENTS(packet_list_menu_popup_action_entries), /* the number of entries */ popup_menu_object); /* data to pass to the action callbacks */ /* Add the filter menu items */ gtk_action_group_add_actions (packet_list_action_group, /* the action group */ - (gpointer)apply_prepare_filter_action_entries, /* an array of action descriptions */ + (GtkActionEntry *)apply_prepare_filter_action_entries, /* an array of action descriptions */ G_N_ELEMENTS(apply_prepare_filter_action_entries), /* the number of entries */ popup_menu_object); /* data to pass to the action callbacks */ @@ -3387,14 +3387,14 @@ menus_init(void) packet_list_details_action_group = gtk_action_group_new ("PacketListDetailsMenuPopUpActionGroup"); gtk_action_group_add_actions (packet_list_details_action_group, /* the action group */ - (gpointer)tree_view_menu_popup_action_entries, /* an array of action descriptions */ + (GtkActionEntry *)tree_view_menu_popup_action_entries, /* an array of action descriptions */ G_N_ELEMENTS(tree_view_menu_popup_action_entries), /* the number of entries */ popup_menu_object); /* data to pass to the action callbacks */ /* Add the filter menu items */ gtk_action_group_add_actions (packet_list_details_action_group, /* the action group */ - (gpointer)apply_prepare_filter_action_entries, /* an array of action descriptions */ - G_N_ELEMENTS(apply_prepare_filter_action_entries), /* the number of entries */ + (GtkActionEntry *)apply_prepare_filter_action_entries, /* an array of action descriptions */ + G_N_ELEMENTS(apply_prepare_filter_action_entries), /* the number of entries */ popup_menu_object); /* data to pass to the action callbacks */ @@ -3432,7 +3432,7 @@ menus_init(void) gtk_action_group_add_radio_actions (packet_list_byte_menu_action_group, /* the action group */ - (gpointer)bytes_menu_radio_action_entries, /* an array of radio action descriptions */ + (GtkRadioActionEntry *)bytes_menu_radio_action_entries, /* an array of radio action descriptions */ G_N_ELEMENTS(bytes_menu_radio_action_entries), /* the number of entries */ recent.gui_bytes_view, /* the value of the action to activate initially, or -1 if no action should be activated */ G_CALLBACK(select_bytes_view_cb), /* the callback to connect to the changed signal */ @@ -3479,7 +3479,7 @@ menus_init(void) /* Add the filter menu actions */ gtk_action_group_add_actions (main_menu_bar_action_group, /* the action group */ - (gpointer)apply_prepare_filter_action_entries, /* an array of action descriptions */ + (GtkActionEntry *)apply_prepare_filter_action_entries, /* an array of action descriptions */ G_N_ELEMENTS(apply_prepare_filter_action_entries), /* the number of entries */ popup_menu_object); /* data to pass to the action callbacks */ @@ -3535,7 +3535,7 @@ menus_init(void) statusbar_profiles_action_group = gtk_action_group_new ("StatusBarProfilesPopUpMenuActionGroup"); gtk_action_group_add_actions (statusbar_profiles_action_group, /* the action group */ - (gpointer)statusbar_profiles_menu_action_entries, /* an array of action descriptions */ + (GtkActionEntry *)statusbar_profiles_menu_action_entries, /* an array of action descriptions */ G_N_ELEMENTS(statusbar_profiles_menu_action_entries), /* the number of entries */ popup_menu_object); /* data to pass to the action callbacks */ @@ -3610,7 +3610,7 @@ ws_menubar_build_external_menus(void) void (*callback)(gpointer); while (build_menubar_items_callback_list != NULL) { - callback = build_menubar_items_callback_list->data; + callback = (void (*)(gpointer))build_menubar_items_callback_list->data; callback(ui_manager_main_menubar); build_menubar_items_callback_list = g_list_next(build_menubar_items_callback_list); } @@ -4646,13 +4646,13 @@ menu_recent_read_finished(void) switch (recent.gui_seconds_format) { case TS_SECONDS_DEFAULT: - recent.gui_seconds_format = -1; + recent.gui_seconds_format = (ts_seconds_type)-1; /* set_active will not trigger the callback when deactivating an inactive item! */ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), FALSE); break; case TS_SECONDS_HOUR_MIN_SEC: - recent.gui_seconds_format = -1; + recent.gui_seconds_format = (ts_seconds_type)-1; /* set_active will not trigger the callback when activating an active item! */ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), FALSE); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu), TRUE); diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index a3fe598f1a..8c8866c5df 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -709,7 +709,7 @@ statusbar_set_filename(const char *file_name, gint64 file_length, nstime_t *file status_expert_update(); /* statusbar */ - size_str = format_size(file_length, format_size_unit_bytes|format_size_prefix_si); + size_str = format_size(file_length, (format_size_flags_e)(format_size_unit_bytes|format_size_prefix_si)); statusbar_push_file_msg(" File: \"%s\" %s %02lu:%02lu:%02lu", (file_name) ? file_name : "", size_str, @@ -828,7 +828,7 @@ static void statusbar_capture_update_continue_cb(capture_options *capture_opts) { GString *interface_names; - capture_file *cf = capture_opts->cf; + capture_file *cf = (capture_file *)capture_opts->cf; status_expert_update(); @@ -857,7 +857,7 @@ statusbar_capture_update_continue_cb(capture_options *capture_opts) static void statusbar_capture_update_finished_cb(capture_options *capture_opts) { - capture_file *cf = capture_opts->cf; + capture_file *cf = (capture_file *)capture_opts->cf; /* Pop the "<live capture in progress>" message off the status bar. */ statusbar_pop_file_msg(); @@ -884,7 +884,7 @@ statusbar_capture_fixed_started_cb(capture_options *capture_opts) static void statusbar_capture_fixed_continue_cb(capture_options *capture_opts) { - capture_file *cf = capture_opts->cf; + capture_file *cf = (capture_file *)capture_opts->cf; gchar *capture_msg; @@ -998,28 +998,28 @@ statusbar_cf_callback(gint event, gpointer data, gpointer user_data _U_) case(cf_cb_file_opened): break; case(cf_cb_file_closing): - statusbar_cf_file_closing_cb(data); + statusbar_cf_file_closing_cb((capture_file *)data); break; case(cf_cb_file_closed): - statusbar_cf_file_closed_cb(data); + statusbar_cf_file_closed_cb((capture_file *)data); break; case(cf_cb_file_read_started): - statusbar_cf_file_read_started_cb(data, "Loading"); + statusbar_cf_file_read_started_cb((capture_file *)data, "Loading"); break; case(cf_cb_file_read_finished): - statusbar_cf_file_read_finished_cb(data); + statusbar_cf_file_read_finished_cb((capture_file *)data); break; case(cf_cb_file_reload_started): - statusbar_cf_file_read_started_cb(data, "Reloading"); + statusbar_cf_file_read_started_cb((capture_file *)data, "Reloading"); break; case(cf_cb_file_reload_finished): - statusbar_cf_file_read_finished_cb(data); + statusbar_cf_file_read_finished_cb((capture_file *)data); break; case(cf_cb_file_rescan_started): - statusbar_cf_file_read_started_cb(data, "Rescanning"); + statusbar_cf_file_read_started_cb((capture_file *)data, "Rescanning"); break; case(cf_cb_file_rescan_finished): - statusbar_cf_file_read_finished_cb(data); + statusbar_cf_file_read_finished_cb((capture_file *)data); break; case(cf_cb_file_fast_save_finished): break; @@ -1028,10 +1028,10 @@ statusbar_cf_callback(gint event, gpointer data, gpointer user_data _U_) case(cf_cb_packet_unselected): break; case(cf_cb_field_unselected): - statusbar_cf_field_unselected_cb(data); + statusbar_cf_field_unselected_cb((capture_file *)data); break; case(cf_cb_file_save_started): - statusbar_cf_file_save_started_cb(data); + statusbar_cf_file_save_started_cb((gchar *)data); break; case(cf_cb_file_save_finished): statusbar_cf_file_save_finished_cb(data); @@ -1043,7 +1043,7 @@ statusbar_cf_callback(gint event, gpointer data, gpointer user_data _U_) statusbar_cf_file_save_stopped_cb(data); break; case(cf_cb_file_export_specified_packets_started): - statusbar_cf_file_export_specified_packets_started_cb(data); + statusbar_cf_file_export_specified_packets_started_cb((gchar *)data); break; case(cf_cb_file_export_specified_packets_finished): statusbar_cf_file_export_specified_packets_finished_cb(data); diff --git a/ui/gtk/main_titlebar.c b/ui/gtk/main_titlebar.c index a269fe49bc..0b75a5bb0f 100644 --- a/ui/gtk/main_titlebar.c +++ b/ui/gtk/main_titlebar.c @@ -49,7 +49,7 @@ main_set_window_name(const gchar *window_name) gchar *old_window_name; /* Attach the new un-decorated window name to the window. */ - old_window_name = g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); + old_window_name = (gchar *)g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); g_free(old_window_name); g_object_set_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY, g_strdup(window_name)); @@ -66,7 +66,7 @@ main_titlebar_update(void) gchar *title; /* Get the current filename or other title set in main_set_window_name */ - window_name = g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); + window_name = (gchar *)g_object_get_data(G_OBJECT(top_level), MAIN_WINDOW_NAME_KEY); if (window_name != NULL) { /* Optionally append the user-defined window title */ title = create_user_window_title(window_name); diff --git a/ui/gtk/main_toolbar.c b/ui/gtk/main_toolbar.c index f651511723..2abec2bea0 100644 --- a/ui/gtk/main_toolbar.c +++ b/ui/gtk/main_toolbar.c @@ -84,17 +84,17 @@ toolbar_redraw_all(void) GtkWidget *main_tb; GtkWidget *filter_tb; - main_tb = g_object_get_data(G_OBJECT(top_level), E_TB_MAIN_KEY); + main_tb = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_TB_MAIN_KEY); gtk_toolbar_set_style(GTK_TOOLBAR(main_tb), - prefs.gui_toolbar_main_style); + (GtkToolbarStyle)prefs.gui_toolbar_main_style); - filter_tb = g_object_get_data(G_OBJECT(top_level), E_TB_FILTER_KEY); + filter_tb = (GtkWidget *)g_object_get_data(G_OBJECT(top_level), E_TB_FILTER_KEY); /* In case the filter toolbar hasn't been built */ if(filter_tb) gtk_toolbar_set_style(GTK_TOOLBAR(filter_tb), - prefs.gui_toolbar_filter_style); + (GtkToolbarStyle)prefs.gui_toolbar_filter_style); } /* Enable or disable toolbar items based on whether you have a capture file diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c index f4868d003f..41b9cc34d1 100644 --- a/ui/gtk/main_welcome.c +++ b/ui/gtk/main_welcome.c @@ -163,7 +163,7 @@ scroll_box_dynamic_add(GtkWidget *parent_box) guint scrollw_y_size; GList *childs; - child_box = g_object_get_data(G_OBJECT(parent_box), SCROLL_BOX_CHILD_BOX); + child_box = (GtkWidget *)g_object_get_data(G_OBJECT(parent_box), SCROLL_BOX_CHILD_BOX); max_cnt = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(parent_box), SCROLL_BOX_MAX_CHILDS)); /* get the current number of children */ @@ -203,8 +203,8 @@ scroll_box_dynamic_reset(GtkWidget *parent_box) GtkWidget *child_box, *scrollw; - child_box = g_object_get_data(G_OBJECT(parent_box), SCROLL_BOX_CHILD_BOX); - scrollw = g_object_get_data(G_OBJECT(parent_box), SCROLL_BOX_SCROLLW); + child_box = (GtkWidget *)g_object_get_data(G_OBJECT(parent_box), SCROLL_BOX_CHILD_BOX); + scrollw = (GtkWidget *)g_object_get_data(G_OBJECT(parent_box), SCROLL_BOX_SCROLLW); if(scrollw != NULL) { /* move the child_box back from scrolled window into the parent_box */ @@ -310,7 +310,7 @@ welcome_button(const gchar *stock_item, static gboolean welcome_button_callback_helper(GtkWidget *w, GdkEventButton *event _U_, gpointer user_data) { - void (*funct)(GtkWidget *, gpointer) = user_data; + void (*funct)(GtkWidget *, gpointer) = (void (*)(GtkWidget *,gpointer))user_data; (*funct)(w, NULL); return TRUE; } @@ -407,7 +407,7 @@ welcome_header_pop_msg(void) { } if (status_messages) { - msg = status_messages->data; + msg = (gchar *)status_messages->data; } welcome_header_set_message(msg); @@ -481,7 +481,7 @@ welcome_topic_new(const char *header, GtkWidget **to_fill) static gboolean welcome_filename_link_press_cb(GtkWidget *widget _U_, GdkEventButton *event _U_, gpointer data) { - menu_open_filename(data); + menu_open_filename((gchar *)data); return FALSE; } @@ -520,7 +520,7 @@ static void *get_recent_item_status(void *data) g_mutex_lock(recent_mtx); ri_stat->err = err; if(err == 0) { - size_str = format_size(stat_buf.st_size, format_size_unit_bytes|format_size_prefix_si); + size_str = format_size(stat_buf.st_size, (format_size_flags_e)(format_size_unit_bytes|format_size_prefix_si)); /* pango format string */ g_string_prepend(ri_stat->str, "<span foreground='blue'>"); @@ -629,7 +629,7 @@ welcome_filename_link_new(const gchar *filename, GtkWidget **label, GObject *men gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.0f); gtk_widget_set_sensitive(w, FALSE); - ri_stat = g_malloc(sizeof(recent_item_status)); + ri_stat = (recent_item_status *)g_malloc(sizeof(recent_item_status)); ri_stat->filename = g_strdup(filename); ri_stat->label = w; ri_stat->menu_item = menu_item; @@ -681,7 +681,7 @@ main_welcome_reset_recent_capture_files(void) child_list_item = child_list; while(child_list_item) { - gtk_container_remove(GTK_CONTAINER(child_box), child_list_item->data); + gtk_container_remove(GTK_CONTAINER(child_box), (GtkWidget *)child_list_item->data); child_list_item = g_list_next(child_list_item); } @@ -765,7 +765,7 @@ static gboolean activate_ifaces(GtkTreeModel *model, GtkTreeSelection *selection; selected_name_t *entry = (selected_name_t *)userdata; - view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES); + view = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); gtk_tree_model_get (model, iter, IFACE_NAME, &if_name, -1); if (strcmp(if_name, entry->name) == 0) { @@ -785,7 +785,7 @@ void change_interface_selection(gchar* name, gboolean activate) GtkTreeModel *model; selected_name_t entry; - view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES); + view = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES); model = gtk_tree_view_get_model(GTK_TREE_VIEW(view)); entry.name = g_strdup(name); entry.activate = activate; @@ -813,7 +813,7 @@ change_interface_name(gchar *oldname, guint indx) GtkTreeSelection *entry; gchar *optname; - view = g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES); + view = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), TREE_VIEW_INTERFACES); entry = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); model = gtk_tree_view_get_model(GTK_TREE_VIEW(view)); @@ -864,19 +864,19 @@ clear_capture_box(void) { GtkWidget *item_hb; - item_hb = g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_INTERFACE_LIST); + item_hb = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_INTERFACE_LIST); if (item_hb) { gtk_widget_destroy(item_hb); } - item_hb = g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_START); + item_hb = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_START); if (item_hb) { gtk_widget_destroy(item_hb); } - item_hb = g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_CAPTURE); + item_hb = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_CAPTURE); if (item_hb) { gtk_widget_destroy(item_hb); } - item_hb = g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_REFRESH); + item_hb = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_REFRESH); if (item_hb) { gtk_widget_destroy(item_hb); } @@ -968,11 +968,11 @@ static void fill_capture_box(void) DWORD ce_size = sizeof(chimney_enabled); #endif - label = g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_LABEL); + label = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_LABEL); if (label) { gtk_widget_destroy(label); } - box_to_fill = g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_VIEW); + box_to_fill = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_VIEW); if (global_capture_opts.all_ifaces->len > 0) { item_hb_interface_list = welcome_button(WIRESHARK_STOCK_CAPTURE_INTERFACES, "Interface List", @@ -1142,7 +1142,7 @@ welcome_if_panel_reload(void) update_capture_box(); } else { GtkWidget *item_hb; - item_hb = g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_REFRESH); + item_hb = (GtkWidget *)g_object_get_data(G_OBJECT(welcome_hb), CAPTURE_HB_BOX_REFRESH); if (item_hb) { gtk_widget_destroy(item_hb); } @@ -1411,7 +1411,7 @@ welcome_new(void) gtk_widget_show_all(welcome_scrollw); #if GLIB_CHECK_VERSION(2,31,0) - recent_mtx = g_malloc(sizeof(GMutex)); + recent_mtx = (GMutex *)g_malloc(sizeof(GMutex)); g_mutex_init(recent_mtx); #else recent_mtx = g_mutex_new(); diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index 6da8af5dd8..55b8bf4169 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -167,7 +167,7 @@ manual_addr_resolv_dlg(GtkWidget *w _U_, gpointer data) bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL); gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(ok_bt, "clicked", G_CALLBACK(man_addr_resolv_ok), NULL); gtk_widget_set_sensitive(ok_bt, FALSE); diff --git a/ui/gtk/mcast_stream.c b/ui/gtk/mcast_stream.c index dc9193a32f..dd90e253e5 100644 --- a/ui/gtk/mcast_stream.c +++ b/ui/gtk/mcast_stream.c @@ -83,8 +83,8 @@ static mcaststream_tapinfo_t the_tapinfo_struct = static gint mcast_stream_info_cmp(gconstpointer aa, gconstpointer bb) { - const struct _mcast_stream_info* a = aa; - const struct _mcast_stream_info* b = bb; + const struct _mcast_stream_info* a = (const struct _mcast_stream_info *)aa; + const struct _mcast_stream_info* b = (const struct _mcast_stream_info *)bb; if (a==b) return 0; @@ -136,7 +136,7 @@ mcaststream_reset(mcaststream_tapinfo_t *tapinfo) static void mcaststream_reset_cb(void *arg) { - mcaststream_reset(arg); + mcaststream_reset((mcaststream_tapinfo_t *)arg); } /****************************************************************************/ @@ -158,7 +158,7 @@ mcaststream_draw(void *arg _U_) static int mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2 _U_) { - mcaststream_tapinfo_t *tapinfo = arg; + mcaststream_tapinfo_t *tapinfo = (mcaststream_tapinfo_t *)arg; mcast_stream_info_t tmp_strinfo; mcast_stream_info_t *strinfo = NULL; GList* list; @@ -175,8 +175,8 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const * address (for IPv6). */ if ((pinfo->dl_dst.type != AT_ETHER) || - ((g_ascii_strncasecmp("01005E", bytes_to_str(pinfo->dl_dst.data, pinfo->dl_dst.len), 6) != 0) && - (g_ascii_strncasecmp("3333", bytes_to_str(pinfo->dl_dst.data, pinfo->dl_dst.len), 4) != 0)) ) + ((g_ascii_strncasecmp("01005E", bytes_to_str((guint8 *)pinfo->dl_dst.data, pinfo->dl_dst.len), 6) != 0) && + (g_ascii_strncasecmp("3333", bytes_to_str((guint8 *)pinfo->dl_dst.data, pinfo->dl_dst.len), 4) != 0)) ) return 0; /* check whether we already have a stream with these parameters in the list */ @@ -223,14 +223,14 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const tmp_strinfo.element.buffstatus=0; tmp_strinfo.element.maxbw=0; - strinfo = g_malloc(sizeof(mcast_stream_info_t)); + strinfo = (mcast_stream_info_t *)g_malloc(sizeof(mcast_stream_info_t)); *strinfo = tmp_strinfo; /* memberwise copy of struct */ tapinfo->strinfo_list = g_list_append(tapinfo->strinfo_list, strinfo); strinfo->element.buff = (struct timeval *)g_malloc(buffsize * sizeof(struct timeval)); /* set time with the first packet */ if (tapinfo->npackets == 0) { - tapinfo->allstreams = g_malloc(sizeof(mcast_stream_info_t)); + tapinfo->allstreams = (mcast_stream_info_t *)g_malloc(sizeof(mcast_stream_info_t)); tapinfo->allstreams->element.buff = (struct timeval *)g_malloc(buffsize * sizeof(struct timeval)); tapinfo->allstreams->start_rel_sec = (guint32) pinfo->fd->rel_ts.secs; diff --git a/ui/gtk/packet_list.c b/ui/gtk/packet_list.c index 71cde9b753..2d0fe48292 100644 --- a/ui/gtk/packet_list.c +++ b/ui/gtk/packet_list.c @@ -239,7 +239,7 @@ col_title_change_ok (GtkWidget *w, gpointer parent_w) gchar *escaped_title; gboolean recreate = FALSE; - col = g_object_get_data (G_OBJECT(w), COL_EDIT_COLUMN); + col = (GtkTreeViewColumn *)g_object_get_data (G_OBJECT(w), COL_EDIT_COLUMN); col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY)); title = gtk_entry_get_text(GTK_ENTRY(g_object_get_data (G_OBJECT(w), COL_EDIT_TITLE_TE))); @@ -302,10 +302,10 @@ col_details_format_changed_cb(GtkWidget *w, gpointer data _U_) GtkWidget *field_lb, *field_te, *occurrence_lb, *occurrence_te; gint cur_fmt; - field_lb = g_object_get_data (G_OBJECT(w), COL_EDIT_FIELD_LB); - field_te = g_object_get_data (G_OBJECT(w), COL_EDIT_FIELD_TE); - occurrence_lb = g_object_get_data (G_OBJECT(w), COL_EDIT_OCCURRENCE_LB); - occurrence_te = g_object_get_data (G_OBJECT(w), COL_EDIT_OCCURRENCE_TE); + field_lb = (GtkWidget *)g_object_get_data (G_OBJECT(w), COL_EDIT_FIELD_LB); + field_te = (GtkWidget *)g_object_get_data (G_OBJECT(w), COL_EDIT_FIELD_TE); + occurrence_lb = (GtkWidget *)g_object_get_data (G_OBJECT(w), COL_EDIT_OCCURRENCE_LB); + occurrence_te = (GtkWidget *)g_object_get_data (G_OBJECT(w), COL_EDIT_OCCURRENCE_TE); cur_fmt = gtk_combo_box_get_active(GTK_COMBO_BOX(w)); @@ -407,7 +407,7 @@ col_details_edit_dlg (gint col_id, GtkTreeViewColumn *col) bbox = dlg_button_row_new(GTK_STOCK_CANCEL,GTK_STOCK_OK, NULL); gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_COLUMN, col); g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_FORMAT_CMB, format_cmb); g_object_set_data (G_OBJECT(ok_bt), COL_EDIT_TITLE_TE, title_te); @@ -431,7 +431,7 @@ col_details_edit_dlg (gint col_id, GtkTreeViewColumn *col) dlg_set_activate(field_te, ok_bt); dlg_set_activate(occurrence_te, ok_bt); - cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); g_signal_connect(cancel_bt, "clicked", G_CALLBACK(col_title_change_cancel), win); window_set_cancel_button(win, cancel_bt, NULL); @@ -675,7 +675,7 @@ static gboolean packet_list_column_button_pressed_cb (GtkWidget *widget, GdkEvent *event, gpointer data) { GtkWidget *col = (GtkWidget *) data; - GtkWidget *menu = g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_COL_KEY); + GtkWidget *menu = (GtkWidget *)g_object_get_data(G_OBJECT(popup_menu_object), PM_PACKET_LIST_COL_KEY); gint col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(col), E_MPACKET_LIST_COL_KEY)); gboolean right_justify = right_justify_column (col_id); @@ -702,7 +702,7 @@ column_dnd_changed_cb(GtkTreeView *tree_view, gpointer data _U_) list = columns = gtk_tree_view_get_columns(tree_view); while (columns) { - column = columns->data; + column = (GtkTreeViewColumn *)columns->data; old_col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), E_MPACKET_LIST_COL_KEY)); clp = g_list_nth (prefs.col_list, old_col_id); @@ -1343,7 +1343,7 @@ show_cell_data_func(GtkTreeViewColumn *col _U_, GtkCellRenderer *renderer, color_t_to_gdkcolor(&bg_gdk, &prefs.gui_marked_bg); color_on = TRUE; } else if (fdata->color_filter) { - const color_filter_t *color_filter = fdata->color_filter; + const color_filter_t *color_filter = (const color_filter_t *)fdata->color_filter; color_t_to_gdkcolor(&fg_gdk, &color_filter->fg_color); color_t_to_gdkcolor(&bg_gdk, &color_filter->bg_color); @@ -1676,7 +1676,7 @@ packet_list_return_all_comments(GtkTextBuffer *buffer) } if (gtk_text_buffer_get_char_count(buffer) > MAX_COMMENTS_TO_FETCH) { buf_str = g_strdup_printf("[ Comment text exceeds %s. Stopping. ]", - format_size(MAX_COMMENTS_TO_FETCH, format_size_unit_bytes|format_size_prefix_si)); + format_size(MAX_COMMENTS_TO_FETCH, (format_size_flags_e)(format_size_unit_bytes|format_size_prefix_si))); gtk_text_buffer_insert_at_cursor (buffer, buf_str, -1); return; } diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c index c804be8cc0..800965ee17 100644 --- a/ui/gtk/packet_list_store.c +++ b/ui/gtk/packet_list_store.c @@ -294,7 +294,7 @@ packet_list_get_flags(GtkTreeModel *tree_model) g_return_val_if_fail(PACKETLIST_IS_LIST(tree_model), (GtkTreeModelFlags)0); - return (GTK_TREE_MODEL_LIST_ONLY | GTK_TREE_MODEL_ITERS_PERSIST); + return (GtkTreeModelFlags)(GTK_TREE_MODEL_LIST_ONLY | GTK_TREE_MODEL_ITERS_PERSIST); } static gint @@ -645,11 +645,11 @@ packet_list_append_record(PacketList *packet_list, frame_data *fdata) g_return_val_if_fail(PACKETLIST_IS_LIST(packet_list), -1); - newrecord = se_alloc(sizeof(PacketListRecord)); + newrecord = se_new(PacketListRecord); newrecord->columnized = FALSE; newrecord->colorized = FALSE; - newrecord->col_text_len = se_alloc0(sizeof(*newrecord->col_text_len) * packet_list->n_text_cols); - newrecord->col_text = se_alloc0(sizeof(*newrecord->col_text) * packet_list->n_text_cols); + newrecord->col_text_len = (gushort *)se_alloc0(sizeof(*newrecord->col_text_len) * packet_list->n_text_cols); + newrecord->col_text = (const gchar **)se_alloc0(sizeof(*newrecord->col_text) * packet_list->n_text_cols); newrecord->fdata = fdata; #ifdef PACKET_PARANOID_CHECKS newrecord->physical_pos = PACKET_LIST_RECORD_COUNT(packet_list->physical_rows); diff --git a/ui/gtk/packet_panes.c b/ui/gtk/packet_panes.c index ff903e63a2..897c3541ee 100644 --- a/ui/gtk/packet_panes.c +++ b/ui/gtk/packet_panes.c @@ -120,7 +120,7 @@ get_byte_view_data_and_length(GtkWidget *byte_view, guint *data_len) tvbuff_t *byte_view_tvb; const guint8 *data_ptr; - byte_view_tvb = g_object_get_data(G_OBJECT(byte_view), E_BYTE_VIEW_TVBUFF_KEY); + byte_view_tvb = (tvbuff_t *)g_object_get_data(G_OBJECT(byte_view), E_BYTE_VIEW_TVBUFF_KEY); if (byte_view_tvb == NULL) return NULL; @@ -146,7 +146,7 @@ set_notebook_page(GtkWidget *nb_ptr, tvbuff_t *tvb) (bv_page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb_ptr), num)) != NULL; num++) { bv = gtk_bin_get_child(GTK_BIN(bv_page)); - bv_tvb = g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_TVBUFF_KEY); + bv_tvb = (tvbuff_t *)g_object_get_data(G_OBJECT(bv), E_BYTE_VIEW_TVBUFF_KEY); if (bv_tvb == tvb) { /* Found it. */ gtk_notebook_set_current_page(GTK_NOTEBOOK(nb_ptr), num); @@ -289,7 +289,7 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event) int byte = -1; tvbuff_t *tvb; - tree = g_object_get_data(G_OBJECT(widget), E_BYTE_VIEW_TREE_PTR); + tree = (proto_tree *)g_object_get_data(G_OBJECT(widget), E_BYTE_VIEW_TREE_PTR); if (tree == NULL) { /* * Somebody clicked on the dummy byte view; do nothing. @@ -306,7 +306,7 @@ byte_view_select(GtkWidget *widget, GdkEventButton *event) } /* Get the data source tvbuff */ - tvb = g_object_get_data(G_OBJECT(widget), E_BYTE_VIEW_TVBUFF_KEY); + tvb = (tvbuff_t *)g_object_get_data(G_OBJECT(widget), E_BYTE_VIEW_TVBUFF_KEY); return highlight_field(tvb, byte, tree_view, tree); } @@ -512,7 +512,7 @@ add_byte_views(epan_dissect_t *edt, GtkWidget *tree_view, * of all the data sources for the specified frame. */ for (src_le = edt->pi.data_src; src_le != NULL; src_le = src_le->next) { - src = src_le->data; + src = (struct data_source *)src_le->data; add_byte_tab(byte_nb_ptr, get_data_source_name(src), get_data_source_tvb(src), edt->tree, tree_view); } @@ -647,7 +647,7 @@ copy_hex_cb(GtkWidget * w _U_, gpointer data _U_, copy_data_type data_type) g_assert(data_p != NULL); flags = data_type & CD_FLAGSMASK; - data_type = data_type & CD_TYPEMASK; + data_type = (copy_data_type)(data_type & CD_TYPEMASK); if(flags & CD_FLAGS_SELECTEDONLY) { int start, end; diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 014e612eab..9ed999311d 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -893,7 +893,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_) DataPtr->frame = cfile.current_frame; DataPtr->phdr = cfile.phdr; - DataPtr->pd = g_malloc(DataPtr->frame->cap_len); + DataPtr->pd = (guint8 *)g_malloc(DataPtr->frame->cap_len); memcpy(DataPtr->pd, cfile.pd, DataPtr->frame->cap_len); epan_dissect_init(&(DataPtr->edt), TRUE, TRUE); @@ -988,7 +988,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_) static void destroy_new_window(GObject *object _U_, gpointer user_data) { - struct PacketWinData *DataPtr = user_data; + struct PacketWinData *DataPtr = (struct PacketWinData *)user_data; detail_windows = g_list_remove(detail_windows, DataPtr); proto_tree_draw(NULL, DataPtr->tree_view); diff --git a/ui/gtk/pixmap_save.c b/ui/gtk/pixmap_save.c index a9d61cc06b..58c89d8113 100644 --- a/ui/gtk/pixmap_save.c +++ b/ui/gtk/pixmap_save.c @@ -50,7 +50,7 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_) { GtkWidget *save_as_w; #if GTK_CHECK_VERSION(2,22,0) - surface_info_t *surface_info = g_object_get_data(G_OBJECT(w), "surface-info"); + surface_info_t *surface_info = (surface_info_t *)g_object_get_data(G_OBJECT(w), "surface-info"); #else GdkPixmap *pixmap = g_object_get_data(G_OBJECT(w), "pixmap"); #endif @@ -108,7 +108,7 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_) file_formats = gdk_pixbuf_get_formats(); ffp = file_formats; while(ffp) { - pixbuf_format = ffp->data; + pixbuf_format = (GdkPixbufFormat *)ffp->data; if (gdk_pixbuf_format_is_writable(pixbuf_format)) { format_name = gdk_pixbuf_format_get_name(pixbuf_format); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(type_cm), diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index adfcdfee95..acfbc1b203 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -1943,7 +1943,7 @@ ifopts_write_new_buffersize(void) gchar *new_buffersize; /* new preferences interfaces buffer size string */ - new_buffersize = g_malloc0(MAX_VAL_LEN); + new_buffersize = (gchar *)g_malloc0(MAX_VAL_LEN); /* get buffer size for each row (interface) */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(cur_list)); @@ -2002,7 +2002,7 @@ ifopts_write_new_snaplen(void) gchar *new_snaplen; /* new preferences interfaces snap length string */ - new_snaplen = g_malloc0(MAX_VAL_LEN); + new_snaplen = (gchar *)g_malloc0(MAX_VAL_LEN); /* get snap length for each row (interface) */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(cur_list)); @@ -2060,7 +2060,7 @@ ifopts_write_new_pmode(void) gchar *new_pmode; /* new preferences interfaces promiscuous mode string */ - new_pmode = g_malloc0(MAX_VAL_LEN); + new_pmode = (gchar *)g_malloc0(MAX_VAL_LEN); /* get promiscuous mode for each row (interface) */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(cur_list)); diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index 8a28359f97..44406e1e56 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -124,8 +124,8 @@ pref_exists(pref_t *pref _U_, gpointer user_data _U_) static guint pref_show(pref_t *pref, gpointer user_data) { - GtkWidget *main_grid = user_data; - module_t *module = g_object_get_data(G_OBJECT(main_grid), E_GRID_MODULE_KEY); + GtkWidget *main_grid = (GtkWidget *)user_data; + module_t *module = (module_t *)g_object_get_data(G_OBJECT(main_grid), E_GRID_MODULE_KEY); const char *title; const char *type_name = prefs_pref_type_name(pref); char *label_string; @@ -137,7 +137,7 @@ pref_show(pref_t *pref, gpointer user_data) and left-align it. */ title = pref->title; label_len = strlen(title) + 2; - label_string = g_malloc(label_len); + label_string = (char *)g_malloc(label_len); g_strlcpy(label_string, title, label_len); tooltip_txt = pref->description? g_strdup_printf("%s.%s: %s\n%s", @@ -275,8 +275,8 @@ prefs_tree_page_add(const gchar *title, gint page_nr, { prefs_tree_iter iter; - gtk_tree_store_append(store, &iter, parent_iter); - gtk_tree_store_set(store, &iter, 0, title, 1, page_nr, -1); + gtk_tree_store_append((GtkTreeStore *)store, &iter, parent_iter); + gtk_tree_store_set((GtkTreeStore *)store, &iter, 0, title, 1, page_nr, -1); return iter; } @@ -317,7 +317,7 @@ prefs_nb_page_add(GtkWidget *notebook, const gchar *title _U_, GtkWidget *page, static guint module_prefs_show(module_t *module, gpointer user_data) { - struct ct_struct *cts = user_data; + struct ct_struct *cts = (struct ct_struct *)user_data; struct ct_struct child_cts; GtkWidget *main_vb, *main_grid, *frame, *main_sw; gchar label_str[MAX_TREE_NODE_NAME_LEN]; @@ -594,23 +594,23 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page) gtk_box_pack_start(GTK_BOX(cts.main_vb), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(ok_bt, "clicked", G_CALLBACK(prefs_main_ok_cb), prefs_w); - apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); + apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); g_signal_connect(apply_bt, "clicked", G_CALLBACK(prefs_main_apply_cb), prefs_w); - save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); + save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); g_signal_connect(save_bt, "clicked", G_CALLBACK(prefs_main_save_cb), prefs_w); g_object_set_data(G_OBJECT(prefs_w), E_PREFSW_SAVE_BT_KEY, save_bt); - cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); g_signal_connect(cancel_bt, "clicked", G_CALLBACK(prefs_main_cancel_cb), prefs_w); window_set_cancel_button(prefs_w, cancel_bt, NULL); gtk_widget_grab_default(ok_bt); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PREFERENCES_DIALOG); g_signal_connect(prefs_w, "delete_event", G_CALLBACK(prefs_main_delete_event_cb), NULL); @@ -628,16 +628,16 @@ prefs_page_cb(GtkWidget *w _U_, gpointer dummy _U_, PREFS_PAGE_E prefs_page) switch (prefs_page) { case PREFS_PAGE_LAYOUT: gtk_tree_selection_select_iter(selection, &layout_iter); - gtk_notebook_set_current_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), layout_page); + gtk_notebook_set_current_page((GtkNotebook *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), layout_page); break; case PREFS_PAGE_COLUMNS: gtk_tree_selection_select_iter(selection, &columns_iter); - gtk_notebook_set_current_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), columns_page); + gtk_notebook_set_current_page((GtkNotebook *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), columns_page); break; case PREFS_PAGE_CAPTURE: if (capture_page) { gtk_tree_selection_select_iter(selection, &capture_iter); - gtk_notebook_set_current_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), capture_page); + gtk_notebook_set_current_page((GtkNotebook *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), capture_page); } break; default: @@ -767,7 +767,7 @@ fetch_preference_radio_buttons_val(GtkWidget *button, button = NULL; for (rb_entry = rb_group; rb_entry != NULL; rb_entry = g_slist_next(rb_entry)) { - button = rb_entry->data; + button = (GtkWidget *)rb_entry->data; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) break; } @@ -946,7 +946,7 @@ pref_check(pref_t *pref, gpointer user_data) { const char *str_val; char *p; - pref_t **badpref = user_data; + pref_t **badpref = (pref_t **)user_data; /* Fetch the value of the preference, and check whether it's valid. */ switch (pref->type) { @@ -1040,7 +1040,7 @@ pref_fetch(pref_t *pref, gpointer user_data) guint uval; gboolean bval; gint enumval; - gboolean *pref_changed_p = user_data; + gboolean *pref_changed_p = (gboolean *)user_data; /* Fetch the value of the preference, and set the appropriate variable to it. */ @@ -1069,10 +1069,10 @@ pref_fetch(pref_t *pref, gpointer user_data) case PREF_ENUM: if (pref->info.enum_info.radio_buttons) { - enumval = fetch_preference_radio_buttons_val(pref->control, + enumval = fetch_preference_radio_buttons_val((GtkWidget *)pref->control, pref->info.enum_info.enumvals); } else { - enumval = fetch_preference_option_menu_val(pref->control, + enumval = fetch_preference_option_menu_val((GtkWidget *)pref->control, pref->info.enum_info.enumvals); } @@ -1135,7 +1135,7 @@ pref_fetch(pref_t *pref, gpointer user_data) static guint module_prefs_fetch(module_t *module, gpointer user_data) { - gboolean *must_redissect_p = user_data; + gboolean *must_redissect_p = (gboolean *)user_data; /* Ignore any preferences with their own interface */ if (!module->use_gui) { @@ -1274,22 +1274,22 @@ prefs_main_fetch_all(GtkWidget *dlg, gboolean *must_redissect) /* Fetch the preferences (i.e., make sure all the values set in all of the preferences panes have been copied to "prefs" and the registered preferences). */ - gui_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY)); - layout_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY)); - column_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY)); - font_color_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_GUI_FONT_COLORS_PAGE_KEY)); + gui_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY)); + layout_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY)); + column_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY)); + font_color_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_FONT_COLORS_PAGE_KEY)); #ifdef HAVE_LIBPCAP #ifdef _WIN32 /* Is WPcap loaded? */ if (has_wpcap) { #endif /* _WIN32 */ - capture_prefs_fetch(g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY)); + capture_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY)); #ifdef _WIN32 } #endif /* _WIN32 */ #endif /* HAVE_LIBPCAP */ - filter_expressions_prefs_fetch(g_object_get_data(G_OBJECT(dlg), + filter_expressions_prefs_fetch((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_FILTER_EXPRESSIONS_PAGE_KEY)); prefs_modules_foreach(module_prefs_fetch, must_redissect); @@ -1309,24 +1309,24 @@ prefs_main_apply_all(GtkWidget *dlg, gboolean redissect) */ prefs_apply_all(); - gui_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY)); - layout_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY)); - column_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY)); - font_color_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_GUI_FONT_COLORS_PAGE_KEY), redissect); + gui_prefs_apply((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY)); + layout_prefs_apply((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY)); + column_prefs_apply((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY)); + font_color_prefs_apply((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_FONT_COLORS_PAGE_KEY), redissect); #ifdef HAVE_LIBPCAP #ifdef _WIN32 /* Is WPcap loaded? */ if (has_wpcap) { #endif /* _WIN32 */ - capture_prefs_apply(g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY)); + capture_prefs_apply((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY)); #ifdef _WIN32 } #endif /* _WIN32 */ #endif /* HAVE_LIBPCAP */ /* show/hide the Save button - depending on setting */ - save_bt = g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_SAVE_BT_KEY); + save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_SAVE_BT_KEY); if (prefs.gui_use_pref_save) { gtk_widget_show(save_bt); } else { @@ -1343,23 +1343,23 @@ prefs_main_destroy_all(GtkWidget *dlg) GtkWidget *frame; for (page_num = 0; - (frame = gtk_notebook_get_nth_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL; + (frame = gtk_notebook_get_nth_page((GtkNotebook *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL; page_num++) { if (g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY)) - gtk_tree_iter_free(g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY)); + gtk_tree_iter_free((GtkTreeIter *)g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY)); } - gui_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY)); - layout_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY)); - column_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY)); - font_color_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_GUI_FONT_COLORS_PAGE_KEY)); + gui_prefs_destroy((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_PAGE_KEY)); + layout_prefs_destroy((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_LAYOUT_PAGE_KEY)); + column_prefs_destroy((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_COLUMN_PAGE_KEY)); + font_color_prefs_destroy((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_GUI_FONT_COLORS_PAGE_KEY)); #ifdef HAVE_LIBPCAP #ifdef _WIN32 /* Is WPcap loaded? */ if (has_wpcap) { #endif /* _WIN32 */ - capture_prefs_destroy(g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY)); + capture_prefs_destroy((GtkWidget *)g_object_get_data(G_OBJECT(dlg), E_CAPTURE_PAGE_KEY)); #ifdef _WIN32 } #endif /* _WIN32 */ @@ -1394,7 +1394,7 @@ prefs_main_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) { gboolean must_redissect = FALSE; - if (!prefs_main_fetch_all(parent_w, &must_redissect)) + if (!prefs_main_fetch_all((GtkWidget *)parent_w, &must_redissect)) return; /* Errors in some preference setting - already reported */ /* if we don't have a Save button, just save the settings now */ @@ -1410,7 +1410,7 @@ prefs_main_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) airpcap_load_decryption_keys(airpcap_if_list); #endif - prefs_main_apply_all(parent_w, must_redissect); + prefs_main_apply_all((GtkWidget *)parent_w, must_redissect); /* Fill in capture options with values from the preferences */ prefs_to_capture_opts(); @@ -1434,7 +1434,7 @@ prefs_main_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w) { gboolean must_redissect = FALSE; - if (!prefs_main_fetch_all(parent_w, &must_redissect)) + if (!prefs_main_fetch_all((GtkWidget *)parent_w, &must_redissect)) return; /* Errors in some preference setting - already reported */ /* if we don't have a Save button, just save the settings now */ @@ -1443,7 +1443,7 @@ prefs_main_apply_cb(GtkWidget *apply_bt _U_, gpointer parent_w) prefs_copy(); /* save prefs for reverting if Cancel */ } - prefs_main_apply_all(parent_w, must_redissect); + prefs_main_apply_all((GtkWidget *)parent_w, must_redissect); /* Fill in capture options with values from the preferences */ prefs_to_capture_opts(); @@ -1463,7 +1463,7 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w) { gboolean must_redissect = FALSE; - if (!prefs_main_fetch_all(parent_w, &must_redissect)) + if (!prefs_main_fetch_all((GtkWidget *)parent_w, &must_redissect)) return; /* Errors in some preference setting - already reported */ prefs_main_write(); @@ -1483,7 +1483,7 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w) "Apply" after this, we know we have to redissect; 4) we did apply the protocol preferences, at least, in the past. */ - prefs_main_apply_all(parent_w, must_redissect); + prefs_main_apply_all((GtkWidget *)parent_w, must_redissect); /* Fill in capture options with values from the preferences */ prefs_to_capture_opts(); @@ -1497,7 +1497,7 @@ prefs_main_save_cb(GtkWidget *save_bt _U_, gpointer parent_w) static guint module_prefs_revert(module_t *module, gpointer user_data) { - gboolean *must_redissect_p = user_data; + gboolean *must_redissect_p = (gboolean *)user_data; /* Ignore any preferences with their own interface */ if (!module->use_gui) { @@ -1532,7 +1532,7 @@ prefs_main_cancel_cb(GtkWidget *cancel_bt _U_, gpointer parent_w) prefs_modules_foreach(module_prefs_revert, &must_redissect); /* Now apply the reverted-to preferences. */ - prefs_main_apply_all(parent_w, must_redissect); + prefs_main_apply_all((GtkWidget *)parent_w, must_redissect); window_destroy(GTK_WIDGET(parent_w)); @@ -1556,7 +1556,7 @@ prefs_main_delete_event_cb(GtkWidget *prefs_w_lcl, GdkEvent *event _U_, static void prefs_main_destroy_cb(GtkWidget *win _U_, gpointer parent_w) { - prefs_main_destroy_all(parent_w); + prefs_main_destroy_all((GtkWidget *)parent_w); /* Note that we no longer have a "Preferences" dialog box. */ prefs_w = NULL; @@ -1665,7 +1665,7 @@ properties_cb(GtkWidget *w, gpointer dummy) for (i = ga->len - 1; i > 0 ; i -= 1) { - v = g_ptr_array_index (ga, i); + v = (field_info *)g_ptr_array_index (ga, i); hfinfo = v->hfinfo; if (!g_str_has_prefix(hfinfo->abbrev, "text") && @@ -1714,18 +1714,18 @@ properties_cb(GtkWidget *w, gpointer dummy) /* Search all the pages in that window for the one with the specified module. */ for (page_num = 0; - (sw = gtk_notebook_get_nth_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL; + (sw = gtk_notebook_get_nth_page((GtkNotebook *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page_num)) != NULL; page_num++) { /* Get the frame from the scrollable window */ - frame = g_object_get_data(G_OBJECT(sw), E_PAGESW_FRAME_KEY); + frame = (GtkWidget *)g_object_get_data(G_OBJECT(sw), E_PAGESW_FRAME_KEY); /* Get the module for this page (non-protocol prefs don't have one). */ if (frame) { - page_module = g_object_get_data(G_OBJECT(frame), E_PAGE_MODULE_KEY); + page_module = (module_t *)g_object_get_data(G_OBJECT(frame), E_PAGE_MODULE_KEY); if (page_module != NULL) { if (page_module == p.module) { tree_select_node( - g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_TREE_KEY), - g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY)); + (GtkWidget *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_TREE_KEY), + (GtkTreeIter *)g_object_get_data(G_OBJECT(frame), E_PAGE_ITER_KEY)); return; } } @@ -1746,7 +1746,7 @@ prefs_tree_select_cb(GtkTreeSelection *sel, gpointer dummy _U_) { gtk_tree_model_get(model, &iter, 1, &page, -1); if (page >= 0) - gtk_notebook_set_current_page(g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page); + gtk_notebook_set_current_page((GtkNotebook *)g_object_get_data(G_OBJECT(prefs_w), E_PREFSW_NOTEBOOK_KEY), page); } } diff --git a/ui/gtk/prefs_font_color.c b/ui/gtk/prefs_font_color.c index b1be9bc178..bf55fe3785 100644 --- a/ui/gtk/prefs_font_color.c +++ b/ui/gtk/prefs_font_color.c @@ -344,8 +344,8 @@ font_fetch(void) static void select_font(GtkWidget *w, gpointer data _U_) { - GtkWidget *font_sample = g_object_get_data(G_OBJECT(w), FONT_SAMPLE_KEY); - GtkWidget *color_sample = g_object_get_data(G_OBJECT(w), COLOR_SAMPLE_KEY); + GtkWidget *font_sample = (GtkWidget *)g_object_get_data(G_OBJECT(w), FONT_SAMPLE_KEY); + GtkWidget *color_sample = (GtkWidget *)g_object_get_data(G_OBJECT(w), COLOR_SAMPLE_KEY); const gchar *font_name; if (!font_sample || !color_sample) @@ -361,7 +361,7 @@ select_font(GtkWidget *w, gpointer data _U_) static void update_text_color(GObject *obj, GParamSpec *pspec _U_, gpointer data _U_) { - GtkTextView *sample = g_object_get_data(G_OBJECT(obj), COLOR_SAMPLE_KEY); + GtkTextView *sample = (GtkTextView *)g_object_get_data(G_OBJECT(obj), COLOR_SAMPLE_KEY); GtkTextBuffer *buf; GtkTextTag *tag; diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c index 9de6ca5c15..a10fa861e8 100644 --- a/ui/gtk/prefs_gui.c +++ b/ui/gtk/prefs_gui.c @@ -373,7 +373,7 @@ gui_prefs_fetch(GtkWidget *w) prefs.gui_use_pref_save = gtk_toggle_button_get_active((GtkToggleButton *)g_object_get_data(G_OBJECT(w), GUI_USE_PREF_SAVE_KEY)); - prefs.gui_version_placement = + prefs.gui_version_placement = (version_info_e) fetch_enum_value(g_object_get_data(G_OBJECT(w), GUI_SHOW_VERSION_KEY), gui_version_placement_vals); prefs.gui_auto_scroll_on_expand = diff --git a/ui/gtk/prefs_layout.c b/ui/gtk/prefs_layout.c index 916ddec417..cbd9e68ed5 100644 --- a/ui/gtk/prefs_layout.c +++ b/ui/gtk/prefs_layout.c @@ -152,7 +152,7 @@ static layout_pane_content_e layout_pane_get_content(GtkWidget * radio_vb) { return layout_pane_content_pbytes; g_assert_not_reached(); - return -1; + return (layout_pane_content_e)-1; } static void layout_pane_set_content(GtkWidget * radio_vb, layout_pane_content_e pane_content) { @@ -180,35 +180,35 @@ static void layout_pane_set_content(GtkWidget * radio_vb, layout_pane_content_e static void layout_set(GtkWidget * main_vb, layout_t *layout) { GtkWidget *radio_vb; - GtkWidget ** layout_type_buttons = g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); + GtkWidget ** layout_type_buttons = (GtkWidget **)g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(layout_type_buttons[layout->type - 1]), TRUE); - radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY); + radio_vb = (GtkWidget *)g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY); layout_pane_set_content(radio_vb, layout->content[0]); - radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY); + radio_vb = (GtkWidget *)g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY); layout_pane_set_content(radio_vb, layout->content[1]); - radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY); + radio_vb = (GtkWidget *)g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY); layout_pane_set_content(radio_vb, layout->content[2]); } static void layout_get(GtkWidget * main_vb, layout_t *layout_out) { GtkWidget *radio_vb; - GtkWidget ** layout_type_buttons = g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); + GtkWidget ** layout_type_buttons = (GtkWidget **)g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); int i; for (i=0; i<LAYOUT_QTY; ++i) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(layout_type_buttons[i]))) { - layout_out->type = i + 1; + layout_out->type = (layout_type_e)(i + 1); break; } } - radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY); + radio_vb = (GtkWidget *)g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT1_VB_KEY); layout_out->content[0] = layout_pane_get_content(radio_vb); - radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY); + radio_vb = (GtkWidget *)g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT2_VB_KEY); layout_out->content[1] = layout_pane_get_content(radio_vb); - radio_vb = g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY); + radio_vb = (GtkWidget *)g_object_get_data(G_OBJECT(main_vb), LAYOUT_CONTENT3_VB_KEY); layout_out->content[2] = layout_pane_get_content(radio_vb); } @@ -251,9 +251,9 @@ static void layout_validate_cb(GtkWidget *rb, gpointer data) { int pane = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(rb), LAYOUT_PANE_KEY)); layout_t layout; - layout_get(data, &layout); + layout_get((GtkWidget *)data, &layout); layout_validate(&layout, pane); - layout_set(data, &layout); + layout_set((GtkWidget *)data, &layout); } static void @@ -268,7 +268,7 @@ layout_defaults_cb (GtkWidget * w _U_, gpointer data) } }; - layout_set(data, &default_layout); + layout_set((GtkWidget *)data, &default_layout); } #define ALTERN_COLORS_KEY "altern_colors" @@ -315,7 +315,7 @@ layout_prefs_show(void) GtkWidget *filter_toolbar_placement_om; GtkWidget *window_title_te; - GtkWidget ** layout_type_buttons = g_malloc (sizeof(GtkWidget*) * LAYOUT_QTY); + GtkWidget ** layout_type_buttons = (GtkWidget **)g_malloc (sizeof(GtkWidget*) * LAYOUT_QTY); GtkWidget *layout_pixbufs[LAYOUT_QTY]; int pos = 0; @@ -495,7 +495,7 @@ layout_prefs_apply(GtkWidget *w _U_) void layout_prefs_destroy(GtkWidget *main_vb) { - GtkWidget ** layout_type_buttons = g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); + GtkWidget ** layout_type_buttons = (GtkWidget **)g_object_get_data(G_OBJECT(main_vb), LAYOUT_TYPE_BUTTONS_KEY); g_free(layout_type_buttons); } diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c index fd59254c80..66274d0847 100644 --- a/ui/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -134,7 +134,7 @@ file_print_cmd(gboolean print_selected) /* get settings from preferences (and other initial values) only once */ if(print_prefs_init == FALSE) { print_prefs_init = TRUE; - args->format = prefs.pr_format; + args->format = (print_format_e)prefs.pr_format; args->to_file = prefs.pr_dest; args->file = g_strdup(prefs.pr_file); args->cmd = g_strdup(prefs.pr_cmd); @@ -791,7 +791,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - ok_bt = g_object_get_data(G_OBJECT(bbox), action == output_action_print ? GTK_STOCK_PRINT : GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), action == output_action_print ? GTK_STOCK_PRINT : GTK_STOCK_OK); g_object_set_data(G_OBJECT(main_win), PRINT_BT_KEY, ok_bt); @@ -817,19 +817,19 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) g_signal_connect(ok_bt, "clicked", G_CALLBACK(print_ok_cb), main_win); gtk_widget_set_tooltip_text (ok_bt, "Start output"); - cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button(main_win, cancel_bt, window_cancel_button_cb); gtk_widget_set_tooltip_text (cancel_bt, "Cancel and exit dialog"); if(action == output_action_print) { - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PRINT_DIALOG); } else { #ifdef _WIN32 - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_FILE_WIN32_DIALOG); #else - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_FILE_DIALOG); #endif } @@ -1128,7 +1128,7 @@ print_destroy_cb(GtkWidget *win, gpointer user_data) /* Is there a file selection dialog associated with this Print File dialog? */ - fs = g_object_get_data(G_OBJECT(win), E_FILE_SEL_DIALOG_PTR_KEY); + fs = (GtkWidget *)g_object_get_data(G_OBJECT(win), E_FILE_SEL_DIALOG_PTR_KEY); if (fs != NULL) { /* Yes. Destroy it. */ diff --git a/ui/gtk/profile_dlg.c b/ui/gtk/profile_dlg.c index 76b95d42cb..79d065cad8 100644 --- a/ui/gtk/profile_dlg.c +++ b/ui/gtk/profile_dlg.c @@ -90,7 +90,7 @@ fill_list(GtkWidget *main_w) * and use it later without any crashes. This may not be a * valid assumption. */ - l_select = g_memdup(&iter, sizeof(iter)); + l_select = (GtkTreeIter *)g_memdup(&iter, sizeof(iter)); } fl_entry = g_list_next(fl_entry); } @@ -227,8 +227,8 @@ profile_sel_list_cb(GtkTreeSelection *sel, gpointer data _U_) GtkWidget *main_w = gtk_widget_get_toplevel(profile_l); GtkTreeModel *model; GtkTreeIter iter; - GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); - GtkWidget *del_bt = g_object_get_data(G_OBJECT(main_w), E_PROF_DEL_BT_KEY); + GtkWidget *name_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); + GtkWidget *del_bt = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_PROF_DEL_BT_KEY); profile_def *profile; gchar *name = NULL; GList *fl_entry; @@ -276,7 +276,7 @@ static void profile_new_bt_clicked_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(w); - GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); + GtkWidget *name_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); GtkTreeView *profile_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY)); GtkListStore *store; GtkTreeIter iter; @@ -300,7 +300,7 @@ static void profile_copy_bt_clicked_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(w); - GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); + GtkWidget *name_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); GtkTreeView *profile_l = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY)); GtkListStore *store; GtkTreeIter iter; @@ -352,8 +352,8 @@ static void profile_name_te_changed_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(w); - GtkWidget *name_te = g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); - GtkWidget *profile_l = g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY); + GtkWidget *name_te = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_PROF_NAME_TE_KEY); + GtkWidget *profile_l = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY); profile_def *profile; GList *fl_entry; const gchar *name; @@ -390,7 +390,7 @@ static void profile_del_bt_clicked_cb(GtkWidget *w, gpointer data _U_) { GtkWidget *main_w = gtk_widget_get_toplevel(w); - GtkWidget *profile_l = g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY); + GtkWidget *profile_l = (GtkWidget *)g_object_get_data(G_OBJECT(main_w), E_PROF_PROFILE_L_KEY); GList *fl_entry; GtkTreeSelection *sel; @@ -577,7 +577,7 @@ profile_dialog_new(void) gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5); gtk_widget_show(bbox); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(ok_bt, "clicked", G_CALLBACK(profile_dlg_ok_cb), NULL); gtk_widget_set_tooltip_text(ok_bt, "Apply the profiles and close this dialog"); @@ -588,16 +588,16 @@ profile_dialog_new(void) handle the Return key has the input focus. */ dlg_set_activate(name_te, ok_bt); - apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); + apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); g_signal_connect(apply_bt, "clicked", G_CALLBACK(profile_dlg_apply_cb), NULL); gtk_widget_set_tooltip_text(apply_bt, "Apply the profiles and keep this dialog open"); - cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); gtk_widget_set_tooltip_text(cancel_bt, "Cancel the changes"); g_signal_connect(cancel_bt, "clicked", G_CALLBACK(profile_dlg_cancel_cb), NULL); window_set_cancel_button(main_w, cancel_bt, NULL); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_CONFIG_PROFILES_DIALOG); gtk_widget_set_tooltip_text(help_bt, "Show topic specific help"); @@ -729,8 +729,8 @@ static void profile_name_edit_ok(GtkWidget *w _U_, gpointer parent_w) { gint operation = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "operation")); - GtkComboBox *combo_box = g_object_get_data(G_OBJECT(w), "create_from"); - GtkWidget *entry = g_object_get_data(G_OBJECT(w), "entry"); + GtkComboBox *combo_box = (GtkComboBox *)g_object_get_data(G_OBJECT(w), "create_from"); + GtkWidget *entry = (GtkWidget *)g_object_get_data(G_OBJECT(w), "entry"); GtkTreeStore *store; GtkTreeIter iter; const gchar *new_name = gtk_entry_get_text(GTK_ENTRY(entry)); @@ -946,7 +946,7 @@ profile_name_edit_dlg(gint operation) bbox = dlg_button_row_new(GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL); gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_object_set_data(G_OBJECT(ok_bt), "entry", entry); g_object_set_data(G_OBJECT(ok_bt), "create_from", combo_box); g_object_set_data(G_OBJECT(ok_bt), "operation", GINT_TO_POINTER(operation)); @@ -955,7 +955,7 @@ profile_name_edit_dlg(gint operation) dlg_set_activate(entry, ok_bt); gtk_widget_grab_focus(entry); - cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); g_signal_connect(cancel_bt, "clicked", G_CALLBACK(profile_name_edit_cancel), win); window_set_cancel_button(win, cancel_bt, NULL); diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index 675252e50e..2d89352647 100644 --- a/ui/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.c @@ -91,7 +91,7 @@ create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title gchar *task_title_dup; gchar *item_title_dup; - dlg = g_malloc(sizeof (progdlg_t)); + dlg = (progdlg_t *)g_malloc(sizeof (progdlg_t)); /* limit the item_title to some reasonable length */ item_title_dup = g_strdup(item_title); @@ -203,7 +203,7 @@ create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title gtk_container_add(GTK_CONTAINER(main_vb), bbox); gtk_widget_show(bbox); - cancel_bt = g_object_get_data(G_OBJECT(bbox), terminate_is_stop ? GTK_STOCK_STOP : + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), terminate_is_stop ? GTK_STOCK_STOP : GTK_STOCK_CANCEL); gtk_widget_grab_default(cancel_bt); @@ -388,7 +388,7 @@ update_progress_dlg(progdlg_t *dlg, gfloat percentage, const gchar *status) } /* update progress bar */ - prog_bar = g_object_get_data(G_OBJECT(dlg_w), PROG_BAR_KEY); + prog_bar = (GtkWidget *)g_object_get_data(G_OBJECT(dlg_w), PROG_BAR_KEY); gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(prog_bar), percentage); /* diff --git a/ui/gtk/proto_dlg.c b/ui/gtk/proto_dlg.c index 17525f14c1..8ff94896c0 100644 --- a/ui/gtk/proto_dlg.c +++ b/ui/gtk/proto_dlg.c @@ -316,20 +316,20 @@ build_protocols_treeview(void) gtk_box_pack_start(GTK_BOX(proto_vb), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(ok_bt, "clicked", G_CALLBACK(proto_ok_cb), proto_w); gtk_widget_grab_default(ok_bt); - apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); + apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); g_signal_connect(apply_bt, "clicked", G_CALLBACK(proto_apply_cb), proto_w); - save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); + save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); g_signal_connect(save_bt, "clicked", G_CALLBACK(proto_save_cb), proto_w); - cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button(proto_w, cancel_bt, proto_cancel_cb); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_ENABLED_PROTOCOLS_DIALOG); g_signal_connect(proto_w, "delete_event", G_CALLBACK(proto_delete_event_cb), NULL); @@ -438,7 +438,7 @@ toggle_all_cb(GtkWidget *button _U_, gpointer pl) GtkListStore *s = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(pl))); for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) { - protocol_data_t *p = entry->data; + protocol_data_t *p = (protocol_data_t *)entry->data; if (p->enabled) p->enabled = FALSE; @@ -457,7 +457,7 @@ set_active_all(GtkWidget *w, gboolean new_state) GSList *entry; for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) { - protocol_data_t *p = entry->data; + protocol_data_t *p = (protocol_data_t *)entry->data; p->enabled = new_state; gtk_list_store_set(s, &p->iter, 0, new_state, -1); @@ -468,14 +468,14 @@ set_active_all(GtkWidget *w, gboolean new_state) static void enable_all_cb(GtkWidget *button _U_, gpointer pl) { - set_active_all(pl, TRUE); + set_active_all((GtkWidget *)pl, TRUE); } /* Disable All */ static void disable_all_cb(GtkWidget *button _U_, gpointer pl) { - set_active_all(pl, FALSE); + set_active_all((GtkWidget *)pl, FALSE); } static void @@ -531,7 +531,7 @@ update_was_enabled(void) GSList *entry; for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) { - protocol_data_t *p = entry->data; + protocol_data_t *p = (protocol_data_t *)entry->data; p->was_enabled = p->enabled; } } @@ -627,7 +627,7 @@ set_proto_selection(GtkWidget *parent_w _U_) gboolean need_redissect = FALSE; for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) { - protocol_data_t *p = entry->data; + protocol_data_t *p = (protocol_data_t *)entry->data; protocol_t *protocol; protocol = find_protocol_by_id(p->hfinfo_index); @@ -651,7 +651,7 @@ revert_proto_selection(void) * Undo all the changes we've made to protocol enable flags. */ for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) { - protocol_data_t *p = entry->data; + protocol_data_t *p = (protocol_data_t *)entry->data; protocol_t *protocol; protocol = find_protocol_by_id(p->hfinfo_index); @@ -687,7 +687,7 @@ create_protocol_list(void) for (i = proto_get_first_protocol(&cookie); i != -1; i = proto_get_next_protocol(&cookie)) { if (proto_can_toggle_protocol(i)) { - p = g_malloc(sizeof(protocol_data_t)); + p = (protocol_data_t *)g_malloc(sizeof(protocol_data_t)); protocol = find_protocol_by_id(i); p->name = proto_get_protocol_name(i); p->abbrev = proto_get_protocol_short_name(protocol); @@ -778,7 +778,7 @@ show_proto_selection(GtkListStore *proto_store) create_protocol_list(); for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) { - p = entry->data; + p = (protocol_data_t *)entry->data; gtk_list_store_append(proto_store, &p->iter); gtk_list_store_set(proto_store, &p->iter, diff --git a/ui/gtk/proto_hier_stats_dlg.c b/ui/gtk/proto_hier_stats_dlg.c index 5ad1acb59c..edaca5f4ed 100644 --- a/ui/gtk/proto_hier_stats_dlg.c +++ b/ui/gtk/proto_hier_stats_dlg.c @@ -308,8 +308,8 @@ static const GtkActionEntry proto_hier_stats_popup_entries[] = { static void fill_in_tree_node(GNode *node, gpointer data) { - ph_stats_node_t *stats = node->data; - draw_info_t *di = data; + ph_stats_node_t *stats = (ph_stats_node_t *)node->data; + draw_info_t *di = (draw_info_t *)data; ph_stats_t *ps = di->ps; draw_info_t child_di; double seconds; @@ -416,7 +416,7 @@ proto_hier_create_popup_menu(void) action_group = gtk_action_group_new ("ProtoHierStatsTFilterPopupActionGroup"); gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)proto_hier_stats_popup_entries, /* an array of action descriptions */ + (GtkActionEntry *)proto_hier_stats_popup_entries, /* an array of action descriptions */ G_N_ELEMENTS(proto_hier_stats_popup_entries), /* the number of entries */ NULL); /* data to pass to the action callbacks */ @@ -584,10 +584,10 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); + close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(dlg, close_bt, window_cancel_button_cb); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_PROTO_HIERARCHY_DIALOG); g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); diff --git a/ui/gtk/proto_hier_tree_model.c b/ui/gtk/proto_hier_tree_model.c index f6d58aac83..d6616557ac 100644 --- a/ui/gtk/proto_hier_tree_model.c +++ b/ui/gtk/proto_hier_tree_model.c @@ -188,7 +188,7 @@ proto_hier_tree_get_value(GtkTreeModel *tree_model, GtkTreeIter *iter, gint colu g_return_if_fail(iter->stamp == model->stamp); g_return_if_fail(column == 0 || column == 1); - hfinfo = iter->user_data3; + hfinfo = (header_field_info *)iter->user_data3; switch (column) { case 0: /* hfinfo */ diff --git a/ui/gtk/proto_tree_model.c b/ui/gtk/proto_tree_model.c index b177965a3a..e9348fbab7 100644 --- a/ui/gtk/proto_tree_model.c +++ b/ui/gtk/proto_tree_model.c @@ -100,7 +100,7 @@ proto_tree_model_iter_nth_child(GtkTreeModel *tree_model, GtkTreeIter *iter, Gtk if (parent) { g_return_val_if_fail(parent->stamp == model->stamp, FALSE); - node = parent->user_data; + node = (proto_node *)parent->user_data; } else node = model->protocol_tree; @@ -190,7 +190,7 @@ proto_tree_model_get_value(GtkTreeModel *tree_model, GtkTreeIter *iter, gint col g_return_if_fail(iter->stamp == model->stamp); g_return_if_fail(column == 0 || column == 1); - node = iter->user_data; + node = (proto_node *)iter->user_data; fi = PNODE_FINFO(node); /* dissection with an invisible proto tree? */ @@ -230,7 +230,7 @@ proto_tree_model_iter_next(GtkTreeModel *tree_model, GtkTreeIter *iter) g_return_val_if_fail(iter->stamp == model->stamp, FALSE); - current = iter->user_data; + current = (proto_node *)iter->user_data; current = current->next; while (current) { if (model->with_hidden || !PROTO_ITEM_IS_HIDDEN(current)) { @@ -262,7 +262,7 @@ proto_tree_model_iter_n_children(GtkTreeModel *tree_model, GtkTreeIter *iter) if (iter) { g_return_val_if_fail(iter->stamp == model->stamp, 0); - node = iter->user_data; + node = (proto_node *)iter->user_data; } else node = model->protocol_tree; @@ -292,7 +292,7 @@ proto_tree_model_get_path(GtkTreeModel *tree_model, GtkTreeIter *iter) g_return_val_if_fail(iter != NULL, NULL); g_return_val_if_fail(iter->stamp == model->stamp, NULL); - node = iter->user_data; + node = (proto_node *)iter->user_data; g_return_val_if_fail(node != model->protocol_tree, NULL); path = gtk_tree_path_new(); @@ -336,7 +336,7 @@ proto_tree_model_iter_has_child(GtkTreeModel *tree_model, GtkTreeIter *iter) if (iter) { g_return_val_if_fail(iter->stamp == model->stamp, FALSE); - node = iter->user_data; + node = (proto_node *)iter->user_data; } else node = model->protocol_tree; @@ -364,7 +364,7 @@ proto_tree_model_iter_parent(GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTre g_return_val_if_fail(iter != NULL, FALSE); g_return_val_if_fail(child->stamp == model->stamp, FALSE); - node = child->user_data; + node = (proto_node *)child->user_data; if (node->parent == model->protocol_tree) return FALSE; g_return_val_if_fail(node->parent != NULL, FALSE); diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c index 2a4f18e48c..8a51a5bdc8 100644 --- a/ui/gtk/range_utils.c +++ b/ui/gtk/range_utils.c @@ -136,9 +136,9 @@ range_update_dynamics(gpointer data) guint32 ignored_cnt = 0, displayed_ignored_cnt = 0; guint32 displayed_cnt; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); - range_displayed_bt = g_object_get_data(G_OBJECT(data), RANGE_DISPLAYED_BT_KEY); + range_displayed_bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_DISPLAYED_BT_KEY); filtered_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(range_displayed_bt)); /* Enable saving only the displayed packets only if there *are* @@ -154,7 +154,7 @@ range_update_dynamics(gpointer data) } /* All / Captured */ - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_C_KEY), !filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_C_KEY), !filtered_active); if (range->remove_ignored) { g_snprintf(label_text, sizeof(label_text), "%u", cfile.count - range->ignored_cnt); } else { @@ -163,7 +163,7 @@ range_update_dynamics(gpointer data) gtk_label_set_text(GTK_LABEL(g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_C_KEY)), label_text); /* All / Displayed */ - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_D_KEY), filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_D_KEY), filtered_active); if (range->include_dependents) displayed_cnt = range->displayed_plus_dependents_cnt; else @@ -181,18 +181,18 @@ range_update_dynamics(gpointer data) selected_num = (cfile.current_frame) ? cfile.current_frame->num : 0; can_select = (selected_num != 0); if (can_select) { - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_KEY), TRUE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_C_KEY), !filtered_active); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_D_KEY), filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_KEY), TRUE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_C_KEY), !filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_D_KEY), filtered_active); } else { /* If "save selected packet" is selected, select "save all packets". */ if (range->process == range_process_selected) { range->process = range_process_all; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_KEY)), TRUE); } - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_C_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_D_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_C_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_CURR_D_KEY), FALSE); } /* XXX: how to update the radio button label but keep the mnemonic? */ /*g_snprintf(label_text, sizeof(label_text), "_Selected packet #%u only", selected_num); @@ -218,9 +218,9 @@ range_update_dynamics(gpointer data) else selected_packets = (cfile.marked_count > 0); if (selected_packets) { - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_KEY), TRUE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_C_KEY), !filtered_active); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_D_KEY), filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_KEY), TRUE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_C_KEY), !filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_D_KEY), filtered_active); } else { /* If "save marked packet" is selected, select "save all packets". */ @@ -228,9 +228,9 @@ range_update_dynamics(gpointer data) range->process = range_process_all; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_KEY)), TRUE); } - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_C_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_D_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_C_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_D_KEY), FALSE); } if (range->remove_ignored) { g_snprintf(label_text, sizeof(label_text), "%u", cfile.marked_count - range->ignored_marked_cnt); @@ -254,9 +254,9 @@ range_update_dynamics(gpointer data) else selected_packets = (range->mark_range_cnt != 0); if (selected_packets) { - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_KEY), TRUE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_C_KEY), !filtered_active); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_D_KEY), filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_KEY), TRUE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_C_KEY), !filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_D_KEY), filtered_active); } else { /* If "save range between first and last marked packet" is selected, @@ -265,9 +265,9 @@ range_update_dynamics(gpointer data) range->process = range_process_all; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(data), RANGE_SELECT_ALL_KEY)), TRUE); } - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_C_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_D_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_C_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_MARKED_RANGE_D_KEY), FALSE); } if (range->remove_ignored) { g_snprintf(label_text, sizeof(label_text), "%u", range->mark_range_cnt - range->ignored_mark_range_cnt); @@ -285,9 +285,9 @@ range_update_dynamics(gpointer data) /* User specified / Captured + Displayed */ - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_KEY), TRUE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_C_KEY), !filtered_active); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_D_KEY), filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_KEY), TRUE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_C_KEY), !filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_D_KEY), filtered_active); if (range->remove_ignored) { g_snprintf(label_text, sizeof(label_text), "%u", range->user_range_cnt - range->ignored_user_range_cnt); } else { @@ -334,13 +334,13 @@ range_update_dynamics(gpointer data) selected_packets = (ignored_cnt != 0); if (selected_packets) { - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_REMOVE_IGNORED_KEY), TRUE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_IGNORED_C_KEY), !filtered_active); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_IGNORED_D_KEY), filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_REMOVE_IGNORED_KEY), TRUE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_IGNORED_C_KEY), !filtered_active); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_IGNORED_D_KEY), filtered_active); } else { - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_REMOVE_IGNORED_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_IGNORED_C_KEY), FALSE); - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_IGNORED_D_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_REMOVE_IGNORED_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_IGNORED_C_KEY), FALSE); + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_IGNORED_D_KEY), FALSE); } g_snprintf(label_text, sizeof(label_text), "%u", ignored_cnt); @@ -357,16 +357,16 @@ toggle_captured_cb(GtkWidget *widget, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { /* They changed the state of the "captured" button. */ range->process_filtered = FALSE; - bt = g_object_get_data(G_OBJECT(data), RANGE_CAPTURED_BT_KEY); + bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_CAPTURED_BT_KEY); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bt), TRUE); - bt = g_object_get_data(G_OBJECT(data), RANGE_DISPLAYED_BT_KEY); + bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_DISPLAYED_BT_KEY); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bt), FALSE); range_update_dynamics(data); @@ -380,14 +380,14 @@ toggle_filtered_cb(GtkWidget *widget, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { range->process_filtered = TRUE; - bt = g_object_get_data(G_OBJECT(data), RANGE_CAPTURED_BT_KEY); + bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_CAPTURED_BT_KEY); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bt), FALSE); - bt = g_object_get_data(G_OBJECT(data), RANGE_DISPLAYED_BT_KEY); + bt = (GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_DISPLAYED_BT_KEY); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bt), TRUE); range_update_dynamics(data); @@ -400,7 +400,7 @@ toggle_select_all(GtkWidget *widget, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { @@ -415,7 +415,7 @@ toggle_select_selected(GtkWidget *widget, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { @@ -430,7 +430,7 @@ toggle_select_marked_only(GtkWidget *widget, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { @@ -445,7 +445,7 @@ toggle_select_marked_range(GtkWidget *widget, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { @@ -460,7 +460,7 @@ toggle_select_user_range(GtkWidget *widget, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { @@ -469,12 +469,12 @@ toggle_select_user_range(GtkWidget *widget, gpointer data) } /* Make the entry widget sensitive or insensitive */ - gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_ENTRY_KEY), + gtk_widget_set_sensitive((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_ENTRY_KEY), range->process == range_process_user_range); /* When selecting user specified range, then focus on the entry */ if (range->process == range_process_user_range) - gtk_widget_grab_focus(g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_ENTRY_KEY)); + gtk_widget_grab_focus((GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_ENTRY_KEY)); } @@ -483,7 +483,7 @@ toggle_remove_ignored(GtkWidget *widget, gpointer data) { packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); /* is the button now active? */ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget))) { @@ -503,10 +503,10 @@ range_entry(GtkWidget *widget _U_, gpointer data) packet_range_t *range; - range = g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); - entry = g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_ENTRY_KEY); + range = (packet_range_t *)g_object_get_data(G_OBJECT(data), RANGE_VALUES_KEY); + entry = (GtkWidget *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_ENTRY_KEY); - gtk_toggle_button_set_active(g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_KEY), TRUE); + gtk_toggle_button_set_active((GtkToggleButton *)g_object_get_data(G_OBJECT(data), RANGE_SELECT_USER_KEY), TRUE); entry_text = gtk_entry_get_text (GTK_ENTRY (entry)); packet_range_convert_str(range, entry_text); range_update_dynamics(data); diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c index 599d8e49ae..d813f4c6fb 100644 --- a/ui/gtk/sctp_byte_graph_dlg.c +++ b/ui/gtk/sctp_byte_graph_dlg.c @@ -749,7 +749,7 @@ sctp_graph_close_cb(GtkWidget* widget _U_, gpointer u_data) static gboolean on_configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; GtkAllocation widget_alloc; cairo_t *cr; @@ -811,7 +811,7 @@ on_draw_area_draw_event(GtkWidget *widget, cairo_t *cr, gpointer user_data) static gboolean on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { - sctp_graph_t *ios = user_data; + sctp_graph_t *ios = (sctp_graph_t *)user_data; cairo_t *cr; g_assert(ios != NULL); @@ -839,7 +839,7 @@ on_zoomin_bt (GtkWidget *widget _U_, struct sctp_udata *u_data) if (u_data->io->rectangle==TRUE) { - tmp_minmax = g_malloc(sizeof(sctp_min_max_t)); + tmp_minmax = (sctp_min_max_t *)g_malloc(sizeof(sctp_min_max_t)); u_data->io->tmp_min_tsn1=u_data->io->y1_tmp+u_data->io->min_y; u_data->io->tmp_max_tsn1=u_data->io->y2_tmp+1+u_data->io->min_y; @@ -872,7 +872,7 @@ zoomin_bt_fcn (struct sctp_udata *u_data) { sctp_min_max_t *tmp_minmax; - tmp_minmax = g_malloc(sizeof(sctp_min_max_t)); + tmp_minmax = (sctp_min_max_t *)g_malloc(sizeof(sctp_min_max_t)); u_data->io->tmp_min_tsn1=u_data->io->y1_tmp+u_data->io->min_y; u_data->io->tmp_max_tsn1=u_data->io->y2_tmp+1+u_data->io->min_y; @@ -956,7 +956,7 @@ on_zoomout_bt (GtkWidget *widget _U_, struct sctp_udata *u_data) static gboolean on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; sctp_graph_t *ios; cairo_t *cr; @@ -1010,7 +1010,7 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us static gboolean on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; sctp_graph_t *ios; guint32 helpx, helpy, x1_tmp, x2_tmp, y_value; gint label_width, label_height; @@ -1334,7 +1334,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data) sctp_graph_t *io; sctp_min_max_t* tmp_minmax; - io=g_malloc(sizeof(sctp_graph_t)); + io=(sctp_graph_t *)g_malloc(sizeof(sctp_graph_t)); io->needs_redraw=TRUE; io->x_interval=1000; io->window=NULL; @@ -1359,7 +1359,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data) u_data->io->tmp_min_tsn2=0; u_data->io->tmp_max_tsn2=u_data->assoc->max_bytes2; u_data->io->tmp=FALSE; - tmp_minmax = g_malloc(sizeof(sctp_min_max_t)); + tmp_minmax = (sctp_min_max_t *)g_malloc(sizeof(sctp_min_max_t)); tmp_minmax->tmp_min_secs = u_data->assoc->min_secs; tmp_minmax->tmp_min_usecs=u_data->assoc->min_usecs; tmp_minmax->tmp_max_secs=u_data->assoc->max_secs; @@ -1379,7 +1379,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data) static void quit(GObject *object _U_, gpointer user_data) { - struct sctp_udata *u_data=user_data; + struct sctp_udata *u_data=(struct sctp_udata *)user_data; decrease_childcount(u_data->parent); remove_child(u_data, u_data->parent); @@ -1421,7 +1421,7 @@ static void insertion(GPtrArray *array, guint32 N) j=i; while (j>=1 && ((struct tsn_sort*)(g_ptr_array_index(array, j-1)))->tsnumber > v) { - help=g_ptr_array_index(array, j); + help=(struct tsn_sort *)g_ptr_array_index(array, j); g_ptr_array_index(array, j)=g_ptr_array_index(array, j-1); g_ptr_array_index(array, j-1)=help; j--; @@ -1521,8 +1521,8 @@ void create_byte_graph(guint16 dir, struct sctp_analyse* userdata) { struct sctp_udata *u_data; - u_data=g_malloc(sizeof(struct sctp_udata)); - u_data->assoc=g_malloc(sizeof(sctp_assoc_info_t)); + u_data=(struct sctp_udata *)g_malloc(sizeof(struct sctp_udata)); + u_data->assoc=(sctp_assoc_info_t *)g_malloc(sizeof(sctp_assoc_info_t)); u_data->assoc=userdata->assoc; u_data->io=NULL; u_data->dir = dir; diff --git a/ui/gtk/sctp_graph_dlg.c b/ui/gtk/sctp_graph_dlg.c index 62fac929ae..cd624092cc 100644 --- a/ui/gtk/sctp_graph_dlg.c +++ b/ui/gtk/sctp_graph_dlg.c @@ -1099,7 +1099,7 @@ sctp_graph_redraw(struct sctp_udata *u_data) static void on_sack_bt(GtkWidget *widget _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; u_data->io->graph_type=2; sctp_graph_redraw(u_data); @@ -1108,7 +1108,7 @@ on_sack_bt(GtkWidget *widget _U_, gpointer user_data) static void on_tsn_bt(GtkWidget *widget _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; u_data->io->graph_type=1; sctp_graph_redraw(u_data); @@ -1117,7 +1117,7 @@ on_tsn_bt(GtkWidget *widget _U_, gpointer user_data) static void on_both_bt(GtkWidget *widget _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; u_data->io->graph_type=0; sctp_graph_redraw(u_data); @@ -1126,7 +1126,7 @@ on_both_bt(GtkWidget *widget _U_, gpointer user_data) static void sctp_graph_close_cb(GtkWidget* widget _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; gtk_grab_remove(GTK_WIDGET(u_data->io->window)); gtk_widget_destroy(GTK_WIDGET(u_data->io->window)); @@ -1136,7 +1136,7 @@ sctp_graph_close_cb(GtkWidget* widget _U_, gpointer user_data) static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *event _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; GtkAllocation widget_alloc; cairo_t *cr; @@ -1199,7 +1199,7 @@ draw_event(GtkWidget *widget, cairo_t *cr, gpointer user_data) static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { - sctp_graph_t *ios = user_data; + sctp_graph_t *ios = (sctp_graph_t *)user_data; cairo_t *cr; g_assert(ios != NULL); @@ -1223,12 +1223,12 @@ expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) static void on_zoomin_bt (GtkWidget *widget _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; sctp_min_max_t *tmp_minmax; if (u_data->io->rectangle_present==TRUE) { - tmp_minmax = g_malloc(sizeof(sctp_min_max_t)); + tmp_minmax = (sctp_min_max_t *)g_malloc(sizeof(sctp_min_max_t)); u_data->io->tmp_min_tsn1=u_data->io->y1_tmp+u_data->io->min_y; u_data->io->tmp_max_tsn1=u_data->io->y2_tmp+1+u_data->io->min_y; @@ -1261,7 +1261,7 @@ zoomin_bt_fcn (struct sctp_udata *u_data) { sctp_min_max_t *tmp_minmax; - tmp_minmax = g_malloc(sizeof(sctp_min_max_t)); + tmp_minmax = (sctp_min_max_t *)g_malloc(sizeof(sctp_min_max_t)); u_data->io->tmp_min_tsn1=u_data->io->y1_tmp+u_data->io->min_y; u_data->io->tmp_max_tsn1=u_data->io->y2_tmp+1+u_data->io->min_y; @@ -1290,7 +1290,7 @@ zoomin_bt_fcn (struct sctp_udata *u_data) static void on_zoomout_bt (GtkWidget *widget _U_, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; sctp_min_max_t *tmp_minmax, *mm; gint l; @@ -1347,7 +1347,7 @@ on_zoomout_bt (GtkWidget *widget _U_, gpointer user_data) static gboolean on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; sctp_graph_t *ios; cairo_t *cr; @@ -1400,7 +1400,7 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us static gboolean on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer user_data) { - struct sctp_udata *u_data = user_data; + struct sctp_udata *u_data = (struct sctp_udata *)user_data; sctp_graph_t *ios; guint32 helpx, helpy, x1_tmp, x2_tmp, y_value, t_size=0, s_size=0, i, y_tolerance; gint label_width, label_height; @@ -1750,7 +1750,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data) sctp_graph_t *io; sctp_min_max_t* tmp_minmax; - io=g_malloc(sizeof(sctp_graph_t)); + io=(sctp_graph_t *)g_malloc(sizeof(sctp_graph_t)); io->needs_redraw=TRUE; io->x_interval=1000; io->window=NULL; @@ -1774,7 +1774,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data) u_data->io->tmp_max_tsn2=u_data->assoc->max_tsn2; u_data->io->tmp=FALSE; - tmp_minmax = g_malloc(sizeof(sctp_min_max_t)); + tmp_minmax = (sctp_min_max_t *)g_malloc(sizeof(sctp_min_max_t)); tmp_minmax->tmp_min_secs = u_data->assoc->min_secs; tmp_minmax->tmp_min_usecs=u_data->assoc->min_usecs; tmp_minmax->tmp_max_secs=u_data->assoc->max_secs; @@ -1795,7 +1795,7 @@ gtk_sctpgraph_init(struct sctp_udata *u_data) static void quit(GObject *object _U_, gpointer user_data) { - struct sctp_udata *u_data=user_data; + struct sctp_udata *u_data=(struct sctp_udata *)user_data; decrease_childcount(u_data->parent); remove_child(u_data, u_data->parent); @@ -1836,7 +1836,7 @@ create_graph(guint16 dir, struct sctp_analyse* userdata) { struct sctp_udata *u_data; - u_data=g_malloc(sizeof(struct sctp_udata)); + u_data=(struct sctp_udata *)g_malloc(sizeof(struct sctp_udata)); u_data->assoc=userdata->assoc; u_data->io=NULL; u_data->dir = dir; diff --git a/ui/gtk/sctp_stat.c b/ui/gtk/sctp_stat.c index a4cf82c53b..20eec2a8a6 100644 --- a/ui/gtk/sctp_stat.c +++ b/ui/gtk/sctp_stat.c @@ -138,7 +138,7 @@ static void tsn_free(gpointer data, gpointer user_data _U_) static void reset(void *arg) { - sctp_allassocs_info_t *tapdata = arg; + sctp_allassocs_info_t *tapdata = (sctp_allassocs_info_t *)arg; GList* list; sctp_assoc_info_t * info; @@ -471,12 +471,12 @@ static sctp_assoc_info_t * add_chunk_count(address * vadd, sctp_assoc_info_t * i else list = g_list_next(list); } - ch = g_malloc(sizeof(sctp_addr_chunk)); + ch = (sctp_addr_chunk *)g_malloc(sizeof(sctp_addr_chunk)); ch->direction = direction; - ch->addr = g_malloc(sizeof(address)); + ch->addr = (address *)g_malloc(sizeof(address)); ch->addr->type = vadd->type; ch->addr->len = vadd->len; - dat = g_malloc(vadd->len); + dat = (guint8 *)g_malloc(vadd->len); memcpy(dat, vadd->data, vadd->len); ch->addr->data = dat; for (i=0; i < NUM_CHUNKS; i++) @@ -561,7 +561,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v tmp_info.src.len = 0; } - addr = g_malloc(tmp_info.src.len); + addr = (guint8 *)g_malloc(tmp_info.src.len); memcpy(addr, sctp_info->ip_src.data, tmp_info.src.len); tmp_info.src.data = addr; @@ -583,7 +583,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v tmp_info.dst.len = 0; } - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr, sctp_info->ip_dst.data, tmp_info.dst.len); tmp_info.dst.data = addr; @@ -618,16 +618,16 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v if (sctp_info->number_of_tvbs > 0) { - info = g_malloc(sizeof(sctp_assoc_info_t)); + info = (sctp_assoc_info_t *)g_malloc(sizeof(sctp_assoc_info_t)); memset(info, 0, sizeof(sctp_assoc_info_t)); info->src.type = tmp_info.src.type; info->src.len = tmp_info.src.len; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr,(tmp_info.src.data), tmp_info.src.len); info->src.data = addr; info->dst.type = tmp_info.dst.type; info->dst.len = tmp_info.dst.len; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr, (tmp_info.dst.data), tmp_info.dst.len); info->dst.data = addr; info->port1 = tmp_info.port1; @@ -684,26 +684,26 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v ((tvb_get_guint8(sctp_info->tvb[0],0)) == SCTP_SACK_CHUNK_ID) || ((tvb_get_guint8(sctp_info->tvb[0],0)) == SCTP_NR_SACK_CHUNK_ID)) { - tsn = g_malloc(sizeof(tsn_t)); - sack = g_malloc(sizeof(tsn_t)); + tsn = (tsn_t *)g_malloc(sizeof(tsn_t)); + sack = (tsn_t *)g_malloc(sizeof(tsn_t)); tsn->tsns = NULL; tsn->first_tsn = 0; sack->tsns = NULL; sack->first_tsn = 0; sack->src.type=tsn->src.type = tmp_info.src.type; sack->src.len=tsn->src.len = tmp_info.src.len; - addr = g_malloc(tmp_info.src.len); + addr = (guint8 *)g_malloc(tmp_info.src.len); memcpy(addr, tmp_info.src.data, tmp_info.src.len); tsn->src.data = addr; - addr = g_malloc(tmp_info.src.len); + addr = (guint8 *)g_malloc(tmp_info.src.len); memcpy(addr, tmp_info.src.data, tmp_info.src.len); sack->src.data = addr; sack->dst.type = tsn->dst.type = tmp_info.dst.type; sack->dst.len =tsn->dst.len = tmp_info.dst.len; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr, tmp_info.dst.data, tmp_info.dst.len); tsn->dst.data = addr; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr, tmp_info.dst.data, tmp_info.dst.len); sack->dst.data = addr; sack->secs=tsn->secs = (guint32)pinfo->fd->rel_ts.secs; @@ -742,7 +742,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v type = tvb_get_ntohs(sctp_info->tvb[chunk_number],0); if (type == IPV4ADDRESS_PARAMETER_ID) { - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = AT_IPv4; store->len = 4; store->data = g_malloc(4); @@ -751,7 +751,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } else if (type == IPV6ADDRESS_PARAMETER_ID) { - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = AT_IPv6; store->len = 16; store->data = g_malloc(16); @@ -786,8 +786,8 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v ((tvb_get_guint8(sctp_info->tvb[0],0)) != SCTP_SACK_CHUNK_ID) && ((tvb_get_guint8(sctp_info->tvb[0],0)) != SCTP_NR_SACK_CHUNK_ID)) { - tsn = g_malloc(sizeof(tsn_t)); - sack = g_malloc(sizeof(tsn_t)); + tsn = (tsn_t *)g_malloc(sizeof(tsn_t)); + sack = (tsn_t *)g_malloc(sizeof(tsn_t)); tsn->tsns = NULL; sack->tsns = NULL; tsn->first_tsn = 0; @@ -821,11 +821,11 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } if (tsn->first_tsn == 0) tsn->first_tsn = tsnumber; - t_s_n = g_malloc(16); + t_s_n = (guint8 *)g_malloc(16); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(t_s_n),0, 16); tsn->tsns = g_list_append(tsn->tsns, t_s_n); datachunk = TRUE; - tsn_s = g_malloc(sizeof(struct tsn_sort)); + tsn_s = (struct tsn_sort *)g_malloc(sizeof(struct tsn_sort)); tsn_s->tsnumber = tsnumber; tsn_s->secs = tsn->secs = (guint32)pinfo->fd->rel_ts.secs; tsn_s->usecs = tsn->usecs = (guint32)pinfo->fd->rel_ts.nsecs/1000; @@ -861,11 +861,11 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v length = tvb_get_ntohs(sctp_info->tvb[chunk_number], CHUNK_LENGTH_OFFSET); if (sack->first_tsn == 0) sack->first_tsn = tsnumber; - t_s_n = g_malloc(length); + t_s_n = (guint8 *)g_malloc(length); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(t_s_n),0, length); sack->tsns = g_list_append(sack->tsns, t_s_n); sackchunk = TRUE; - tsn_s = g_malloc(sizeof(struct tsn_sort)); + tsn_s = (struct tsn_sort *)g_malloc(sizeof(struct tsn_sort)); tsn_s->tsnumber = tsnumber; tsn_s->secs = tsn->secs = (guint32)pinfo->fd->rel_ts.secs; tsn_s->usecs = tsn->usecs = (guint32)pinfo->fd->rel_ts.nsecs/1000; @@ -896,17 +896,17 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } if (info->verification_tag1 != 0 || info->verification_tag2 != 0) { - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = tmp_info.src.type; store->len = tmp_info.src.len; - addr = g_malloc(tmp_info.src.len); + addr = (guint8 *)g_malloc(tmp_info.src.len); memcpy(addr,(tmp_info.src.data),tmp_info.src.len); store->data = addr; info = add_address(store, info, 1); - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = tmp_info.dst.type; store->len = tmp_info.dst.len; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr,(tmp_info.dst.data),tmp_info.dst.len); store->data = addr; info = add_address(store, info, 2); @@ -919,7 +919,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } else { - error = g_malloc(sizeof(sctp_error_info_t)); + error = (sctp_error_info_t *)g_malloc(sizeof(sctp_error_info_t)); error->frame_number = pinfo->fd->num; error->chunk_info[0] = '\0'; if ((tvb_get_guint8(sctp_info->tvb[0],0)) == SCTP_INIT_CHUNK_ID) @@ -941,26 +941,26 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v ((tvb_get_guint8(sctp_info->tvb[0],0)) == SCTP_NR_SACK_CHUNK_ID)) { - tsn = g_malloc(sizeof(tsn_t)); - sack = g_malloc(sizeof(tsn_t)); + tsn = (tsn_t *)g_malloc(sizeof(tsn_t)); + sack = (tsn_t *)g_malloc(sizeof(tsn_t)); tsn->tsns = NULL; tsn->first_tsn = 0; sack->tsns = NULL; sack->first_tsn = 0; sack->src.type = tsn->src.type = tmp_info.src.type; sack->src.len = tsn->src.len = tmp_info.src.len; - addr = g_malloc(tmp_info.src.len); + addr = (guint8 *)g_malloc(tmp_info.src.len); memcpy(addr, tmp_info.src.data, tmp_info.src.len); tsn->src.data = addr; - addr = g_malloc(tmp_info.src.len); + addr = (guint8 *)g_malloc(tmp_info.src.len); memcpy(addr, tmp_info.src.data, tmp_info.src.len); sack->src.data = addr; sack->dst.type = tsn->dst.type = tmp_info.dst.type; sack->dst.len = tsn->dst.len = tmp_info.dst.len; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr, tmp_info.dst.data, tmp_info.dst.len); tsn->dst.data = addr; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr, tmp_info.dst.data, tmp_info.dst.len); sack->dst.data = addr; sack->secs=tsn->secs = (guint32)pinfo->fd->rel_ts.secs; @@ -989,10 +989,10 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } info->frame_numbers = g_list_prepend(info->frame_numbers,&(pinfo->fd->num)); - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = tmp_info.src.type; store->len = tmp_info.src.len; - addr = g_malloc(tmp_info.src.len); + addr = (guint8 *)g_malloc(tmp_info.src.len); memcpy(addr,(tmp_info.src.data),tmp_info.src.len); store->data = addr; @@ -1001,10 +1001,10 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v else if (info->direction == 2) info = add_address(store, info, 2); - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = tmp_info.dst.type; store->len = tmp_info.dst.len; - addr = g_malloc(tmp_info.dst.len); + addr = (guint8 *)g_malloc(tmp_info.dst.len); memcpy(addr,(tmp_info.dst.data),tmp_info.dst.len); store->data = addr; @@ -1055,7 +1055,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v type = tvb_get_ntohs(sctp_info->tvb[chunk_number],0); if (type == IPV4ADDRESS_PARAMETER_ID) { - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = AT_IPv4; store->len = 4; store->data = g_malloc(4); @@ -1064,7 +1064,7 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v } else if (type == IPV6ADDRESS_PARAMETER_ID) { - store = g_malloc(sizeof (address)); + store = (address *)g_malloc(sizeof (address)); store->type = AT_IPv6; store->len = 16; store->data = g_malloc(16); @@ -1090,10 +1090,10 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v ((tvb_get_guint8(sctp_info->tvb[0],0)) != SCTP_SACK_CHUNK_ID) && ((tvb_get_guint8(sctp_info->tvb[0],0)) != SCTP_NR_SACK_CHUNK_ID)) { - sack = g_malloc(sizeof(tsn_t)); + sack = (tsn_t *)g_malloc(sizeof(tsn_t)); sack->tsns = NULL; sack->first_tsn = 0; - tsn = g_malloc(sizeof(tsn_t)); + tsn = (tsn_t *)g_malloc(sizeof(tsn_t)); tsn->tsns = NULL; tsn->first_tsn = 0; } @@ -1115,14 +1115,14 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v tsnumber = tvb_get_ntohl((sctp_info->tvb)[chunk_number], DATA_CHUNK_TSN_OFFSET); if (tsn->first_tsn == 0) tsn->first_tsn = tsnumber; - t_s_n = g_malloc(16); + t_s_n = (guint8 *)g_malloc(16); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(t_s_n),0, 16); tsn->tsns = g_list_append(tsn->tsns, t_s_n); datachunk = TRUE; length=tvb_get_ntohs(sctp_info->tvb[chunk_number], CHUNK_LENGTH_OFFSET)-DATA_CHUNK_HEADER_LENGTH; info->n_data_chunks++; info->n_data_bytes+=length; - tsn_s = g_malloc(sizeof(struct tsn_sort)); + tsn_s = (struct tsn_sort *)g_malloc(sizeof(struct tsn_sort)); tsn_s->tsnumber = tsnumber; tsn_s->secs = tsn->secs = (guint32)pinfo->fd->rel_ts.secs; tsn_s->usecs = tsn->usecs = (guint32)pinfo->fd->rel_ts.nsecs/1000; @@ -1206,11 +1206,11 @@ packet(void *tapdata _U_, packet_info *pinfo , epan_dissect_t *edt _U_ , const v length = tvb_get_ntohs(sctp_info->tvb[chunk_number], CHUNK_LENGTH_OFFSET); if (sack->first_tsn == 0) sack->first_tsn = tsnumber; - t_s_n = g_malloc(length); + t_s_n = (guint8 *)g_malloc(length); tvb_memcpy(sctp_info->tvb[chunk_number], (guint8 *)(t_s_n),0, length); sack->tsns = g_list_append(sack->tsns, t_s_n); sackchunk = TRUE; - tsn_s = g_malloc(sizeof(struct tsn_sort)); + tsn_s = (struct tsn_sort *)g_malloc(sizeof(struct tsn_sort)); tsn_s->tsnumber = tsnumber; tsn_s->secs = tsn->secs = (guint32)pinfo->fd->rel_ts.secs; tsn_s->usecs = tsn->usecs = (guint32)pinfo->fd->rel_ts.nsecs/1000; diff --git a/ui/gtk/service_response_time_table.c b/ui/gtk/service_response_time_table.c index f957963a36..fb91afdc10 100644 --- a/ui/gtk/service_response_time_table.c +++ b/ui/gtk/service_response_time_table.c @@ -302,7 +302,7 @@ srt_create_popup_menu(srt_stat_table *rst) action_group = gtk_action_group_new ("ServiceRespTFilterPopupActionGroup"); gtk_action_group_add_actions (action_group, /* the action group */ - (gpointer)service_resp_t__popup_entries, /* an array of action descriptions */ + (GtkActionEntry *)service_resp_t__popup_entries, /* an array of action descriptions */ G_N_ELEMENTS(service_resp_t__popup_entries), /* the number of entries */ rst); /* data to pass to the action callbacks */ @@ -477,7 +477,7 @@ init_srt_table(srt_stat_table *rst, int num_procs, GtkWidget *vbox, const char * gtk_widget_show(rst->scrolled_window); rst->num_procs=num_procs; - rst->procedures=g_malloc(sizeof(srt_procedure_t)*num_procs); + rst->procedures=(srt_procedure_t *)g_malloc(sizeof(srt_procedure_t)*num_procs); for(i=0;i<num_procs;i++){ time_stat_init(&rst->procedures[i].stats); rst->procedures[i].index = 0; @@ -501,7 +501,7 @@ init_srt_table_row(srt_stat_table *rst, int indx, const char *procedure) int i; rst->num_procs=indx+1; - rst->procedures=g_realloc(rst->procedures, sizeof(srt_procedure_t)*(rst->num_procs)); + rst->procedures=(srt_procedure_t *)g_realloc(rst->procedures, sizeof(srt_procedure_t)*(rst->num_procs)); for(i=old_num_procs;i<rst->num_procs;i++){ time_stat_init(&rst->procedures[i].stats); rst->procedures[i].index = i; diff --git a/ui/gtk/simple_dialog.c b/ui/gtk/simple_dialog.c index 51ec45ff25..76e8ec0659 100644 --- a/ui/gtk/simple_dialog.c +++ b/ui/gtk/simple_dialog.c @@ -208,48 +208,48 @@ display_simple_dialog(gint type, gint btn_mask, char *message) gtk_box_pack_start(GTK_BOX(main_vb), bbox, TRUE, TRUE, 0); gtk_widget_show(bbox); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); if(ok_bt) { g_object_set_data(G_OBJECT(ok_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_OK)); g_signal_connect(ok_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } - save_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); + save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_SAVE); if (save_bt) { g_object_set_data(G_OBJECT(save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_SAVE)); g_signal_connect(save_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } - dont_save_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_DONT_SAVE); + dont_save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_DONT_SAVE); if (dont_save_bt) { g_object_set_data(G_OBJECT(dont_save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_DONT_SAVE)); g_signal_connect(dont_save_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } - dont_save_bt = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_QUIT_DONT_SAVE); + dont_save_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_QUIT_DONT_SAVE); if (dont_save_bt) { g_object_set_data(G_OBJECT(dont_save_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_QUIT_DONT_SAVE)); g_signal_connect(dont_save_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } - bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLEAR); + bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLEAR); if(bt) { g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_CLEAR)); g_signal_connect(bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } - yes_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES); + yes_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES); if(yes_bt) { g_object_set_data(G_OBJECT(yes_bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_YES)); g_signal_connect(yes_bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } - bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO); + bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO); if(bt) { g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_NO)); g_signal_connect(bt, "clicked", G_CALLBACK(simple_dialog_cancel_cb), win); } - bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); if(bt) { g_object_set_data(G_OBJECT(bt), CALLBACK_BTN_KEY, GINT_TO_POINTER(ESD_BTN_CANCEL)); window_set_cancel_button(win, bt, simple_dialog_cancel_cb); @@ -276,7 +276,7 @@ display_queued_messages(void) queued_message_t *queued_message; while (message_queue != NULL) { - queued_message = message_queue->data; + queued_message = (queued_message_t *)message_queue->data; message_queue = g_slist_remove(message_queue, queued_message); display_simple_dialog(queued_message->type, queued_message->btn_mask, @@ -303,7 +303,7 @@ vsimple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, va_list gchar *message; queued_message_t *queued_message; GtkWidget *win; - GdkWindowState state = 0; + GdkWindowState state = (GdkWindowState)0; /* Format the message. */ message = g_strdup_vprintf(msg_format, ap); @@ -318,7 +318,7 @@ vsimple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, va_list if ((top_level == NULL) || state & GDK_WINDOW_STATE_ICONIFIED || state & GDK_WINDOW_STATE_WITHDRAWN) { - queued_message = g_malloc(sizeof (queued_message_t)); + queued_message = (queued_message_t *)g_malloc(sizeof (queued_message_t)); queued_message->type = type; queued_message->btn_mask = btn_mask; queued_message->message = message; @@ -353,7 +353,7 @@ simple_dialog(ESD_TYPE_E type, gint btn_mask, const gchar *msg_format, ...) static void simple_dialog_cancel_cb(GtkWidget *w, gpointer win) { gint button = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), CALLBACK_BTN_KEY)); - simple_dialog_cb_t callback_fct = g_object_get_data(G_OBJECT(win), CALLBACK_FCT_KEY); + simple_dialog_cb_t callback_fct = (simple_dialog_cb_t)g_object_get_data(G_OBJECT(win), CALLBACK_FCT_KEY); gpointer data = g_object_get_data(G_OBJECT(win), CALLBACK_DATA_KEY); if (callback_fct) @@ -378,7 +378,7 @@ simple_dialog_set_cb(gpointer dialog, simple_dialog_cb_t callback_fct, gpointer void simple_dialog_check_set(gpointer dialog, const gchar *text) { - GtkWidget *ask_cb = g_object_get_data(G_OBJECT(dialog), CHECK_BUTTON); + GtkWidget *ask_cb = (GtkWidget *)g_object_get_data(G_OBJECT(dialog), CHECK_BUTTON); gtk_button_set_label(GTK_BUTTON(ask_cb), text); gtk_widget_show(ask_cb); @@ -386,7 +386,7 @@ simple_dialog_check_set(gpointer dialog, const gchar *text) { gboolean simple_dialog_check_get(gpointer dialog) { - GtkWidget *ask_cb = g_object_get_data(G_OBJECT(GTK_WIDGET(dialog)), CHECK_BUTTON); + GtkWidget *ask_cb = (GtkWidget *)g_object_get_data(G_OBJECT(GTK_WIDGET(dialog)), CHECK_BUTTON); return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ask_cb)); } @@ -457,7 +457,7 @@ do_simple_message_box(ESD_TYPE_E type, gboolean *notagain, /* Format the message. */ message = g_strdup_vprintf(msg_format, ap); msg_dialog = gtk_message_dialog_new(GTK_WINDOW(top_level), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, + (GtkDialogFlags)(GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT), gtk_message_type, GTK_BUTTONS_OK, "%s", message); diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index 691af12483..7a95775875 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -74,6 +74,8 @@ #include "../../image/toolbar/telephone_16.xpm" #include "../../image/toolbar/analyze_24.xpm" +#define NO_MOD (GdkModifierType)0 + typedef struct stock_pixmap_tag{ const char * name; const char ** xpm_data; @@ -95,75 +97,75 @@ void stock_icons_init(void) { /* register non-standard pixmaps with the gtk-stock engine */ static const GtkStockItem stock_items[] = { - { (char *)WIRESHARK_STOCK_CAPTURE_INTERFACES, (char *)"_Interfaces", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CAPTURE_OPTIONS, (char *)"_Options", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CAPTURE_START, (char *)"_Start", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CAPTURE_STOP, (char *)"S_top", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CAPTURE_RESTART, (char *)"_Restart", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CAPTURE_FILTER, (char *)"_Capture Filter", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY, (char *)"_Capture Filter:", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CAPTURE_DETAILS, (char *)"_Details", 0, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_INTERFACES, (char *)"_Interfaces", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_OPTIONS, (char *)"_Options", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_START, (char *)"_Start", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_STOP, (char *)"S_top", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_RESTART, (char *)"_Restart", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_FILTER, (char *)"_Capture Filter", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY, (char *)"_Capture Filter:", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CAPTURE_DETAILS, (char *)"_Details", NO_MOD, 0, NULL }, #ifdef HAVE_GEOIP - { (char *)WIRESHARK_STOCK_MAP, (char *)"Map", 0, 0, NULL }, + { (char *)WIRESHARK_STOCK_MAP, (char *)"Map", NO_MOD, 0, NULL }, #endif - { (char *)WIRESHARK_STOCK_GRAPH_A_B, (char *)"Graph A->B", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_GRAPH_B_A, (char *)"Graph B->A", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_FOLLOW_STREAM, (char *)"Follow Stream", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_DISPLAY_FILTER, (char *)"Display _Filter", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY, (char *)"F_ilter:", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_BROWSE, (char *)"_Browse...", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CREATE_STAT, (char *)"Create _Stat", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_EXPORT, (char *)"_Export...", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_IMPORT, (char *)"_Import...", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_EDIT, (char *)"_Edit...", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_ADD_EXPRESSION, (char *)"E_xpression..." , 0, 0, NULL }, /* plus sign coming from icon */ - { (char *)WIRESHARK_STOCK_CLEAR_EXPRESSION, (char *)"Clea_r" , 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_APPLY_EXPRESSION, (char *)"App_ly" , 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_SAVE_ALL, (char *)"Save A_ll", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_DONT_SAVE, (char *)"Continue _without Saving", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_QUIT_DONT_SAVE, (char *)"Quit _without Saving", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_STOP_DONT_SAVE, (char *)"Stop and Continue _without Saving", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE, (char *)"Stop and Quit _without Saving", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_STOP_SAVE, (char *)"Stop and Save", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_ABOUT, (char *)"_About", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLORIZE, (char *)"_Colorize", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_AUTOSCROLL, (char *)"_Auto Scroll", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_RESIZE_COLUMNS, (char *)"Resize Columns", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_TIME, (char *)"Time", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_INTERNET, (char *)"Internet", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_WEB_SUPPORT, (char *)"Web Support", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_WIKI, (char *)"Wiki", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CONVERSATIONS, (char *)"Conversations", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_ENDPOINTS, (char *)"Endpoints", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_EXPERT_INFO, (char *)"Expert Info", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_GRAPHS, (char *)"Graphs", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_FLOW_GRAPH, (char *)"Flow Graph", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_TELEPHONY, (char *)"Telephony", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_DECODE_AS, (char *)"Decode As", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_CHECKBOX, (char *)"Checkbox", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_FILE_SET_LIST, (char *)"List Files", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_FILE_SET_NEXT, (char *)"Next File", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_FILE_SET_PREVIOUS, (char *)"Previous File", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_FILTER_OUT_STREAM, (char *)"Filter Out This Stream", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_ENABLE, (char *)"Enable", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_DISABLE, (char *)"Disable", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR1, (char *)"Color 1", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR2, (char *)"Color 2", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR3, (char *)"Color 3", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR4, (char *)"Color 4", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR5, (char *)"Color 5", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR6, (char *)"Color 6", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR7, (char *)"Color 7", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR8, (char *)"Color 8", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR9, (char *)"Color 9", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_COLOR0, (char *)"Color 10", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_DECODE, (char *)"Decode", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_AUDIO_PLAYER, (char *)"Player", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_VOIP_FLOW, (char *)"Flow", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_TELEPHONE, (char *)"Telephone", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_PREPARE_FILTER, (char *)"Prepare Filter", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_ANALYZE, (char *)"Analyze", 0, 0, NULL }, - { (char *)WIRESHARK_STOCK_SAVE, (char *)"Save", 0, 0, NULL } + { (char *)WIRESHARK_STOCK_GRAPH_A_B, (char *)"Graph A->B", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_GRAPH_B_A, (char *)"Graph B->A", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_FOLLOW_STREAM, (char *)"Follow Stream", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_DISPLAY_FILTER, (char *)"Display _Filter", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY, (char *)"F_ilter:", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_BROWSE, (char *)"_Browse...", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CREATE_STAT, (char *)"Create _Stat", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_EXPORT, (char *)"_Export...", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_IMPORT, (char *)"_Import...", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_EDIT, (char *)"_Edit...", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_ADD_EXPRESSION, (char *)"E_xpression..." , NO_MOD, 0, NULL }, /* plus sign coming from icon */ + { (char *)WIRESHARK_STOCK_CLEAR_EXPRESSION, (char *)"Clea_r" , NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_APPLY_EXPRESSION, (char *)"App_ly" , NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_SAVE_ALL, (char *)"Save A_ll", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_DONT_SAVE, (char *)"Continue _without Saving", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_QUIT_DONT_SAVE, (char *)"Quit _without Saving", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_STOP_DONT_SAVE, (char *)"Stop and Continue _without Saving", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_STOP_QUIT_DONT_SAVE, (char *)"Stop and Quit _without Saving", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_STOP_SAVE, (char *)"Stop and Save", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_ABOUT, (char *)"_About", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLORIZE, (char *)"_Colorize", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_AUTOSCROLL, (char *)"_Auto Scroll", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_RESIZE_COLUMNS, (char *)"Resize Columns", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_TIME, (char *)"Time", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_INTERNET, (char *)"Internet", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_WEB_SUPPORT, (char *)"Web Support", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_WIKI, (char *)"Wiki", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CONVERSATIONS, (char *)"Conversations", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_ENDPOINTS, (char *)"Endpoints", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_EXPERT_INFO, (char *)"Expert Info", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_GRAPHS, (char *)"Graphs", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_FLOW_GRAPH, (char *)"Flow Graph", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_TELEPHONY, (char *)"Telephony", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_DECODE_AS, (char *)"Decode As", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_CHECKBOX, (char *)"Checkbox", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_FILE_SET_LIST, (char *)"List Files", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_FILE_SET_NEXT, (char *)"Next File", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_FILE_SET_PREVIOUS, (char *)"Previous File", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_FILTER_OUT_STREAM, (char *)"Filter Out This Stream", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_ENABLE, (char *)"Enable", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_DISABLE, (char *)"Disable", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR1, (char *)"Color 1", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR2, (char *)"Color 2", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR3, (char *)"Color 3", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR4, (char *)"Color 4", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR5, (char *)"Color 5", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR6, (char *)"Color 6", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR7, (char *)"Color 7", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR8, (char *)"Color 8", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR9, (char *)"Color 9", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_COLOR0, (char *)"Color 10", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_DECODE, (char *)"Decode", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_AUDIO_PLAYER, (char *)"Player", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_VOIP_FLOW, (char *)"Flow", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_TELEPHONE, (char *)"Telephone", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_PREPARE_FILTER, (char *)"Prepare Filter", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_ANALYZE, (char *)"Analyze", NO_MOD, 0, NULL }, + { (char *)WIRESHARK_STOCK_SAVE, (char *)"Save", NO_MOD, 0, NULL } }; static const stock_pixmap_t pixmaps[] = { diff --git a/ui/gtk/summary_dlg.c b/ui/gtk/summary_dlg.c index 7a32c15805..5807f2691c 100644 --- a/ui/gtk/summary_dlg.c +++ b/ui/gtk/summary_dlg.c @@ -655,15 +655,15 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_) bbox = dlg_button_row_new(GTK_STOCK_CANCEL, GTK_STOCK_OK, GTK_STOCK_HELP, NULL); gtk_box_pack_start(GTK_BOX(main_vb), bbox, TRUE, TRUE, 0); - cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button(summary_dlg, cancel_bt, window_cancel_button_cb); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect (ok_bt, "clicked", G_CALLBACK(summary_ok_cb), comment_view); gtk_widget_grab_focus(ok_bt); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_SUMMARY_DIALOG); @@ -980,14 +980,14 @@ show_packet_comment_summary_dlg (GtkAction *action _U_, gpointer data _U_) bbox = dlg_button_row_new (GTK_STOCK_COPY, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL); gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - copy_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_COPY); + copy_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_COPY); g_signal_connect (copy_bt, "clicked", G_CALLBACK(comment_summary_copy_to_clipboard_cb), view); gtk_widget_set_sensitive (copy_bt, TRUE); - cancel_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button (view_capture_and_pkt_comments_dlg, cancel_bt, window_cancel_button_cb); - help_bt = g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data (G_OBJECT(bbox), GTK_STOCK_HELP); #if 0 g_signal_connect (help_bt, "clicked",/* G_CALLBACK(topic_cb)*/NULL, /*(gpointer)HELP_MANUAL_ADDR_RESOLVE_DIALOG*/NULL); #endif diff --git a/ui/gtk/supported_protos_dlg.c b/ui/gtk/supported_protos_dlg.c index 632839cced..3d02666a46 100644 --- a/ui/gtk/supported_protos_dlg.c +++ b/ui/gtk/supported_protos_dlg.c @@ -149,7 +149,7 @@ void supported_cb(GtkWidget *w _U_, gpointer data _U_) gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - ok_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + ok_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); window_set_cancel_button(supported_w, ok_bt, window_cancel_button_cb); g_signal_connect(supported_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL); diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index f8a1283147..cfa188e2be 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -157,7 +157,7 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data) end_dlg_list = end_dlg_list->next; } end_dlg_list->dlg = NULL; - end_dlg_list->param_items = g_malloc(dlg_data->nparams * sizeof (GtkWidget *)); + end_dlg_list->param_items = (GtkWidget **)g_malloc(dlg_data->nparams * sizeof (GtkWidget *)); end_dlg_list->cont.win_title = dlg_data->win_title; end_dlg_list->cont.init_string = dlg_data->init_string; end_dlg_list->cont.tap_init_cb = dlg_data->tap_init_cb; @@ -281,11 +281,11 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data) gtk_box_pack_start(GTK_BOX(dlg_box), bbox, FALSE, FALSE, 0); gtk_widget_show(bbox); - start_button = g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CREATE_STAT); + start_button = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), WIRESHARK_STOCK_CREATE_STAT); g_signal_connect(start_button, "clicked", G_CALLBACK(tap_param_dlg_start_button_clicked), current_dlg); - cancel_button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + cancel_button = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); window_set_cancel_button(current_dlg->dlg, cancel_button, window_cancel_button_cb); /* Catch the "activate" signal on all the text entries, so that diff --git a/ui/gtk/text_page_utils.c b/ui/gtk/text_page_utils.c index 4959c0acc9..79ed47b8a8 100644 --- a/ui/gtk/text_page_utils.c +++ b/ui/gtk/text_page_utils.c @@ -90,7 +90,7 @@ GtkWidget * text_page_new(const char *absolute_path) */ static void text_page_insert(GtkWidget *page, const char *buffer, int nchars) { - GtkWidget *txt = g_object_get_data(G_OBJECT(page), TEXT_KEY); + GtkWidget *txt = (GtkWidget *)g_object_get_data(G_OBJECT(page), TEXT_KEY); GtkTextBuffer *buf= gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt)); GtkTextIter iter; diff --git a/ui/gtk/time_shift_dlg.c b/ui/gtk/time_shift_dlg.c index aed4b0a58e..8a8ddb0b05 100644 --- a/ui/gtk/time_shift_dlg.c +++ b/ui/gtk/time_shift_dlg.c @@ -334,19 +334,19 @@ time_shift_cb(GtkWidget *w _U_, gpointer d _U_) NULL); gtk_box_pack_start(GTK_BOX(main_vb), bbox, TRUE, TRUE, 0); - apply_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); + apply_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_APPLY); g_signal_connect(apply_bt, "clicked", G_CALLBACK(time_shift_apply_cb), time_shift_frame_w); gtk_widget_set_tooltip_text(apply_bt, "Apply the Time Shift options to the frame data."); - close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); + close_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE); window_set_cancel_button(time_shift_frame_w, close_bt, window_cancel_button_cb); g_signal_connect(close_bt, "clicked", G_CALLBACK(time_shift_close_cb), time_shift_frame_w); gtk_widget_set_tooltip_text(close_bt, "Close this dialog box."); - help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); + help_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP); g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_TIME_SHIFT_DIALOG); gtk_widget_set_tooltip_text(help_bt, diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index abcaae80f6..c295ff3c71 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -225,7 +225,7 @@ static void reset_row(uat_t *uat, guint idx) { static guint8 *unhexbytes(const char *si, guint len, guint *len_p, const char** err) { guint8 *buf; guint8 *p; - const guint8 *s = (void*)si; + const guint8 *s = (const guint8 *)si; guint i; if (len % 2) { @@ -233,7 +233,7 @@ static guint8 *unhexbytes(const char *si, guint len, guint *len_p, const char** return NULL; } - buf = ep_alloc(len/2+1); + buf = (guint8 *)ep_alloc(len/2+1); p = buf; for (i = 0; i<len ; i += 2) { @@ -283,7 +283,7 @@ on_error: static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) { - struct _uat_dlg_data *dd = user_data; + struct _uat_dlg_data *dd = (struct _uat_dlg_data *)user_data; guint ncols = dd->uat->ncols; uat_field_t *f = dd->uat->fields; const char *err = NULL; @@ -314,7 +314,7 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) { case PT_TXTMOD_HEXBYTES: { text = gtk_entry_get_text(GTK_ENTRY(e)); - text = (void*) unhexbytes(text, (guint) strlen(text), &len, &err); + text = (const char *) unhexbytes(text, (guint) strlen(text), &len, &err); if (err) { err = ep_strdup_printf("error in field '%s': %s", f[colnum].title, err); @@ -394,7 +394,7 @@ on_failure: } static gboolean uat_cancel_dlg_cb(GtkWidget *win _U_, gpointer user_data) { - struct _uat_dlg_data *dd = user_data; + struct _uat_dlg_data *dd = (struct _uat_dlg_data *)user_data; if (dd->uat->rep) window_present(GTK_WIDGET(dd->uat->rep->window)); @@ -411,14 +411,14 @@ static gboolean uat_cancel_dlg_cb(GtkWidget *win _U_, gpointer user_data) { } static void fld_combo_box_changed_cb(GtkComboBox *combo_box, gpointer user_data) { - int *valptr = user_data; + int *valptr = (int *)user_data; *valptr = gtk_combo_box_get_active(combo_box); } static void uat_edit_dialog(uat_t *uat, gint row, gboolean copy) { GtkWidget *win, *main_grid, *main_vb, *bbox, *bt_cancel, *bt_ok; - struct _uat_dlg_data *dd = g_malloc(sizeof(struct _uat_dlg_data)); + struct _uat_dlg_data *dd = (struct _uat_dlg_data *)g_malloc(sizeof(struct _uat_dlg_data)); uat_field_t *f = uat->fields; guint colnum; @@ -458,10 +458,10 @@ static void uat_edit_dialog(uat_t *uat, gint row, gboolean copy) { bbox = dlg_button_row_new(GTK_STOCK_CANCEL, GTK_STOCK_OK, NULL); gtk_box_pack_end(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); - bt_ok = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); + bt_ok = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_OK); g_signal_connect(bt_ok, "clicked", G_CALLBACK(uat_dlg_cb), dd); - bt_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + bt_cancel = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); g_signal_connect(bt_cancel, "clicked", G_CALLBACK(uat_cancel_dlg_cb), dd); window_set_cancel_button(win, bt_cancel, NULL); @@ -505,8 +505,8 @@ static void uat_edit_dialog(uat_t *uat, gint row, gboolean copy) { case PT_TXTMOD_ENUM: { GtkWidget *combo_box; int idx; - const value_string *enum_vals = f[colnum].fld_data; - int *valptr = g_malloc(sizeof(int)); /* A place to store the index of the */ + const value_string *enum_vals = (const value_string *)f[colnum].fld_data; + int *valptr = (int *)g_malloc(sizeof(int)); /* A place to store the index of the */ /* "active" fld_data array entry */ /* -1 means "nothing selected (active)" */ combo_box = gtk_combo_box_text_new(); @@ -548,7 +548,7 @@ struct _uat_del { }; static void uat_del_cb(GtkButton *button _U_, gpointer u) { - struct _uat_del *ud = u; + struct _uat_del *ud = (struct _uat_del *)u; GtkTreeIter iter; GtkTreePath *path; @@ -573,7 +573,7 @@ static void uat_del_cb(GtkButton *button _U_, gpointer u) { } static void uat_cancel_del_cb(GtkButton *button _U_, gpointer u) { - struct _uat_del *ud = u; + struct _uat_del *ud = (struct _uat_del *)u; window_destroy(GTK_WIDGET(ud->win)); @@ -587,7 +587,7 @@ static void uat_del_dlg(uat_t *uat, int idx) { uat_field_t *f = uat->fields; guint colnum; void *rec = UAT_INDEX_PTR(uat, idx); - struct _uat_del *ud = g_malloc(sizeof(struct _uat_del)); + struct _uat_del *ud = (struct _uat_del *)g_malloc(sizeof(struct _uat_del)); ud->uat = uat; ud->idx = idx; @@ -621,10 +621,10 @@ static void uat_del_dlg(uat_t *uat, int idx) { bbox = dlg_button_row_new(GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL); gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0); - bt_ok = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_DELETE); + bt_ok = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_DELETE); g_signal_connect(bt_ok, "clicked", G_CALLBACK(uat_del_cb), ud); - bt_cancel = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); + bt_cancel = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL); g_signal_connect(bt_cancel, "clicked", G_CALLBACK(uat_cancel_del_cb), ud); window_set_cancel_button( win, bt_cancel, NULL); @@ -632,7 +632,7 @@ static void uat_del_dlg(uat_t *uat, int idx) { } static void uat_new_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; if (! uat->rep) return; @@ -640,7 +640,7 @@ static void uat_new_cb(GtkButton *button _U_, gpointer u) { } static void uat_edit_cb(GtkWidget *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; if (! uat->rep) return; @@ -648,7 +648,7 @@ static void uat_edit_cb(GtkWidget *button _U_, gpointer u) { } static void uat_copy_cb(GtkWidget *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; if (! uat->rep) return; @@ -660,7 +660,7 @@ static void uat_double_click_cb(GtkWidget *tv, GtkTreePath *path _U_, GtkTreeVie } static void uat_delete_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; if (! uat->rep) return; @@ -668,7 +668,7 @@ static void uat_delete_cb(GtkButton *button _U_, gpointer u) { } static gboolean uat_window_delete_event_cb(GtkWindow *w _U_, GdkEvent *e _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; if (uat->rep) { void *rep = uat->rep; @@ -685,7 +685,7 @@ static gboolean uat_window_delete_event_cb(GtkWindow *w _U_, GdkEvent *e _U_, gp } static void uat_up_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; gint row = uat->rep->selected; g_assert(row > 0); @@ -701,7 +701,7 @@ static void uat_up_cb(GtkButton *button _U_, gpointer u) { } static void uat_down_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; gint row = uat->rep->selected; g_assert(row >= 0 && (guint) row < *uat->nrows_p - 1); @@ -731,7 +731,7 @@ static void uat_apply_changes(uat_t *uat) { } static void uat_cancel_cb(GtkWidget *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; const gchar *err = NULL; if (uat->changed) { @@ -753,7 +753,7 @@ static void uat_cancel_cb(GtkWidget *button _U_, gpointer u) { } static void uat_apply_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; if (uat->changed) { if (uat->post_update_cb) uat->post_update_cb(); @@ -762,7 +762,7 @@ static void uat_apply_cb(GtkButton *button _U_, gpointer u) { } static void uat_ok_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; gchar *err = NULL; if (uat->changed) { @@ -784,7 +784,7 @@ static void uat_ok_cb(GtkButton *button _U_, gpointer u) { } static void uat_clear_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; gtk_list_store_clear(uat->rep->list_store); uat_clear(uat); @@ -792,7 +792,7 @@ static void uat_clear_cb(GtkButton *button _U_, gpointer u) { } static void uat_refresh_cb(GtkButton *button _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; const gchar *err = NULL; guint i; @@ -814,7 +814,7 @@ static void uat_refresh_cb(GtkButton *button _U_, gpointer u) { static void remember_selected_row(GtkWidget *w _U_, gpointer u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; gint row; row = tree_view_list_store_get_selected_row(uat->rep->list); @@ -828,7 +828,7 @@ static void remember_selected_row(GtkWidget *w _U_, gpointer u) { } static void uat_yessave_cb(GtkWindow *w _U_, void *u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; gchar *err = NULL; window_delete_event_cb(uat->rep->unsaved_window, NULL, NULL); @@ -849,7 +849,7 @@ static void uat_yessave_cb(GtkWindow *w _U_, void *u) { static void uat_nosave_cb(GtkWindow *w _U_, void *u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; window_delete_event_cb(uat->rep->unsaved_window, NULL, NULL); g_signal_handlers_disconnect_by_func(uat->rep->window, uat_window_delete_event_cb, uat); @@ -864,7 +864,7 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent *e _U_, gpointer u) { GtkWidget *win, *vbox, *label, *bbox; GtkWidget *yes_bt, *no_bt; gchar *message; - uat_t *uat = u; + uat_t *uat = (uat_t *)u; if (uat->rep->unsaved_window) { window_present(uat->rep->unsaved_window); @@ -886,8 +886,8 @@ static gboolean unsaved_dialog(GtkWindow *w _U_, GdkEvent *e _U_, gpointer u) { bbox = dlg_button_row_new(GTK_STOCK_YES, GTK_STOCK_NO, NULL); - yes_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES); - no_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO); + yes_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_YES); + no_bt = (GtkWidget *)g_object_get_data(G_OBJECT(bbox), GTK_STOCK_NO); g_signal_connect(no_bt, "clicked", G_CALLBACK(uat_nosave_cb), uat); g_signal_connect(yes_bt, "clicked", G_CALLBACK(uat_yessave_cb), uat); @@ -914,7 +914,7 @@ static void uat_help_cb(GtkWidget *w _U_, gpointer u) { } static GtkWidget *uat_window(void *u) { - uat_t *uat = u; + uat_t *uat = (uat_t *)u; uat_field_t *f = uat->fields; uat_rep_t *rep; guint i; @@ -931,7 +931,7 @@ static GtkWidget *uat_window(void *u) { window_present(uat->rep->window); return uat->rep->window; } else { - uat->rep = rep = g_malloc0(sizeof(uat_rep_t)); + uat->rep = rep = (uat_rep_t *)g_malloc0(sizeof(uat_rep_t)); } global_fname = get_datafile_path(uat->filename); @@ -960,7 +960,7 @@ static GtkWidget *uat_window(void *u) { rep->scrolledwindow = scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(rep->scrolledwindow), GTK_SHADOW_IN); - col_types = g_malloc(sizeof(GType) *uat->ncols); + col_types = (GType *)g_malloc(sizeof(GType) *uat->ncols); for ( colnum = 0; colnum < uat->ncols; colnum++ ) { col_types[colnum] = G_TYPE_STRING; } @@ -992,7 +992,7 @@ static GtkWidget *uat_window(void *u) { if (uat->help) { GtkWidget *help_btn; rep->bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CANCEL, NULL); - help_btn = g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_HELP); + help_btn = (GtkWidget *)g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_HELP); g_signal_connect(help_btn, "clicked", G_CALLBACK(uat_help_cb), uat); } else { @@ -1046,9 +1046,9 @@ static GtkWidget *uat_window(void *u) { gtk_box_pack_end(GTK_BOX(refresh_hbox), rep->bt_clear, TRUE, FALSE, 5); - rep->bt_apply = g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_APPLY); - rep->bt_cancel = g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_CANCEL); - rep->bt_ok = g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_OK); + rep->bt_apply = (GtkWidget *)g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_APPLY); + rep->bt_cancel = (GtkWidget *)g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_CANCEL); + rep->bt_ok = (GtkWidget *)g_object_get_data(G_OBJECT(rep->bbox), GTK_STOCK_OK); gtk_box_pack_end(GTK_BOX(rep->vbox), rep->bbox, FALSE, FALSE, 0); diff --git a/ui/gtk/voip_calls.c b/ui/gtk/voip_calls.c index 78aca8f573..c966df886b 100644 --- a/ui/gtk/voip_calls.c +++ b/ui/gtk/voip_calls.c @@ -167,7 +167,7 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo) list = g_list_first(tapinfo->callsinfo_list); while (list) { - callsinfo = list->data; + callsinfo = (voip_calls_info_t *)list->data; g_free(callsinfo->call_id); g_free(callsinfo->from_identity); g_free(callsinfo->to_identity); @@ -199,7 +199,7 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo) list = g_list_first(tapinfo->graph_analysis->list); while (list) { - graph_item = list->data; + graph_item = (graph_analysis_item_t *)list->data; g_free(graph_item->frame_label); g_free(graph_item->comment); g_free((void *)graph_item->src_addr.data); @@ -217,7 +217,7 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo) list = g_list_first(rtp_tapinfo->list); while(list) { - strinfo = list->data; + strinfo = (voip_rtp_stream_info_t *)list->data; g_free(strinfo->pt_str); list = g_list_next(list); } @@ -229,7 +229,7 @@ void voip_calls_reset(voip_calls_tapinfo_t *tapinfo) /****************************************************************************/ void graph_analysis_data_init(void) { - the_tapinfo_struct.graph_analysis = g_malloc(sizeof(graph_analysis_info_t)); + the_tapinfo_struct.graph_analysis = (graph_analysis_info_t *)g_malloc(sizeof(graph_analysis_info_t)); the_tapinfo_struct.graph_analysis->nconv = 0; the_tapinfo_struct.graph_analysis->list = NULL; the_tapinfo_struct.graph_analysis->ht= g_hash_table_new(g_int_hash, g_int_equal); @@ -241,7 +241,7 @@ static void add_to_graph(voip_calls_tapinfo_t *tapinfo _U_, packet_info *pinfo, { graph_analysis_item_t *gai; - gai = g_malloc(sizeof(graph_analysis_item_t)); + gai = (graph_analysis_item_t *)g_malloc(sizeof(graph_analysis_item_t)); gai->fd = pinfo->fd; COPY_ADDRESS(&(gai->src_addr),src_addr); COPY_ADDRESS(&(gai->dst_addr),dst_addr); @@ -276,7 +276,7 @@ static int append_to_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 fram gchar *comment = NULL; if(NULL!=tapinfo->graph_analysis->ht) - gai=g_hash_table_lookup(tapinfo->graph_analysis->ht, &frame_num); + gai=(graph_analysis_item_t *)g_hash_table_lookup(tapinfo->graph_analysis->ht, &frame_num); if(gai) { frame_label = gai->frame_label; comment = gai->comment; @@ -305,7 +305,7 @@ static int change_frame_graph(voip_calls_tapinfo_t *tapinfo _U_, guint32 frame_n gchar *comment = NULL; if(NULL!=tapinfo->graph_analysis->ht) - gai=g_hash_table_lookup(tapinfo->graph_analysis->ht, &frame_num); + gai=(graph_analysis_item_t *)g_hash_table_lookup(tapinfo->graph_analysis->ht, &frame_num); if(gai) { frame_label = gai->frame_label; comment = gai->comment; @@ -336,7 +336,7 @@ static guint change_call_num_graph(voip_calls_tapinfo_t *tapinfo _U_, guint16 ca list = g_list_first(tapinfo->graph_analysis->list); while (list) { - gai = list->data; + gai = (graph_analysis_item_t *)list->data; if (gai->conv_num == call_num) { gai->conv_num = new_call_num; items_changed++; @@ -355,7 +355,7 @@ static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo _U_, packet_info * guint item_num; gboolean inserted; - new_gai = g_malloc(sizeof(graph_analysis_item_t)); + new_gai = (graph_analysis_item_t *)g_malloc(sizeof(graph_analysis_item_t)); new_gai->fd = packet_list_get_row_data(frame_num); COPY_ADDRESS(&(new_gai->src_addr),src_addr); COPY_ADDRESS(&(new_gai->dst_addr),dst_addr); @@ -380,7 +380,7 @@ static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo _U_, packet_info * list = g_list_first(tapinfo->graph_analysis->list); while (list) { - gai = list->data; + gai = (graph_analysis_item_t *)list->data; if (gai->fd->num > frame_num) { the_tapinfo_struct.graph_analysis->list = g_list_insert(the_tapinfo_struct.graph_analysis->list, new_gai, item_num); g_hash_table_insert(tapinfo->graph_analysis->ht, &new_gai->fd->num, new_gai); @@ -411,7 +411,7 @@ static gboolean rtp_evt_end = FALSE; static int rtp_event_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtp_event_info) { - const struct _rtp_event_info *pi = rtp_event_info; + const struct _rtp_event_info *pi = (const struct _rtp_event_info *)rtp_event_info; /* do not consider RTP events packets without a setup frame */ if (pi->info_setup_frame_num == 0) { @@ -498,7 +498,7 @@ RTP_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void cons GList *list; struct _rtp_conversation_info *p_conv_data = NULL; - const struct _rtp_info *pi = RTPinfo; + const struct _rtp_info *pi = (const struct _rtp_info *)RTPinfo; /* do not consider RTP packets without a setup frame */ if (pi->info_setup_frame_num == 0) { @@ -514,7 +514,7 @@ RTP_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void cons list = g_list_first(tapinfo->list); while (list) { - tmp_listinfo=list->data; + tmp_listinfo=(voip_rtp_stream_info_t *)list->data; if ( (tmp_listinfo->setup_frame_number == pi->info_setup_frame_num) && (tmp_listinfo->ssrc == pi->info_sync_src) && (tmp_listinfo->end_stream == FALSE)) { /* if the payload type has changed, we mark the stream as finished to create a new one @@ -536,7 +536,7 @@ RTP_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void cons /* not in the list? then create a new entry */ if (strinfo==NULL) { - strinfo = g_malloc(sizeof(voip_rtp_stream_info_t)); + strinfo = (voip_rtp_stream_info_t *)g_malloc(sizeof(voip_rtp_stream_info_t)); COPY_ADDRESS(&(strinfo->src_addr), &(pinfo->src)); strinfo->src_port = pinfo->srcport; COPY_ADDRESS(&(strinfo->dest_addr), &(pinfo->dst)); @@ -549,10 +549,10 @@ RTP_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, void cons /* if it is dynamic payload, let use the conv data to see if it is defined */ if ( (strinfo->pt >= PT_UNDF_96) && (strinfo->pt <= PT_UNDF_127) ) { /* Use existing packet info if available */ - p_conv_data = p_get_proto_data(pinfo->fd, proto_get_id_by_filter_name("rtp")); + p_conv_data = (struct _rtp_conversation_info *)p_get_proto_data(pinfo->fd, proto_get_id_by_filter_name("rtp")); if (p_conv_data && p_conv_data->rtp_dyn_payload) { encoding_name_and_rate_t *encoding_name_and_rate_pt = NULL; - encoding_name_and_rate_pt = g_hash_table_lookup(p_conv_data->rtp_dyn_payload, &strinfo->pt); + encoding_name_and_rate_pt = (encoding_name_and_rate_t *)g_hash_table_lookup(p_conv_data->rtp_dyn_payload, &strinfo->pt); if (encoding_name_and_rate_pt) { strinfo->pt_str = g_strdup(encoding_name_and_rate_pt->encoding_name); } @@ -600,17 +600,17 @@ static void RTP_packet_draw(void *prs _U_) rtp_streams_list = g_list_first(rtp_tapinfo->list); while (rtp_streams_list) { - rtp_listinfo = rtp_streams_list->data; + rtp_listinfo = (voip_rtp_stream_info_t *)rtp_streams_list->data; /* using the setup frame number of the RTP stream, we get the call number that it belongs to*/ /* voip_calls_graph_list = g_list_first(the_tapinfo_struct.graph_analysis->list); */ - gai = g_hash_table_lookup(the_tapinfo_struct.graph_analysis->ht, &rtp_listinfo->setup_frame_number); + gai = (graph_analysis_item_t *)g_hash_table_lookup(the_tapinfo_struct.graph_analysis->ht, &rtp_listinfo->setup_frame_number); if(gai != NULL) { /* Found the setup frame*/ conv_num = gai->conv_num; /* if RTP was already in the Graph, just update the comment information */ - gai = g_hash_table_lookup(the_tapinfo_struct.graph_analysis->ht, &rtp_listinfo->start_fd->num); + gai = (graph_analysis_item_t *)g_hash_table_lookup(the_tapinfo_struct.graph_analysis->ht, &rtp_listinfo->start_fd->num); if(gai != NULL) { duration = (guint32)(nstime_to_msec(&rtp_listinfo->stop_fd->rel_ts) - nstime_to_msec(&rtp_listinfo->start_fd->rel_ts)); g_free(gai->comment); @@ -618,7 +618,7 @@ static void RTP_packet_draw(void *prs _U_) (rtp_listinfo->is_srtp)?"SRTP":"RTP", rtp_listinfo->npackets, duration/1000,(duration%1000), rtp_listinfo->ssrc); }else { - new_gai = g_malloc(sizeof(graph_analysis_item_t)); + new_gai = (graph_analysis_item_t *)g_malloc(sizeof(graph_analysis_item_t)); new_gai->fd = rtp_listinfo->start_fd; COPY_ADDRESS(&(new_gai->src_addr),&(rtp_listinfo->src_addr)); COPY_ADDRESS(&(new_gai->dst_addr),&(rtp_listinfo->dest_addr)); @@ -779,14 +779,14 @@ T38_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const vo double duration; int conv_num = -1; - const t38_packet_info *pi = T38info; + const t38_packet_info *pi = (const t38_packet_info *)T38info; if (pi->setup_frame_number != 0) { /* using the setup frame number of the T38 packet, we get the call number that it belongs */ voip_calls_graph_list = g_list_first(tapinfo->graph_analysis->list); while (voip_calls_graph_list) { - tmp_gai = voip_calls_graph_list->data; + tmp_gai = (graph_analysis_item_t *)voip_calls_graph_list->data; if (pi->setup_frame_number == tmp_gai->fd->num) { gai = tmp_gai; break; @@ -806,7 +806,7 @@ T38_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const vo list = g_list_first(tapinfo->callsinfo_list); while (list) { - tmp_listinfo=list->data; + tmp_listinfo=(voip_calls_info_t *)list->data; if (tmp_listinfo->protocol == MEDIA_T38) { callsinfo = (voip_calls_info_t*)(list->data); break; @@ -816,7 +816,7 @@ T38_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const vo /* not in the list? then create a new entry */ if (callsinfo==NULL) { - callsinfo = g_malloc0(sizeof(voip_calls_info_t)); + callsinfo = (voip_calls_info_t *)g_malloc0(sizeof(voip_calls_info_t)); callsinfo->call_active_state = VOIP_ACTIVE; callsinfo->call_state = VOIP_UNKNOWN; callsinfo->from_identity=g_strdup("T38 Media only"); @@ -929,7 +929,7 @@ static guint32 sdp_frame_num = 0; static void free_sip_info(gpointer p) { - sip_calls_info_t *si = p; + sip_calls_info_t *si = (sip_calls_info_t *)p; g_free(si->call_identifier); g_free(si); @@ -951,7 +951,7 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con gchar *comment = NULL; gchar *key=NULL; - const sip_info_value_t *pi = SIPinfo; + const sip_info_value_t *pi = (const sip_info_value_t *)SIPinfo; /* do not consider packets without call_id */ if (pi->tap_call_id ==NULL) { @@ -967,12 +967,12 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con NULL);/* value_destroy_func */ } /* search the call information in the SIP_HASH */ - callsinfo = g_hash_table_lookup(tapinfo->callsinfo_hashtable[SIP_HASH], key); + callsinfo = (voip_calls_info_t *)g_hash_table_lookup(tapinfo->callsinfo_hashtable[SIP_HASH], key); /* not in the hash? then create a new entry if the message is INVITE -i.e. if this session is a call*/ if ((callsinfo==NULL) &&(pi->request_method!=NULL)) { if (strcmp(pi->request_method,"INVITE")==0) { - callsinfo = g_malloc0(sizeof(voip_calls_info_t)); + callsinfo = (voip_calls_info_t *)g_malloc0(sizeof(voip_calls_info_t)); callsinfo->call_active_state = VOIP_ACTIVE; callsinfo->call_state = VOIP_CALL_SETUP; callsinfo->from_identity=g_strdup(pi->tap_from_addr); @@ -983,7 +983,7 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con callsinfo->protocol=VOIP_SIP; callsinfo->prot_info=g_malloc(sizeof(sip_calls_info_t)); callsinfo->free_prot_info = free_sip_info; - tmp_sipinfo = callsinfo->prot_info; + tmp_sipinfo = (sip_calls_info_t *)callsinfo->prot_info; tmp_sipinfo->call_identifier = g_strdup(pi->tap_call_id); tmp_sipinfo->sip_state = SIP_INVITE_SENT; tmp_sipinfo->invite_cseq = pi->tap_cseq_number; @@ -997,7 +997,7 @@ SIPcalls_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, con } if (callsinfo!=NULL) { - tmp_sipinfo = callsinfo->prot_info; + tmp_sipinfo = (sip_calls_info_t *)callsinfo->prot_info; /* let's analyze the call state */ @@ -1144,7 +1144,7 @@ isup_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, co gchar *comment = NULL; /*voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct; unused */ - const isup_tap_rec_t *pi = isup_info; + const isup_tap_rec_t *pi = (const isup_tap_rec_t *)isup_info; /* check if the lower layer is MTP matching the frame number */ if (mtp3_frame_num != pinfo->fd->num) return 0; |