diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-19 20:00:52 +0000 |
| commit | 6bde91807842874d396f80faf5653e5403c249dc (patch) | |
| tree | 8dc51d6ec7d1ecb0e5d6f8bed87a43ba01fc10a7 /epan/dissectors/packet-h248_3gpp.c | |
| parent | 3eb06be97d520daef0bad19bf9c261b01abdc66d (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48426
Diffstat (limited to 'epan/dissectors/packet-h248_3gpp.c')
| -rw-r--r-- | epan/dissectors/packet-h248_3gpp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c index 1d6b5ec02b..013b6cb029 100644 --- a/epan/dissectors/packet-h248_3gpp.c +++ b/epan/dissectors/packet-h248_3gpp.c @@ -294,14 +294,14 @@ static gint ett_h248_3GTFO_codec = -1; static void dissect_3GTFO_codec_mode(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* cu _U_, void* ignored _U_) { tvbuff_t* sub_tvb = NULL; - gint8 class; + gint8 appclass; gboolean pc; gint32 tag; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - get_ber_identifier(tvb, 0, &class, &pc, &tag); + get_ber_identifier(tvb, 0, &appclass, &pc, &tag); /* XXX: is this enough to guess it? */ if (tag==BER_UNI_TAG_OCTETSTRING) { @@ -319,14 +319,14 @@ static void dissect_3GTFO_codec_mode(proto_tree* tree, tvbuff_t* tvb, packet_inf static void dissect_3GTFO_codec_list(proto_tree* tree, tvbuff_t* tvb, packet_info* pinfo, int hfid, h248_curr_info_t* cu _U_, void* ignored _U_) { tvbuff_t* sub_tvb = NULL; - gint8 class; + gint8 appclass; gboolean pc; gint32 tag; asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - get_ber_identifier(tvb, 0, &class, &pc, &tag); + get_ber_identifier(tvb, 0, &appclass, &pc, &tag); if (tag==BER_UNI_TAG_OCTETSTRING) { dissect_ber_octet_string(FALSE, &asn1_ctx, tree, tvb, 0, hfid, &sub_tvb ); |