aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-h225.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-03-19 21:22:31 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-03-19 21:22:31 +0000
commit7c56677cf9e703e6dde30529b24e27dd2a4960a9 (patch)
tree5d78d22112806bca22edbc8e069f77503269b381 /epan/dissectors/packet-h225.c
parentb8481499646f07512ceddac567887072822dffdb (diff)
From beroset:
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48429
Diffstat (limited to 'epan/dissectors/packet-h225.c')
-rw-r--r--epan/dissectors/packet-h225.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index a97ac56584..360d436f61 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -2767,7 +2767,7 @@ dissect_h225_SEQUENCE_OF_CallReferenceValue(tvbuff_t *tvb _U_, int offset _U_, a
int
dissect_h225_GloballyUniqueID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
- 16, 16, FALSE, actx->value_ptr);
+ 16, 16, FALSE, (tvbuff_t **)actx->value_ptr);
return offset;
}
@@ -2882,7 +2882,7 @@ dissect_h225_T_guid(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pro
offset = dissect_h225_GloballyUniqueID(tvb, offset, actx, tree, hf_index);
if (guid_tvb)
- tvb_get_ntohguid(guid_tvb, 0, call_id_guid = ep_alloc(sizeof(e_guid_t)));
+ tvb_get_ntohguid(guid_tvb, 0, call_id_guid = ep_new(e_guid_t));
actx->value_ptr = NULL;