aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ua.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-03-19 20:33:14 -0400
committerMichael Mann <mmann78@netscape.net>2016-03-20 17:38:03 +0000
commit1e60d63c8c6882c8c0bdb00cf6df594e1bb6fccf (patch)
tree4147c4f2bee3b93c250a49fa8ec337072c80e713 /epan/dissectors/packet-ua.c
parent2b2fc64447e5f778d969e6c850e9196d248cbbe1 (diff)
Create call_data_dissector() to call data dissector.
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ua.c')
-rw-r--r--epan/dissectors/packet-ua.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c
index fc295a86fe..1ba74b264d 100644
--- a/epan/dissectors/packet-ua.c
+++ b/epan/dissectors/packet-ua.c
@@ -47,7 +47,6 @@ static gboolean setup_conversations_enabled = TRUE;
static dissector_handle_t noe_handle;
static dissector_handle_t ua3g_handle;
-static dissector_handle_t data_handle;
static void uadecode(e_ua_direction direction,
proto_tree *tree,
@@ -149,8 +148,7 @@ static void uadecode(e_ua_direction direction,
/* add text to the frame "INFO" column */
col_append_fstr(pinfo->cinfo, COL_INFO, " - UA3G Message ERR: Opcode (0x%02x) Unknown", tvb_get_guint8(tvb, (offset + 2)));
- call_dissector(data_handle,
- tvb_new_subset_length(tvb, offset, length),
+ call_data_dissector(tvb_new_subset_length(tvb, offset, length),
pinfo,
tree);
break;
@@ -308,7 +306,6 @@ void proto_reg_handoff_ua_msg(void)
#endif
noe_handle = find_dissector_add_dependency("noe", proto_ua_msg);
ua3g_handle = find_dissector_add_dependency("ua3g", proto_ua_msg);
- data_handle = find_dissector("data");
}