diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:22:31 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 21:22:31 +0000 |
| commit | 7c56677cf9e703e6dde30529b24e27dd2a4960a9 (patch) | |
| tree | 5d78d22112806bca22edbc8e069f77503269b381 /asn1/h248/packet-h248-template.c | |
| parent | b8481499646f07512ceddac567887072822dffdb (diff) | |
| download | wireshark-7c56677cf9e703e6dde30529b24e27dd2a4960a9.tar.gz | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48429
Diffstat (limited to 'asn1/h248/packet-h248-template.c')
| -rw-r--r-- | asn1/h248/packet-h248-template.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index c7ec114d58..b5e13761e2 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -88,7 +88,6 @@ static gcp_hf_ett_t h248_arrel = {{-1,-1,-1,-1,-1,-1},{-1,-1,-1,-1}}; #include "packet-h248-ett.c" -static dissector_handle_t h248_term_handle; static dissector_table_t subdissector_table; static emem_tree_t* msgs = NULL; @@ -877,7 +876,7 @@ static int dissect_h248_ctx_id(gboolean implicit_tag, packet_info *pinfo, proto_ s_h248_package_t *s_find_package_id(guint16 pkgid) { s_h248_package_t *s_pkg = NULL; - s_pkg = g_tree_lookup(packages, GUINT_TO_POINTER((guint32)(pkgid))); + s_pkg = (s_h248_package_t *)g_tree_lookup(packages, GUINT_TO_POINTER((guint32)(pkgid))); return s_pkg; } @@ -894,7 +893,7 @@ static gint32 comparePkgID(gconstpointer a, gconstpointer b) { gboolean is_pkg_default(guint16 pkgid) { s_h248_package_t *s_pkg = NULL; - s_pkg = g_tree_lookup(packages, GUINT_TO_POINTER((guint32)(pkgid))); + s_pkg = (s_h248_package_t *)g_tree_lookup(packages, GUINT_TO_POINTER((guint32)(pkgid))); if(! s_pkg ) return TRUE; return s_pkg->is_default; } @@ -912,7 +911,7 @@ void h248_register_package(const h248_package_t* pkg, pkg_reg_action reg_action) while (base_package_name_vals[i].strptr != NULL) { pkg_found = g_new0(h248_package_t, 1); /* create a h248 package structure */ pkg_found->id = base_package_name_vals[i].value; - vst = wmem_alloc0(wmem_epan_scope(), sizeof(value_string)*2); + vst = (value_string *)wmem_alloc0(wmem_epan_scope(), sizeof(value_string)*2); vst[0].strptr = base_package_name_vals[i].strptr; pkg_found->param_names = vst; pkg_found->hfid = &hf_h248_pkg_name; @@ -925,7 +924,7 @@ void h248_register_package(const h248_package_t* pkg, pkg_reg_action reg_action) j++; }; if (idx < j) { - vst = wmem_alloc0(wmem_epan_scope(), sizeof(value_string)*(j-idx+1)); + vst = (value_string *)wmem_alloc0(wmem_epan_scope(), sizeof(value_string)*(j-idx+1)); for (k=0;idx<j;k++) { vst[k].strptr = base_event_name_vals[idx].strptr; vst[k].value = (base_event_name_vals[idx].value & 0xffff); |