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-dhcp-failover.c | |
| parent | e6ffe7b59b9f36c534d3b2d6cc78b05dfe517f67 (diff) | |
| download | wireshark-638d74d43f9baf45dc3641939eec36f801414187.tar.gz | |
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-dhcp-failover.c')
| -rw-r--r-- | epan/dissectors/packet-dhcp-failover.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 1a2538331e..998c778039 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -400,7 +400,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hf_dhcpfo_type, tvb, offset, 1, type); } col_add_str(pinfo->cinfo, COL_INFO, - val_to_str(type, failover_vals, "Unknown Packet")); + val_to_str_const(type, failover_vals, "Unknown Packet")); offset += 1; poffset = tvb_get_guint8(tvb, offset); @@ -483,7 +483,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*** DHCP-Style-Options ****/ proto_item_append_text(oi, ", %s (%u)", - val_to_str(opcode, option_code_vals, "Unknown Option"), + val_to_str_const(opcode, option_code_vals, "Unknown Option"), opcode); proto_tree_add_uint(option_tree, hf_dhcpfo_option_code, tvb, @@ -501,7 +501,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case DHCP_FO_PD_BINDING_STATUS: binding_status = tvb_get_guint8(tvb, offset); proto_item_append_text(oi, ", %s (%d)", - val_to_str(binding_status, + val_to_str_const(binding_status, binding_status_vals, "Unknown Packet"), binding_status); @@ -611,7 +611,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) reject_reason = tvb_get_guint8(tvb, offset); proto_item_append_text(oi, ", %s (%d)", - val_to_str(reject_reason, reject_reason_vals, + val_to_str_const(reject_reason, reject_reason_vals, "Unknown Packet"), reject_reason); @@ -775,7 +775,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) server_state = tvb_get_guint8(tvb, offset); proto_item_append_text(oi, ", %s (%u)", - val_to_str(server_state, server_state_vals, + val_to_str_const(server_state, server_state_vals, "Unknown"), server_state); |