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-icq.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-icq.c')
-rw-r--r-- | epan/dissectors/packet-icq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 147611cc4c..91ff88ec07 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -366,7 +366,7 @@ table_v5 [] = { static const char* findMsgType(int num) { - return val_to_str(num, msgTypeCode, "Unknown"); + return val_to_str_const(num, msgTypeCode, "Unknown"); } static const char* @@ -1516,7 +1516,7 @@ dissect_icqv5Client(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_uint_format(icq_header_tree, hf_icq_client_cmd, decr_tvb, ICQ5_CL_CMD, 2, cmd, "Command: %s (%u)", - val_to_str(cmd, clientCmdCode, "Unknown"), cmd); + val_to_str_const(cmd, clientCmdCode, "Unknown"), cmd); proto_tree_add_text(icq_header_tree, decr_tvb, ICQ5_CL_SEQNUM1, 2, "Seq Number 1: 0x%04x", tvb_get_letohs(decr_tvb, ICQ5_CL_SEQNUM1)); @@ -1616,7 +1616,7 @@ dissect_icqv5Server(tvbuff_t *tvb, int offset, packet_info *pinfo, offset + ICQ5_SRV_SESSIONID, 4, ENC_LITTLE_ENDIAN); proto_tree_add_uint_format(icq_header_tree, hf_icq_server_cmd, tvb, offset + ICQ5_SRV_CMD, 2, cmd, "Command: %s (%u)", - val_to_str(cmd, serverCmdCode, "Unknown"), cmd); + val_to_str_const(cmd, serverCmdCode, "Unknown"), cmd); proto_tree_add_text(icq_header_tree, tvb, offset + ICQ5_SRV_SEQNUM1, 2, "Seq Number 1: 0x%04x", tvb_get_letohs(tvb, offset + ICQ5_SRV_SEQNUM1)); |