diff options
| author | Gerald Combs <gerald@wireshark.org> | 2007-11-27 19:57:35 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2007-11-27 19:57:35 +0000 |
| commit | e8fd3756305ebf44a793d88c7cca25bf0bdba6db (patch) | |
| tree | 29a89c1600d968e6b2ad6bc15dca9f75209ae5cd /epan/dissectors/packet-cops.c | |
| parent | 9c89cdaaa3eccfe74d4e17705f38508c640b5047 (diff) | |
Fixes from Sam Leffler:
In capture_sync.c: Don't clobber the DLT value.
In packet-cops.c (modified by me): Instead of adding an item as a static,
mis-cast FT_UINT16 to the tree, add it as an FT_NONE.
In packet-802.11.c: Add the right address to the tree.
svn path=/trunk/; revision=23624
Diffstat (limited to 'epan/dissectors/packet-cops.c')
| -rw-r--r-- | epan/dissectors/packet-cops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 421cb8e1e8..c95a76baa9 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -1805,7 +1805,7 @@ void proto_register_cops(void) { &hf_cops_subtree, { "Object Subtree", "cops.pc_subtree", - FT_UINT16, BASE_HEX, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Object Subtree", HFILL } }, { &hf_cops_pc_ds_field, @@ -2607,7 +2607,7 @@ static proto_tree * info_to_cops_subtree(tvbuff_t *tvb, proto_tree *st, int n, int offset, const char *str) { proto_item *tv; - tv = proto_tree_add_uint_format( st, hf_cops_subtree, tvb, offset, n, (guint)NULL, str); + tv = proto_tree_add_none_format( st, hf_cops_subtree, tvb, offset, n, str); return( proto_item_add_subtree( tv, ett_cops_subtree ) ); } |