diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-08-10 22:55:02 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-08-10 22:55:02 +0000 |
| commit | 638d74d43f9baf45dc3641939eec36f801414187 (patch) | |
| tree | 5bfcabbb83a6e7359cfc302cdc604264560d66a0 /epan/dissectors/packet-cisco-sm.c | |
| parent | e6ffe7b59b9f36c534d3b2d6cc78b05dfe517f67 (diff) | |
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
svn path=/trunk/; revision=44438
Diffstat (limited to 'epan/dissectors/packet-cisco-sm.c')
| -rw-r--r-- | epan/dissectors/packet-cisco-sm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c index 4806079d71..0a50d1e11a 100644 --- a/epan/dissectors/packet-cisco-sm.c +++ b/epan/dissectors/packet-cisco-sm.c @@ -155,13 +155,13 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "SM"); col_add_fstr(pinfo->cinfo, COL_INFO, "Cisco SM Packet (%s)", - val_to_str(sm_message_type, sm_message_type_value_info,"reserved")); + val_to_str_const(sm_message_type, sm_message_type_value_info,"reserved")); ti = proto_tree_add_item(tree, proto_sm, tvb, offset, 0, ENC_NA); sm_tree = proto_item_add_subtree(ti, ett_sm); proto_tree_add_uint_format(sm_tree, hf_sm_sm_msg_type, tvb, offset, 4, sm_message_type, - "SM Message type: %s (0x%0x)", val_to_str(sm_message_type, sm_message_type_value, "reserved"), sm_message_type); + "SM Message type: %s (0x%0x)", val_to_str_const(sm_message_type, sm_message_type_value, "reserved"), sm_message_type); offset = offset + 4; if (sm_message_type == MESSAGE_TYPE_PDU) { @@ -178,7 +178,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset +2; msg_type = tvb_get_ntohs(tvb,offset); proto_tree_add_uint_format(sm_tree, hf_sm_msg_type, tvb, offset, 2, msg_type, - "Message type: %s (0x%0x)", val_to_str(msg_type, sm_pdu_type_value, "reserved"), + "Message type: %s (0x%0x)", val_to_str_const(msg_type, sm_pdu_type_value, "reserved"), msg_type); msg_type = tvb_get_ntohs(tvb,offset); offset = offset + 2; @@ -294,7 +294,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = offset +2; msg_type = tvb_get_ntohs(tvb,offset); proto_tree_add_uint_format(sm_tree, hf_sm_msg_type, tvb, offset, 2, msg_type, - "Message type: %s (0x%0x)", val_to_str(msg_type, sm_pdu_type_value, "reserved"), + "Message type: %s (0x%0x)", val_to_str_const(msg_type, sm_pdu_type_value, "reserved"), msg_type); msg_type = tvb_get_ntohs(tvb,offset); offset = offset + 2; |