diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-14 18:58:42 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-14 18:58:42 +0000 |
| commit | 96e7b183fba146e001601968025717f9cb34cef7 (patch) | |
| tree | e756d5eb567c10a6a93d8280cc70a67dd406eeab /epan/dissectors/packet-rpcap.c | |
| parent | 041fbc05eddd9ea28b90528d74c88e773c0952c7 (diff) | |
From beroset:
patch to remove C++ incompatibilities from packet-lmp.c
renamed class to lmp_class
remove C++ incompatibilities from packet-rcpap.c
renamed class to inst_class (instruction class).
remove C++ incompatibilities from emem.c and oids.c
remove C++ incompatibilities from packet-radius.c
remove C++ incompatibilities from packet-enip.c
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416
svn path=/trunk/; revision=48299
Diffstat (limited to 'epan/dissectors/packet-rpcap.c')
| -rw-r--r-- | epan/dissectors/packet-rpcap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 861823a23a..7888f2829a 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -551,7 +551,7 @@ dissect_rpcap_filterbpf_insn (tvbuff_t *tvb, packet_info *pinfo _U_, { proto_tree *tree, *code_tree; proto_item *ti, *code_ti; - guint8 class; + guint8 inst_class; ti = proto_tree_add_item (parent_tree, hf_filterbpf_insn, tvb, offset, 8, ENC_NA); tree = proto_item_add_subtree (ti, ett_filterbpf_insn); @@ -559,9 +559,9 @@ dissect_rpcap_filterbpf_insn (tvbuff_t *tvb, packet_info *pinfo _U_, code_ti = proto_tree_add_item (tree, hf_code, tvb, offset, 2, ENC_BIG_ENDIAN); code_tree = proto_item_add_subtree (code_ti, ett_filterbpf_insn_code); proto_tree_add_item (code_tree, hf_code_class, tvb, offset, 2, ENC_BIG_ENDIAN); - class = tvb_get_guint8 (tvb, offset + 1) & 0x07; - proto_item_append_text (ti, ": %s", val_to_str_const (class, bpf_class, "")); - switch (class) { + inst_class = tvb_get_guint8 (tvb, offset + 1) & 0x07; + proto_item_append_text (ti, ": %s", val_to_str_const (inst_class, bpf_class, "")); + switch (inst_class) { case 0x00: /* ld */ case 0x01: /* ldx */ proto_tree_add_item (code_tree, hf_code_ld_size, tvb, offset, 2, ENC_BIG_ENDIAN); |