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

1 files changed, 2 insertions, 3 deletions

diff --git a/print.c b/print.c
index af67bec5fa..ed5a3ba74d 100644
--- a/print.c
+++ b/print.c
@@ -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