aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-wsp.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-12-13 17:27:28 +0100
committerPascal Quantin <pascal.quantin@gmail.com>2014-12-13 16:36:13 +0000
commit80d44af6b22dd08f59281bf3531fb870bfc96393 (patch)
tree5450279b3abae4ec39e6cce927c0cda7db1e32e3 /epan/dissectors/packet-wsp.c
parentcc12c726b88a7f056a21f78fb531d0e2e986b133 (diff)
dissector_try_uint(_new) and dissector_try_string now return the number of bytes consumed
Change-Id: I528ad736caee1f29e2f0abfc0afcca6587d74eca Reviewed-on: https://code.wireshark.org/review/5743 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-wsp.c')
-rw-r--r--epan/dissectors/packet-wsp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index a8295a8658..e3e0d3d269 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -4770,7 +4770,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
guint contentType = 0;
const char *contentTypeStr;
tvbuff_t *tmp_tvb;
- gboolean found_match;
+ int found_match;
heur_dtbl_entry_t *hdtbl_entry;
/* Set up structures we will need to add the protocol subtree and manage it */
@@ -5001,7 +5001,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* Try finding a dissector for the content
* first, then fallback.
*/
- found_match = FALSE;
+ found_match = 0;
if (contentTypeStr) {
/*
* Content type is a string.
@@ -5091,7 +5091,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* Try finding a dissector for the content
* first, then fallback.
*/
- found_match = FALSE;
+ found_match = 0;
if (contentTypeStr) {
/*
* Content type is a string.
@@ -5167,7 +5167,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
* Try finding a dissector for the content
* first, then fallback.
*/
- found_match = FALSE;
+ found_match = 0;
if (contentTypeStr) {
/*
* Content type is a string.
@@ -5702,7 +5702,7 @@ add_multipart_data (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo)
tvbuff_t *tmp_tvb;
int partnr = 1;
int part_start;
- gboolean found_match = FALSE;
+ int found_match = 0;
proto_item *sub_tree = NULL;
proto_item *ti = NULL;
@@ -5766,7 +5766,7 @@ add_multipart_data (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo)
* Try finding a dissector for the content
* first, then fallback.
*/
- found_match = FALSE;
+ found_match = 0;
if (contentTypeStr) {
/*
* Content type is a string.