diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-12-13 17:27:28 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-12-13 16:36:13 +0000 |
| commit | 80d44af6b22dd08f59281bf3531fb870bfc96393 (patch) | |
| tree | 5450279b3abae4ec39e6cce927c0cda7db1e32e3 /epan/dissectors/packet-ethertype.c | |
| parent | cc12c726b88a7f056a21f78fb531d0e2e986b133 (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-ethertype.c')
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index d2b8c1f177..3ee8d3307b 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -251,7 +251,7 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat tvbuff_t *volatile next_tvb; guint length_before; gint captured_length, reported_length; - volatile gboolean dissector_found = FALSE; + volatile int dissector_found = 0; const char *volatile saved_proto; ethertype_data_t *ethertype_data; @@ -314,7 +314,7 @@ dissect_ethertype(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat before we called the subdissector. */ show_exception(next_tvb, pinfo, tree, EXCEPT_CODE, GET_MESSAGE); - dissector_found = TRUE; + dissector_found = 1; pinfo->current_proto = saved_proto; } ENDTRY; |