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>

1 files changed, 2 insertions, 8 deletions

diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index f9aec9d84c..981c27d92f 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -218,9 +218,6 @@ static gint ett_zbee_zdp_bind_table = -1;
        gint ett_zbee_zdp_table_entry = -1;
        gint ett_zbee_zdp_descriptor_capability_field = -1;
 
-/* Data dissector handle. */
-static dissector_handle_t  data_handle;
-
 /**************************************
  * Value Strings
  **************************************
@@ -437,7 +434,7 @@ zdp_dump_excess(tvbuff_t *tvb, guint offset, packet_info *pinfo, proto_tree *tre
 
     if (length > 0) {
         excess = tvb_new_subset_remaining(tvb, offset);
-        call_dissector(data_handle, excess, pinfo, root);
+        call_data_dissector(excess, pinfo, root);
     }
 } /* zdp_dump_excess */
 
@@ -1261,7 +1258,7 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data
             break;
         default:
             /* Invalid Cluster Identifier. */
-            call_dissector(data_handle, zdp_tvb, pinfo, tree);
+            call_data_dissector(zdp_tvb, pinfo, tree);
             break;
     } /* switch */
 
@@ -1786,9 +1783,6 @@ void proto_reg_handoff_zbee_zdp(void)
 {
     dissector_handle_t  zdp_handle;
 
-    /* Find the other dissectors we need. */
-    data_handle     = find_dissector("data");
-
     /* Register our dissector with the ZigBee application dissectors. */
     zdp_handle = find_dissector("zbee_zdp");
     dissector_add_uint("zbee.profile", ZBEE_ZDP_PROFILE, zdp_handle);