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-sna.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-sna.c')
| -rw-r--r-- | epan/dissectors/packet-sna.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index e6842ac81b..651e7cf6c2 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -1545,7 +1545,7 @@ dissect_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "SNA XID Format:%d Type:%s", format, - val_to_str(lo_nibble(type), sna_xid_type_vals, + val_to_str_const(lo_nibble(type), sna_xid_type_vals, "Unknown Type")); if (tree) { @@ -2451,11 +2451,11 @@ dissect_control(tvbuff_t *parent_tvb, int offset, int control_len, if (((key == 0) || (key == 3) || (key == 5)) && hpr) sub_item = proto_tree_add_text(tree, tvb, 0, -1, "%s", - val_to_str(key, sna_control_hpr_vals, + val_to_str_const(key, sna_control_hpr_vals, "Unknown Control Vector")); else sub_item = proto_tree_add_text(tree, tvb, 0, -1, "%s", - val_to_str(key, sna_control_vals, + val_to_str_const(key, sna_control_vals, "Unknown Control Vector")); sub_tree = proto_item_add_subtree(sub_item, ett); if (parse == LT) { |