diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-json.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
| download | wireshark-246fe2ca4c67d8c98caa84e2f57694f6322e2f96.tar.gz wireshark-246fe2ca4c67d8c98caa84e2f57694f6322e2f96.tar.bz2 wireshark-246fe2ca4c67d8c98caa84e2f57694f6322e2f96.zip | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-json.c')
| -rw-r--r-- | epan/dissectors/packet-json.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 71ae0ba28c..889951cada 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -163,11 +163,11 @@ dissect_json(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) proto_item_set_len(ti, offset); /* if we have some unparsed data, pass to data-text-lines dissector (?) */ - if (tvb_length_remaining(tvb, offset) > 0) { + if (tvb_captured_length_remaining(tvb, offset) > 0) { int datalen, reported_datalen; tvbuff_t *next_tvb; - datalen = tvb_length_remaining(tvb, offset); + datalen = tvb_captured_length_remaining(tvb, offset); reported_datalen = tvb_reported_length_remaining(tvb, offset); next_tvb = tvb_new_subset(tvb, offset, datalen, reported_datalen); @@ -177,7 +177,7 @@ dissect_json(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "(%s)", data_name); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static void before_object(void *tvbparse_data, const void *wanted_data _U_, tvbparse_elem_t *tok) { |