diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 21:16:23 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 21:16:23 +0000 |
| commit | 55c498169dfc04c1539f8a659113c8f30e53862d (patch) | |
| tree | 1749e181d23ec9a28c3a98c7d3294ff9b270d54c /plugins/m2m | |
| parent | 84241f46ada962c7b4b9b3cf0f1be134ee99b00c (diff) | |
| download | wireshark-55c498169dfc04c1539f8a659113c8f30e53862d.tar.gz | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48400
Diffstat (limited to 'plugins/m2m')
| -rw-r--r-- | plugins/m2m/packet-m2m.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/m2m/packet-m2m.c b/plugins/m2m/packet-m2m.c index bdf1cdb697..48025252e6 100644 --- a/plugins/m2m/packet-m2m.c +++ b/plugins/m2m/packet-m2m.c @@ -45,7 +45,7 @@ static void fast_feedback_burst_decoder(proto_tree *tree, tvbuff_t *tvb, gint of static void harq_ack_bursts_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo); static void physical_attributes_decoder(proto_tree *tree, tvbuff_t *tvb, gint offset, gint length, packet_info *pinfo); static void extended_tlv_decoder(packet_info *pinfo); -void proto_tree_add_tlv(tlv_info_t *this, tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree, gint hf, guint encoding); +void proto_tree_add_tlv(tlv_info_t *self, tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree, gint hf, guint encoding); /* Global variables */ static dissector_handle_t wimax_cdma_code_burst_handle; @@ -530,13 +530,13 @@ static void extended_tlv_decoder(packet_info *pinfo) } /* Display the raw WiMax TLV */ -void proto_tree_add_tlv(tlv_info_t *this, tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree, gint hf, guint encoding) +void proto_tree_add_tlv(tlv_info_t *self, tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tree, gint hf, guint encoding) { guint tlv_offset; gint tlv_type, tlv_len; /* make sure the TLV information is valid */ - if(!this->valid) + if(!self->valid) { /* invalid TLV info */ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Invalid TLV"); return; @@ -546,21 +546,21 @@ void proto_tree_add_tlv(tlv_info_t *this, tvbuff_t *tvb, guint offset, packet_in proto_tree_add_item(tree, hf_m2m_type, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); tlv_offset++; /* check the TLV length type */ - if( this->length_type ) + if( self->length_type ) { /* multiple bytes TLV length */ /* display the length of the TLV length with MSB */ proto_tree_add_item(tree, hf_m2m_len_size, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); tlv_offset++; - if(this->size_of_length) + if(self->size_of_length) /* display the multiple byte TLV length */ - proto_tree_add_item(tree, hf_m2m_len, tvb, tlv_offset, this->size_of_length, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_m2m_len, tvb, tlv_offset, self->size_of_length, ENC_BIG_ENDIAN); else return; } else /* display the single byte TLV length */ proto_tree_add_item(tree, hf_m2m_len, tvb, tlv_offset, 1, ENC_BIG_ENDIAN); - tlv_type = get_tlv_type(this); + tlv_type = get_tlv_type(self); /* Display Frame Number as special case for filter */ if ( tlv_type == TLV_FRAME_NUM ) { @@ -568,8 +568,8 @@ void proto_tree_add_tlv(tlv_info_t *this, tvbuff_t *tvb, guint offset, packet_in } /* get the TLV length */ - tlv_len = get_tlv_length(this); - proto_tree_add_item(tree, hf, tvb, (offset + this->value_offset), tlv_len, encoding); + tlv_len = get_tlv_length(self); + proto_tree_add_item(tree, hf, tvb, (offset + self->value_offset), tlv_len, encoding); } /* Register Wimax Mac to Mac Protocol */ |