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_chunk_stat_dlg.c | |
| parent | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (diff) | |
| download | wireshark-35d1b406d74101f0ec04026e9a8b2ce75d57201d.tar.gz | |
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_chunk_stat_dlg.c')
| -rw-r--r-- | ui/gtk/sctp_chunk_stat_dlg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/sctp_chunk_stat_dlg.c b/ui/gtk/sctp_chunk_stat_dlg.c index b9bdd66610..4a7e1bdd30 100644 --- a/ui/gtk/sctp_chunk_stat_dlg.c +++ b/ui/gtk/sctp_chunk_stat_dlg.c @@ -602,7 +602,7 @@ gtk_sctpstat_dlg(struct sctp_udata *u_data, unsigned int direction) GtkWidget *bt_close; - sctp_graph_t *io = g_malloc(sizeof(sctp_graph_t)); + sctp_graph_t *io = (sctp_graph_t *)g_malloc(sizeof(sctp_graph_t)); io->window = NULL; u_data->io = io; u_data->io->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -672,7 +672,7 @@ sctp_chunk_dlg(struct sctp_udata *u_data) gchar label_txt[50]; int i, row; - sctp_graph_t *io = g_malloc(sizeof(sctp_graph_t)); + sctp_graph_t *io = (sctp_graph_t *)g_malloc(sizeof(sctp_graph_t)); io->window = NULL; u_data->io = io; @@ -777,14 +777,14 @@ sctp_chunk_dlg_show(struct sctp_analyse* userdata) gint i; 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->parent = userdata; if (selected_stream == NULL) - selected_stream = g_malloc(sizeof(sctp_assoc_info_t)); + selected_stream = (sctp_assoc_info_t *)g_malloc(sizeof(sctp_assoc_info_t)); selected_stream = u_data->assoc; for (i=0; i<NUM_CHUNKS; i++) @@ -802,14 +802,14 @@ sctp_chunk_stat_dlg_show(unsigned int direction, 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->parent = userdata; if (selected_stream == NULL) - selected_stream = g_malloc(sizeof(sctp_assoc_info_t)); + selected_stream = (sctp_assoc_info_t *)g_malloc(sizeof(sctp_assoc_info_t)); selected_stream = u_data->assoc; selected_stream->addr_chunk_count = u_data->assoc->addr_chunk_count; |