diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-22 19:24:06 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-11-25 15:19:52 +0000 |
| commit | 152b0c92d658991b5a8742802a1f8412848de964 (patch) | |
| tree | c405423a4037171e97ab0970782ce868e4029c28 /epan/dissectors/packet-l1-events.c | |
| parent | e3a04bb392824781b8a3ef6ec98a37ef96c6c827 (diff) | |
Remove support for pinfo->private_data in "data-text-lines", "data-l1-events" and "urlencoded-form" dissectors. Data must be passed from parent through dissectors data parameter.
Change-Id: I24ab56ce7d99f8ed670f4a50453223d4e6a46983
Reviewed-on: https://code.wireshark.org/review/5463
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-l1-events.c')
| -rw-r--r-- | epan/dissectors/packet-l1-events.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index 5651063063..49d5709496 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -67,13 +67,7 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat /* * No information from dissector data */ - data_name = (char *)(pinfo->private_data); - if (! (data_name && data_name[0])) { - /* - * No information from "private_data" - */ - data_name = NULL; - } + data_name = NULL; } } @@ -95,7 +89,7 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat while (tvb_reported_length_remaining(tvb, offset) != 0) { /* * XXX - we need to be passed the parameters - * of the content type via "pinfo->private_data", + * of the content type via data parameter, * so that we know the character set. We'd * have to handle that character set, which * might be a multibyte character set such |