Have separate proto_construct_match_selected_string() and

proto_can_match_selected() routines, to more clearly separate the two
functions - but have them both call the same underlying routine, so
they both make the same decisions as to whether a match-selected string
can be constructed or not.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19976 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 3 insertions, 2 deletions

diff --git a/print.c b/print.c
index ed5a3ba74d..7297c10daf 100644
--- a/print.c
+++ b/print.c
@@ -343,8 +343,9 @@ 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. */
-			if (proto_construct_match_selected_string(fi,
-			    pdata->edt, &dfilter_string)) {
+			dfilter_string = proto_construct_match_selected_string(fi,
+			    pdata->edt);
+			if (dfilter_string != NULL) {
 				chop_len = strlen(fi->hfinfo->abbrev) + 4; /* for " == " */
 
 				/* XXX - Remove double-quotes. Again, once we