Use val_to_str_const() where appropriate;

Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44438 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 3 insertions, 2 deletions

diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c
index 46353ed594..6f5b613047 100644
--- a/epan/dissectors/packet-mrp-mmrp.c
+++ b/epan/dissectors/packet-mrp-mmrp.c
@@ -266,8 +266,9 @@ dissect_mmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             msg_tree = proto_item_add_subtree(msg_ti, ett_msg);
 
             /* Append AttributeType description to the end of the "Message" heading */
-            proto_item_append_text(msg_tree, ": %s (%d)", val_to_str(attribute_type,
-                                   attribute_type_vals, "<Unknown>"), attribute_type);
+            proto_item_append_text(msg_tree, ": %s (%d)",
+                                   val_to_str_const(attribute_type, attribute_type_vals, "<Unknown>"),
+                                   attribute_type);
 
             dissect_mmrp_common1(msg_tree, tvb, msg_offset);