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-cdp.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-cdp.c')
| -rw-r--r-- | epan/dissectors/packet-cdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 84294ea715..b3d00e964d 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -467,11 +467,11 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(tlv_tree, tvb, offset+4, 3, "OUI: 0x%06X (%s)", tvb_get_ntoh24(tvb,offset+4), - val_to_str(tvb_get_ntoh24(tvb,offset+4), oui_vals, "Unknown")); + val_to_str_const(tvb_get_ntoh24(tvb,offset+4), oui_vals, "Unknown")); proto_tree_add_text(tlv_tree, tvb, offset+7, 2, "Protocol ID: 0x%04X (%s)", tvb_get_ntohs(tvb, offset+7), - val_to_str(tvb_get_ntohs(tvb, offset+7), type_hello_vals, "Unknown")); + val_to_str_const(tvb_get_ntohs(tvb, offset+7), type_hello_vals, "Unknown")); switch(tvb_get_ntohs(tvb, offset+7)) { |