diff options
author | Michael Mann <mmann78@netscape.net> | 2013-11-02 15:52:25 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-11-02 15:52:25 +0000 |
commit | 02a83915359f7fadf149df0fe0dea8e971bb32f4 (patch) | |
tree | 33b0da2fee3eed9a07417a0aa7e4c2356638cd33 /epan/dissectors/packet-wsp.c | |
parent | 925cba4e91ea0f44970462d30b62533c8a100e24 (diff) |
Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.
svn path=/trunk/; revision=53049
Diffstat (limited to 'epan/dissectors/packet-wsp.c')
-rw-r--r-- | epan/dissectors/packet-wsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index a090283eb6..7bd9e7eda1 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -5146,7 +5146,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Content type is a string. */ found_match = dissector_try_string(media_type_table, - contentTypeStr, tmp_tvb, pinfo, tree); + contentTypeStr, tmp_tvb, pinfo, tree, NULL); } if (! found_match) { if (! dissector_try_heuristic(heur_subdissector_list, @@ -5239,7 +5239,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * Content type is a string. */ found_match = dissector_try_string(media_type_table, - contentTypeStr, tmp_tvb, pinfo, tree); + contentTypeStr, tmp_tvb, pinfo, tree, NULL); } if (! found_match) { if (! dissector_try_heuristic(heur_subdissector_list, @@ -5323,7 +5323,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } else */ found_match = dissector_try_string(media_type_table, - contentTypeStr, tmp_tvb, pinfo, tree); + contentTypeStr, tmp_tvb, pinfo, tree, NULL); } if (! found_match) { if (! dissector_try_heuristic(heur_subdissector_list, @@ -5921,7 +5921,7 @@ add_multipart_data (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo) * Content type is a string. */ found_match = dissector_try_string(media_type_table, - contentTypeStr, tmp_tvb, pinfo, mpart_tree); + contentTypeStr, tmp_tvb, pinfo, mpart_tree, NULL); } if (! found_match) { if (! dissector_try_heuristic(heur_subdissector_list, |