diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 19:47:33 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-18 19:47:33 +0000 |
| commit | 434aae5245f83f69bf3eb49ad34966c442117385 (patch) | |
| tree | c019f96e779796615f7384e37d2dd01256216925 /epan/dissectors/packet-iso7816.c | |
| parent | a4cb525bad04b057528d1035da74718a831e7b8a (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48396
Diffstat (limited to 'epan/dissectors/packet-iso7816.c')
| -rw-r--r-- | epan/dissectors/packet-iso7816.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c index a40e52d866..c707f01878 100644 --- a/epan/dissectors/packet-iso7816.c +++ b/epan/dissectors/packet-iso7816.c @@ -343,7 +343,7 @@ dissect_iso7816_class(tvbuff_t *tvb, gint offset, gint ret_fct = 1; proto_item *class_item; proto_tree *class_tree; - guint8 class; + guint8 dev_class; proto_item *enc_item; guint8 channel; proto_item *ch_item; @@ -352,34 +352,34 @@ dissect_iso7816_class(tvbuff_t *tvb, gint offset, tvb, offset, 1, ENC_BIG_ENDIAN); class_tree = proto_item_add_subtree(class_item, ett_iso7816_class); - class = tvb_get_guint8(tvb, offset); + dev_class = tvb_get_guint8(tvb, offset); - if (class>=0x10 && class<=0x7F) { + if (dev_class>=0x10 && dev_class<=0x7F) { enc_item = proto_tree_add_text(class_tree, tvb, offset, 1, "reserved for future use"); } - else if (class>=0xD0 && class<=0xFE) { + else if (dev_class>=0xD0 && dev_class<=0xFE) { enc_item = proto_tree_add_text(class_tree, tvb, offset, 1, "proprietary structure and coding"); ret_fct = -1; } - else if (class==0xFF) { + else if (dev_class==0xFF) { enc_item = proto_tree_add_text(class_tree, tvb, offset, 1, "reserved for Protocol Type Selection"); } else { enc_item = proto_tree_add_text(class_tree, tvb, offset, 1, "structure and coding according to ISO/IEC 7816"); - if (class>=0xA0 && class<=0xAF) { + if (dev_class>=0xA0 && dev_class<=0xAF) { proto_item_append_text(enc_item, " unless specified otherwise by the application context"); } - if (class<=0x0F || (class>=0x80 && class<=0xAF)) { + if (dev_class<=0x0F || (dev_class>=0x80 && dev_class<=0xAF)) { proto_tree_add_item(class_tree, hf_iso7816_cla_sm, tvb, offset, 1, ENC_BIG_ENDIAN); - channel = class & 0x03; + channel = dev_class & 0x03; ch_item = proto_tree_add_item(class_tree, hf_iso7816_cla_channel, tvb, offset, 1, ENC_BIG_ENDIAN); if (channel==0) |