diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
| commit | 35d1b406d74101f0ec04026e9a8b2ce75d57201d (patch) | |
| tree | 0f082370b8dc5dd91106bda722e9d097a568dbb3 /ui/gtk/sctp_assoc_analyse.c | |
| parent | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10408
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
svn path=/trunk/; revision=48448
Diffstat (limited to 'ui/gtk/sctp_assoc_analyse.c')
| -rw-r--r-- | ui/gtk/sctp_assoc_analyse.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c index 0f71a60f3d..4bf749808d 100644 --- a/ui/gtk/sctp_assoc_analyse.c +++ b/ui/gtk/sctp_assoc_analyse.c @@ -606,7 +606,7 @@ create_analyse_window(struct sctp_analyse *u_data) GtkWidget *hbox_l1, *hbox_l2, *label, *h_button_box; GtkWidget *chunk_stat_bt, *close_bt, *graph_bt1, *graph_bt2, *chunk_bt1, *bt_filter; - u_data->analyse_nb = g_malloc(sizeof(struct notes)); + u_data->analyse_nb = (struct notes *)g_malloc(sizeof(struct notes)); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER); g_signal_connect(window, "destroy", G_CALLBACK(on_destroy), u_data); @@ -696,7 +696,7 @@ create_analyse_window(struct sctp_analyse *u_data) page2 = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page2), 8); - u_data->analyse_nb->page2 = g_malloc(sizeof(struct page)); + u_data->analyse_nb->page2 = (struct page *)g_malloc(sizeof(struct page)); u_data->analyse_nb->page2->addr_frame = gtk_frame_new(NULL); gtk_box_pack_start(GTK_BOX(page2), u_data->analyse_nb->page2->addr_frame, TRUE, TRUE, 0); @@ -804,7 +804,7 @@ create_analyse_window(struct sctp_analyse *u_data) page3 = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 8, FALSE); gtk_container_set_border_width(GTK_CONTAINER(page3), 8); - u_data->analyse_nb->page3 = g_malloc(sizeof(struct page)); + u_data->analyse_nb->page3 = (struct page *)g_malloc(sizeof(struct page)); u_data->analyse_nb->page3->addr_frame = gtk_frame_new(NULL); gtk_box_pack_start(GTK_BOX(page3), u_data->analyse_nb->page3->addr_frame, TRUE, TRUE, 0); @@ -922,7 +922,7 @@ assoc_analyse(sctp_assoc_info_t* assoc) struct sctp_analyse *u_data; int i; - u_data = g_malloc(sizeof(struct sctp_analyse)); + u_data = (struct sctp_analyse *)g_malloc(sizeof(struct sctp_analyse)); u_data->assoc = assoc; u_data->assoc->addr_chunk_count = assoc->addr_chunk_count; u_data->window = NULL; @@ -1044,7 +1044,7 @@ struct sctp_analyse *u_data; /* (redissect all packets) */ sctp_stat_scan(); - u_data = g_malloc(sizeof(struct sctp_analyse)); + u_data = (struct sctp_analyse *)g_malloc(sizeof(struct sctp_analyse)); u_data->assoc = NULL; u_data->children = NULL; u_data->analyse_nb = NULL; @@ -1067,7 +1067,7 @@ sctp_analyse_start(GtkAction *action _U_, gpointer user_data _U_) sctp_stat_scan(); - u_data = g_malloc(sizeof(struct sctp_analyse)); + u_data = (struct sctp_analyse *)g_malloc(sizeof(struct sctp_analyse)); u_data->assoc = NULL; u_data->children = NULL; u_data->analyse_nb = NULL; |