diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
| commit | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (patch) | |
| tree | 885dc3989020530f2fcf4b82ec39284d36d43bd4 /ui/gtk/packet_list_store.c | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404
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
Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
didn't compile and needed a few additional patches.
svn path=/trunk/; revision=48447
Diffstat (limited to 'ui/gtk/packet_list_store.c')
| -rw-r--r-- | ui/gtk/packet_list_store.c | 8 |
1 files changed, 4 insertions, 4 deletions
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); |