diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
| commit | 0df5a9390d41149dfc87440d72e7669ba96748ec (patch) | |
| tree | 8accf4dfc301adfc679ed7f21b7123cb4b2c55f9 /plugins/stats_tree/pinfo_stats_tree.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397
svn path=/trunk/; revision=48438
Diffstat (limited to 'plugins/stats_tree/pinfo_stats_tree.c')
| -rw-r--r-- | plugins/stats_tree/pinfo_stats_tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/stats_tree/pinfo_stats_tree.c b/plugins/stats_tree/pinfo_stats_tree.c index e4ada8e9ac..3646f61181 100644 --- a/plugins/stats_tree/pinfo_stats_tree.c +++ b/plugins/stats_tree/pinfo_stats_tree.c @@ -75,8 +75,8 @@ static uat_t * plen_uat = NULL; static guint num_plen_uat = 0; static void* uat_plen_record_copy_cb(void* n, const void* o, size_t siz _U_) { - const uat_plen_record_t *r = o; - uat_plen_record_t *rn = n; + const uat_plen_record_t *r = (const uat_plen_record_t *)o; + uat_plen_record_t *rn = (uat_plen_record_t *)n; if (r->packet_range) rn->packet_range = range_copy(r->packet_range); @@ -150,7 +150,7 @@ static const gchar* st_str_plen = "Packet Lengths"; static void plen_stats_tree_init(stats_tree* st) { guint i; - char **str_range_array = ep_alloc(num_plen_uat*sizeof(char*)); + char **str_range_array = (char **)ep_alloc(num_plen_uat*sizeof(char*)); /* Convert the ranges to strings for the stats tree API */ for (i = 0; i < num_plen_uat; i++) { @@ -217,7 +217,7 @@ void register_pinfo_stat_trees(void) { sizeof(uat_plen_record_t), /* record size */ "packet_lengths", /* filename */ TRUE, /* from_profile */ - (void*) &uat_plen_records, /* data_ptr */ + (void**) &uat_plen_records, /* data_ptr */ &num_plen_uat, /* numitems_ptr */ 0, /* not a dissector, so affects neither dissection nor fields */ NULL, /* help */ |