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-gsm_abis_om2000.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-gsm_abis_om2000.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_abis_om2000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c index b4c523c272..784657ee6a 100644 --- a/epan/dissectors/packet-gsm_abis_om2000.c +++ b/epan/dissectors/packet-gsm_abis_om2000.c @@ -948,11 +948,11 @@ dissect_om2k_attrs(tvbuff_t *tvb, gint offset, proto_tree *tree) static guint dissect_om2k_mo(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree) { - guint8 class = tvb_get_guint8(tvb, offset); + guint8 mo_class = tvb_get_guint8(tvb, offset); guint8 inst = tvb_get_guint8(tvb, offset+3); col_append_fstr(pinfo->cinfo, COL_INFO, ", (%-4s %u)", - val_to_str(class, om2k_mo_class_short_vals, + val_to_str(mo_class, om2k_mo_class_short_vals, "0x%02x"), inst); if (tree) { proto_item *ti; @@ -972,7 +972,7 @@ dissect_om2k_mo(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree proto_tree_add_item(mo_tree, hf_om2k_mo_instance, tvb, offset+3, 1, ENC_BIG_ENDIAN); proto_item_append_text(ti, ", Class: %s, Sub: %02x/%02x, Instance: %u", - val_to_str(class, om2k_mo_class_vals, "0x%02x"), + val_to_str(mo_class, om2k_mo_class_vals, "0x%02x"), sub1, sub2, inst); } return 4; |