diff options
author | Guy Harris <guy@alum.mit.edu> | 2006-11-23 21:16:46 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2006-11-23 21:16:46 +0000 |
commit | 37a6c026975823425f23a4282fc8a20b5b8f52b5 (patch) | |
tree | b8a4fc55ca8524b944595a7ef65d16849af5ef9a /print.c | |
parent | 789a5d581b9b936754b3cad377c397a5c799c11b (diff) | |
download | wireshark-37a6c026975823425f23a4282fc8a20b5b8f52b5.tar.gz |
Rename proto_construct_dfilter_string() to
proto_construct_match_selected_string() to indicate what it does - and
have it return a Boolean indication of whether the string could be
built, returning the string through a pointer, and, if that pointer is
null, have it just return the Boolean and not construct the string.
Get rid of proto_can_match_selected() -
proto_construct_match_selected_string() can be used for that, which
means we have only one piece of code that knows whether a "match
selected" string can be constructed or not.
Have proto_construct_match_selected_string() support matching
zero-length FT_NONE (and FT_PCRE, but that shouldn't happen) fields even
if there's no epan_dissect_t, as such a match just checks whether the
field is present.
svn path=/trunk/; revision=19967
Diffstat (limited to 'print.c')
-rw-r--r-- | print.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -343,9 +343,8 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data) default: /* XXX - this is a hack until we can just call * fvalue_to_string_repr() for *all* FT_* types. */ - dfilter_string = proto_construct_dfilter_string(fi, - pdata->edt); - if (dfilter_string != NULL) { + if (proto_construct_match_selected_string(fi, + pdata->edt, &dfilter_string)) { chop_len = strlen(fi->hfinfo->abbrev) + 4; /* for " == " */ /* XXX - Remove double-quotes. Again, once we |